From dc60b3451a2984722c01a5991e5b904b8bd44f0d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 21:30:33 +0800
Subject: [PATCH] 组绑解绑
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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..4edc38d 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
@@ -154,7 +154,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,7 +190,7 @@
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("缁勬墭涓嶅瓨鍦紒锛�");
}
@@ -198,10 +198,10 @@
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::getSource, list));
if (pakinItems.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻槑缁嗕笉瀛樺湪锛侊紒");
}
@@ -209,6 +209,31 @@
if (!waitPakinItemService.removeByIds(ids)) {
throw new CoolException("缁勬墭鏄庣粏瑙ｇ粦澶辫触锛侊紒");
}
+
+ List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.listByIds(list);
+ for (int i1 = 0; i1 < pakinItems.size(); i1++) {
+ 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();
+ warehouseAreasItems.get(i).setWorkQty(v);
+ if (!warehouseAreasItemService.updateById(warehouseAreasItems.get(i))) {
+ throw new CoolException("鏀惰揣鍖烘暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+ }
+ 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;
}
return new WaitPakin();
--
Gitblit v1.9.1