From be0589d61b2d13a12e0dc0f43591175bcae1261e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 10:19:07 +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 | 312 +++++++++------------------------------------------
1 files changed, 59 insertions(+), 253 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 5d8fade..99b3d68 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
@@ -50,194 +50,6 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId) {
- if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
- throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
- }
- if (StringUtils.isBlank(waitPakin.getBarcode())) {
- throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
- }
- List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
- WaitPakin list = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .notIn(WaitPakin::getIoStatus, asList)
- .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
- if (!Objects.isNull(list)) {
- throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶缁勬墭鍗曪細" + list.getCode() + "浣跨敤锛侊紒");
- }
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
- if (!locs.isEmpty()) {
- List<String> locCodes = locs.stream().map(Loc::getCode).collect(Collectors.toList());
- String join = StringUtils.join(locCodes, ",");
- throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒");
- }
- double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
-
- WaitPakin waitPakin1 = new WaitPakin();
- WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .in(WaitPakin::getIoStatus, asList)
- .eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
- if (Objects.isNull(pakin)) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAIT_PAKIN_CODE, null);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
- }
- waitPakin1.setCode(ruleCode)
- //鐘舵�佷慨鏀逛负鍏ュ簱涓�
- .setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
- .setAnfme(sum)
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setBarcode(waitPakin.getBarcode());
- if (!this.save(waitPakin1)) {
- throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
- }
- } else {
- BeanUtils.copyProperties(pakin, waitPakin1);
- waitPakin1.setAnfme(sum);
- if (!this.saveOrUpdate(waitPakin1)) {
- throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
- }
- }
- /**搴撳瓨鎵规*/
- List<String> tracks = waitPakin.getItems().stream().map(PakinItem::getBatch).collect(Collectors.toList());
- List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
- .eq(WaitPakinItem::getPakinId, waitPakin1.getId())
- .in(WaitPakinItem::getBatch, tracks));
- if (!pakinItems.isEmpty()) {
- if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>()
- .eq(WaitPakinItem::getPakinId, waitPakin1.getId())
- .in(WaitPakinItem::getBatch, tracks))) {
- throw new CoolException("鍘熷崟鎹竻闄ゅけ璐ワ紒锛�");
- }
- }
- List<WaitPakinItem> items = new ArrayList<>();
- //涓嶈壇鏍囩缁勬墭
- if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getBatch, tracks));
- 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.getBatch().equals(item.getBatch())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
- }
- pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getBatch());
- }
- }
- items.add(pakinItem);
- }
- } else {
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, unit, stock_unit, work_qty, matnr_code, matnr_id, maktx")
- .lambda()
- .in(WarehouseAreasItem::getBatch, tracks)
- .eq(StringUtils.isNotBlank(waitPakin.getBatch()), WarehouseAreasItem::getSplrBatch, waitPakin.getBatch())
- .groupBy(WarehouseAreasItem::getSplrBatch,
- WarehouseAreasItem::getBatch);
- List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
- if (Objects.isNull(warehouseAreasItems) || warehouseAreasItems.isEmpty()) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
- }
- for (WarehouseAreasItem item : warehouseAreasItems) {
- WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(item.getAnfme())
- .setPakinId(waitPakin1.getId())
- .setAsnId(item.getAsnId())
- .setAsnCode(item.getAsnCode())
- .setAsnItemId(item.getId())
- .setBatch(item.getBatch())
- .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.getBatch().equals(item.getBatch())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
- }
- pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getBatch());
- }
- }
- items.add(pakinItem);
- }
-
-
- }
- double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
-
- if (!waitPakinItemService.saveBatch(items)) {
- throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
- }
-
- for (WaitPakinItem pakinItem : items) {
- WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getBatch, pakinItem.getBatch())
- );
- if (Objects.isNull(one)) {
- throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
- }
- one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty()) ;
- if (one.getWorkQty() > one.getAnfme()) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
- }
- if (!warehouseAreasItemService.saveOrUpdate(one)) {
- throw new CoolException("鏀惰揣鍖烘墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
- }
- }
-
-
-
- waitPakin1.setAnfme(sum1);
- if (!this.updateById(waitPakin1)) {
- throw new CoolException("缁勬墭鏁伴噺淇敼澶辫触锛侊紒");
- }
-
- //TODO 缁勬墭瀹屾垚鍚庯紝鎵ｅ噺鏀惰揣鍖哄簱瀛�
-
- return pakin;
- }
-
- /**
- * @param
- * @param userId
- * @return
- * @author Ryan
- * @description 缁勬墭
- * @time 2025/3/29 14:42
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
public synchronized WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
@@ -287,99 +99,93 @@
}
}
/**鐗╂枡璺熻釜鐮�*/
- List<String> tracks = waitPakin.getItems().stream().map(PakinItem::getTrackCode).collect(Collectors.toList());
+
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
- .eq(WaitPakinItem::getPakinId, waitPakin1.getId())
- .in(WaitPakinItem::getTrackCode, tracks));
+ .eq(WaitPakinItem::getPakinId, waitPakin1.getId()))
+ ;
if (!pakinItems.isEmpty()) {
if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakin1.getId())
- .in(WaitPakinItem::getTrackCode, tracks))) {
+ )) {
throw new CoolException("鍘熷崟鎹竻闄ゅけ璐ワ紒锛�");
}
}
List<WaitPakinItem> items = new ArrayList<>();
- //涓嶈壇鏍囩缁勬墭
- if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getTrackCode, tracks));
- 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 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 (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());
+ 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);
}
- items.add(pakinItem);
- }
- } else {
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, unit, stock_unit, work_qty, matnr_code, matnr_id, maktx")
- .lambda()
- .in(WarehouseAreasItem::getTrackCode, tracks)
- .eq(StringUtils.isNotBlank(waitPakin.getBatch()), WarehouseAreasItem::getSplrBatch, waitPakin.getBatch())
- .groupBy(WarehouseAreasItem::getSplrBatch,
- WarehouseAreasItem::getTrackCode);
- List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
- if (Objects.isNull(warehouseAreasItems) || warehouseAreasItems.isEmpty()) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
- }
- for (WarehouseAreasItem item : warehouseAreasItems) {
+ } else {
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
+ if (null == warehouseAreasItems) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
+ }
WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(item.getAnfme())
+ pakinItem.setAnfme(warehouseAreasItems.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())
+ .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(item.getMatnrCode());
- AsnOrder order = asnOrderService.getById(item.getAsnId());
+ .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(item.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
+ 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);
+
+
+
}
-
-
}
double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
--
Gitblit v1.9.1