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 | 154 ++++++++++++++++++++++++---------------------------
1 files changed, 73 insertions(+), 81 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 28d32d7..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
@@ -107,79 +107,45 @@
List<WaitPakinItem> items = new ArrayList<>();
for (PakinItem pakinItem1 : waitPakin.getItems()) {
//涓嶈壇鏍囩缁勬墭
- if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnCode, pakinItem1.getAsnCode()));
- if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- for (AsnOrderItem item : orderItems) {
- WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(item.getAnfme())
- .setPakinId(waitPakin1.getId())
- .setAsnId(item.getAsnId())
- .setAsnCode(item.getAsnCode())
- .setAsnItemId(item.getId())
- .setBatch(item.getSplrBatch())
- .setUnit(item.getStockUnit())
- .setFieldsIndex(item.getFieldsIndex())
- .setMatnrId(item.getMatnrId())
- .setMaktx(item.getMaktx())
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setMatnrCode(item.getMatnrCode());
- AsnOrder order = asnOrderService.getById(item.getAsnId());
- if (!Objects.isNull(order)) {
- pakinItem.setType(null == order.getType() ? null :order.getType())
- .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
- }
- for (PakinItem waitPakinItem : waitPakin.getItems()) {
- if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
- }
- pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
- }
- }
- items.add(pakinItem);
- }
- } else {
- WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
- if (null == warehouseAreasItems) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
- }
- WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(warehouseAreasItems.getAnfme())
- .setPakinId(waitPakin1.getId())
- .setSource(warehouseAreasItems.getId())
- .setAsnId(warehouseAreasItems.getAsnId())
- .setAsnCode(warehouseAreasItems.getAsnCode())
- .setAsnItemId(warehouseAreasItems.getId())
- .setBatch(warehouseAreasItems.getSplrBatch())
- .setUnit(warehouseAreasItems.getStockUnit())
- .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
- .setMatnrId(warehouseAreasItems.getMatnrId())
- .setMaktx(warehouseAreasItems.getMaktx())
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setMatnrCode(warehouseAreasItems.getMatnrCode());
- AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
- if (!Objects.isNull(order)) {
- pakinItem.setType(null == order.getType() ? null :order.getType())
- .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
- }
-
- for (PakinItem waitPakinItem : waitPakin.getItems()) {
- if (waitPakinItem.getTrackCode().equals(warehouseAreasItems.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
- }
- pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
- }
- }
- items.add(pakinItem);
-
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
+ if (null == warehouseAreasItems) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
}
+ WaitPakinItem pakinItem = new WaitPakinItem();
+ pakinItem.setAnfme(warehouseAreasItems.getAnfme())
+ .setPakinId(waitPakin1.getId())
+ .setSource(warehouseAreasItems.getId())
+ .setAsnId(warehouseAreasItems.getAsnId())
+ .setAsnCode(warehouseAreasItems.getAsnCode())
+ .setAsnItemId(warehouseAreasItems.getAsnItemId())
+ .setIsptResult(warehouseAreasItems.getIsptResult())
+ .setBatch(warehouseAreasItems.getSplrBatch())
+ .setUnit(warehouseAreasItems.getStockUnit())
+ .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
+ .setMatnrId(warehouseAreasItems.getMatnrId())
+ .setMaktx(warehouseAreasItems.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(warehouseAreasItems.getMatnrCode());
+ AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null : order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
+ }
+
+ for (PakinItem waitPakinItem : waitPakin.getItems()) {
+ if (waitPakinItem.getId().equals(warehouseAreasItems.getId())) {
+ if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
+ }
+ pakinItem.setAnfme(waitPakinItem.getReceiptQty())
+ .setTrackCode(waitPakinItem.getTrackCode());
+ }
+ }
+ items.add(pakinItem);
+
}
+
double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
if (!waitPakinItemService.saveBatch(items)) {
@@ -188,13 +154,12 @@
for (WaitPakinItem pakinItem : items) {
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getTrackCode, pakinItem.getTrackCode())
- .eq(!Cools.isEmpty(pakinItem.getBatch()),WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
+ .eq(WarehouseAreasItem::getId, pakinItem.getSource()));
if (Objects.isNull(one)) {
throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
}
- one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
- .setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty()) ;
+// one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
+ one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty());
if (one.getWorkQty() > one.getAnfme()) {
throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
}
@@ -214,10 +179,10 @@
}
/**
- * @author Ryan
- * @description 缁勬墭瑙ｇ粦
* @param
* @return
+ * @author Ryan
+ * @description 缁勬墭瑙ｇ粦
* @time 2025/3/29 14:42
*/
@Override
@@ -225,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("缁勬墭涓嶅瓨鍦紒锛�");
}
@@ -233,16 +198,41 @@
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("鏁版嵁閿欒锛氱粍鎵樻槑缁嗕笉瀛樺湪锛侊紒");
}
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 (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;
}
@@ -279,7 +269,9 @@
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 (Objects.isNull(pakin)) {
+ continue;
+ }
double sum = pakin.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
item.setWorkQty(item.getWorkQty() - sum)
.setAnfme(item.getAnfme() + sum);
--
Gitblit v1.9.1