From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
index e572c1d..a8c865b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
@@ -97,7 +97,7 @@
List<TSysGoodsExchange> list = sysGoodsExchangeService.list(new LambdaQueryWrapper<TSysGoodsExchange>().in(TSysGoodsExchange::getGoodsId, records.stream().map(TSysGoods::getId).collect(Collectors.toList())));
records.forEach(item -> {
item.setExchangeQuantity(list.stream().filter(item1 -> item1.getGoodsId().equals(item.getId())).mapToInt(TSysGoodsExchange::getGoodsCount).sum());
- if(item.getGoodsTotal()!=null){
+ if (item.getGoodsTotal() != null) {
item.setSurplusQuantity(item.getGoodsTotal() - item.getExchangeQuantity());
}
});
@@ -199,7 +199,7 @@
public R<PageInfo<TSysGoodsExchange>> getExchangeRecord(@RequestBody @Valid TSysGoodsExchangeQuery query) {
PageInfo<TSysGoodsExchange> page = new PageInfo<>(query.getPageNum(), query.getPageSize());
LambdaQueryWrapper<TSysGoodsExchange> wrapper = new LambdaQueryWrapper<TSysGoodsExchange>();
- if(query.getId()!=null && !query.getId().isEmpty()){
+ if (query.getId() != null && !query.getId().isEmpty()) {
wrapper.eq(TSysGoodsExchange::getGoodsId, query.getId());
}
if (query.getClinicName() != null && !query.getClinicName().isEmpty()) {
@@ -225,7 +225,7 @@
return R.fail("该订单已发货");
}
exchange1.setStatus(2);
- exchange1.setLogisticsNumber(exchange1.getLogisticsNumber());
+ exchange1.setLogisticsNumber(exchange.getLogisticsNumber());
sysGoodsExchangeService.updateById(exchange1);
return R.ok();
}
@@ -251,7 +251,9 @@
List<TSysGoodsExchange> list = sysGoodsExchangeService.list(new LambdaQueryWrapper<TSysGoodsExchange>().in(TSysGoodsExchange::getGoodsId, records.stream().map(TSysGoods::getId).collect(Collectors.toList())));
records.forEach(item -> {
item.setExchangeQuantity(list.stream().filter(item1 -> item1.getGoodsId().equals(item.getId())).mapToInt(TSysGoodsExchange::getGoodsCount).sum());
- item.setSurplusQuantity(item.getGoodsTotal() - item.getExchangeQuantity());
+ if (item.getGoodsTotal() != null) {
+ item.setSurplusQuantity(item.getGoodsTotal() - item.getExchangeQuantity());
+ }
});
}
pageInfo.setRecords(records);
--
Gitblit v1.7.1