From 190d2d153d6737830f6173c7de1b0bc03e6d7dac Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 12:52:34 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 4edc38d..a848234 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -195,6 +195,7 @@
throw new CoolException("缁勬墭涓嶅瓨鍦紒锛�");
}
List<PakinItem> paramItems = param.getItems();
+
if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
throw new CoolException("瑙ｇ粦鐗╂枡涓嶈兘涓虹┖锛侊紒");
}
@@ -205,16 +206,39 @@
if (pakinItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻槑缁嗕笉瀛樺湪锛侊紒");
}
- List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
- if (!waitPakinItemService.removeByIds(ids)) {
- throw new CoolException("缁勬墭鏄庣粏瑙ｇ粦澶辫触锛侊紒");
- }
+// List<Long> ids = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
+// if (!waitPakinItemService.removeByIds(ids)) {
+// throw new CoolException("缁勬墭鏄庣粏瑙ｇ粦澶辫触锛侊紒");
+// }
List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list);
for (int i1 = 0; i1 < pakinItems.size(); i1++) {
+ for (PakinItem item : paramItems) {
+ if (item.getId().equals(pakinItems.get(i1).getSource())) {
+ if (pakinItems.get(i1).getAnfme().compareTo(item.getReceiptQty()) > 0) {
+ if (item.getReceiptQty().compareTo(0.00) == 0) {
+ throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘涓洪浂锛侊紒");
+ }
+ if (item.getReceiptQty().compareTo(pakinItems.get(i1).getAnfme() - pakinItems.get(i1).getWorkQty() - pakinItems.get(i1).getQty()) > 0) {
+ throw new CoolException("瑙ｇ粦鏁伴噺涓嶈兘澶т簬鍓╀綑鍙墽琛屾暟锛侊紒");
+ }
+ pakinItems.get(i1).setAnfme(pakinItems.get(i1).getAnfme() - item.getReceiptQty());
+ if (!waitPakinItemService.updateById(pakinItems.get(i1))) {
+ throw new CoolException("缁勬墭鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
+ }
+ } else {
+ if (!waitPakinItemService.removeById(pakinItems.get(i1).getId())) {
+ throw new CoolException("缁勬墭鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ }
+ }
+ }
+ }
+
+ for (int a = 0; a < paramItems.size(); a++) {
for (int i = 0; i < warehouseAreasItems.size(); i++) {
- if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getId())) {
- double v = warehouseAreasItems.get(i).getWorkQty() - pakinItems.get(i1).getAnfme();
+ if (warehouseAreasItems.get(i).getId().equals(paramItems.get(a).getId())) {
+ double v = warehouseAreasItems.get(i).getWorkQty() - paramItems.get(a).getReceiptQty();
warehouseAreasItems.get(i).setWorkQty(v);
if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
@@ -222,8 +246,9 @@
}
}
}
- double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
+ double anfmes = paramItems.stream().mapToDouble(PakinItem::getReceiptQty).sum();
+// double anfmes = warehouseAreasItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
if (waitPakins.getAnfme().compareTo(anfmes) <= 0) {
if (!waitPakinService.removeById(waitPakins.getId())) {
throw new CoolException("缁勬墭鍒犻櫎澶辫触锛侊紒");
@@ -256,27 +281,34 @@
if (!taskItems.isEmpty()) {
return R.error("缁勬嫋妗ｆ湁鏄庣粏浠诲姟");
}
- }
- Set<Long> sourceIds = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toSet());
+ Set<Long> sourceIds = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toSet());
- List<WarehouseAreasItem> areasItems = warehouseAreasItemService.listByIds(sourceIds);
+ List<WarehouseAreasItem> areasItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
+ .in(WarehouseAreasItem::getId, sourceIds));
- if (areasItems.isEmpty()) {
- return R.error("鏀惰揣鍖烘暟鎹笉瀛樺湪锛侊紒");
- }
-
- Map<Long, List<WaitPakinItem>> listMap = pakinItems.stream().collect(Collectors.groupingBy(WaitPakinItem::getSource));
- for (WarehouseAreasItem item : areasItems) {
- List<WaitPakinItem> pakin = listMap.get(item.getId());
- if (Objects.isNull(pakin)) {
- continue;
+ if (areasItems.isEmpty()) {
+ return R.error("鏀惰揣鍖烘暟鎹笉瀛樺湪锛侊紒");
}
- double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- item.setWorkQty(item.getWorkQty() - sum)
- .setAnfme(item.getAnfme() + sum);
- if (!warehouseAreasItemService.updateById(item)) {
- throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
+
+ Map<Long, List<WaitPakinItem>> listMap = pakinItems.stream().collect(Collectors.groupingBy(WaitPakinItem::getSource));
+ for (WarehouseAreasItem item : areasItems) {
+ List<WaitPakinItem> pakin = listMap.get(item.getId());
+ if (Objects.isNull(pakin)) {
+ continue;
+ }
+ double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+ item.setWorkQty(item.getWorkQty() - sum)
+ .setAnfme(item.getAnfme() + sum);
+ if (!warehouseAreasItemService.updateById(item)) {
+ throw new CoolException("鏀惰揣鍖烘暟鎹洖婊氬け璐ワ紒锛�");
+ }
+ }
+
+ Set<Long> pakinItemIds = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toSet());
+
+ if (!waitPakinItemService.removeByIds(pakinItemIds)) {
+ throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
@@ -284,13 +316,6 @@
return R.error("Delete Fail");
}
- Set<Long> pakinItemIds = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toSet());
-
- if (!waitPakinItemService.removeByIds(pakinItemIds)) {
- throw new CoolException("鏄庣粏鍒犻櫎澶辫触锛侊紒");
- }
return R.ok("Delete Success").add(pakinIds);
-
-
}
}
--
Gitblit v1.9.1