From e81a3446617207688cd60fe5b1717a18c5cb9e32 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 18:14:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 33 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 48cedde..1d8d4f1 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
@@ -65,7 +65,6 @@
}
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .notIn(WaitPakin::getIoStatus, asList)
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
if (!Objects.isNull(pakin)) {
throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + pakin.getCode() + "浣跨敤锛侊紒");
@@ -119,6 +118,10 @@
.setAsnCode(warehouseAreasItems.getAsnCode())
.setAsnItemId(warehouseAreasItems.getAsnItemId())
.setIsptResult(warehouseAreasItems.getIsptResult())
+ .setPlatItemId(warehouseAreasItems.getPlatItemId())
+ .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
+ .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
+ .setProjectCode(warehouseAreasItems.getProjectCode())
.setBatch(warehouseAreasItems.getSplrBatch())
.setUnit(warehouseAreasItems.getStockUnit())
.setFieldsIndex(warehouseAreasItems.getFieldsIndex())
@@ -154,7 +157,7 @@
for (WaitPakinItem pakinItem : items) {
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
+ .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
if (Objects.isNull(one)) {
throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
}
@@ -190,24 +193,71 @@
public synchronized WaitPakin unBind(WaitPakinParam param) {
String barcode = param.getBarcode();
if (StringUtils.isNotBlank(barcode)) {
- WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
+ WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode));
if (Objects.isNull(waitPakins)) {
throw new CoolException("缁勬墭涓嶅瓨鍦紒锛�");
}
List<PakinItem> paramItems = param.getItems();
+
if (Objects.isNull(paramItems) || paramItems.isEmpty()) {
throw new CoolException("瑙ｇ粦鐗╂枡涓嶈兘涓虹┖锛侊紒");
}
- List<Long> list = paramItems.stream().map(PakinItem::getMatnrId).collect(Collectors.toList());
+ List<Long> list = paramItems.stream().map(PakinItem::getId).collect(Collectors.toList());
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
- .eq(WaitPakinItem::getPakinId, waitPakins.getId())
- .in(WaitPakinItem::getMatnrId, list));
+ .in(WaitPakinItem::getId, list)
+ );
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<Long> list2 = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
+ List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list2);
+ for (int i1 = 0; i1 < pakinItems.size(); i1++) {
+ for (PakinItem item : paramItems) {
+ if (item.getId().equals(pakinItems.get(i1).getId())) {
+ 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 i = 0; i < warehouseAreasItems.size(); i++) {
+ if (warehouseAreasItems.get(i).getId().equals(pakinItems.get(i1).getSource())) {
+ double v = warehouseAreasItems.get(i).getWorkQty() - item.getReceiptQty();
+ warehouseAreasItems.get(i).setWorkQty(v);
+ if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
+ throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+ }
+ }
+ }
+
+ 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("缁勬墭鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ waitPakins.setAnfme(waitPakins.getAnfme() - anfmes);
+ if (!waitPakinService.updateById(waitPakins)) {
+ throw new CoolException("缁勬墭鏁版嵁淇敼澶辫触锛侊紒");
+ }
}
return waitPakins;
}
@@ -231,27 +281,33 @@
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);
+ 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("鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
@@ -259,13 +315,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