From f99e3966686d3891b814ff28d200b001fcdc8e1e Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 12:54:26 +0800
Subject: [PATCH] 组托优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 152 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 56 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 0dc85d7..a4af675 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
@@ -8,6 +8,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.mapper.WaitPakinMapper;
+import com.vincent.rsf.server.manager.mapper.MatnrMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -41,6 +42,8 @@
private TaskService taskService;
@Autowired
private TaskItemService taskItemService;
+ @Autowired
+ private MatnrMapper matnrMapper;
/**
@@ -63,34 +66,22 @@
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ // 濡傛灉瀹瑰櫒鍙峰凡缁忕粍鎵樿繃锛屾彁绀哄凡缁勬墭锛岃鏇存崲瀹瑰櫒鏉＄爜
+ if (!Objects.isNull(pakin)) {
+ throw new CoolException("宸茬粍鎵橈紝璇锋洿鎹㈠鍣ㄦ潯鐮�");
+ }
+
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, waitPakin.getBarcode()));
if (!tasks.isEmpty()) {
throw new CoolException("褰撳墠鎵樼洏宸叉湁浠诲姟妗ｅ湪鎵ц锛屼笉鑳藉啀娆＄粍鎵橈紒锛�");
}
- if (!Objects.isNull(pakin)) {
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(!Objects.isNull(pakin.getId()) ,WaitPakinItem::getPakinId, pakin.getId()));
- waitPakinItems.forEach(item -> {
- for (PakinItem pakinItem : waitPakin.getItems()) {
- WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
- if (Objects.isNull(warehouseAreasItems)) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖烘垨宸茬粍鎵樺畬鎴愮Щ鍑烘敹璐у尯锛侊紒");
- }
- // 鍙湪绁ㄥ彿涓嶄负绌烘椂鎵嶈繘琛岄噸澶嶆鏌�
- if (!Objects.isNull(item.getFieldsIndex()) && !Objects.isNull(warehouseAreasItems.getFieldsIndex())
- && item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
- String crushNo = item.getExtendFields() != null ? item.getExtendFields().get("crushNo") : "";
- throw new CoolException("绁ㄥ彿锛�" + crushNo + "宸茬粍鎵橈紝涓嶅彲閲嶅缁勬墭锛侊紒");
- }
- }
- });
- }
-
+
+ // 妫�鏌ュ鍣ㄥ彿鏄惁鍦ㄥ簱瀛樹腑瀛樺湪锛堥�氳繃搴撲綅琛ㄦ煡璇級
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 + "浣跨敤锛侊紒");
+ throw new CoolException("鍦ㄥ簱锛岃鏇存崲瀹瑰櫒鏉＄爜");
}
+
double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
WaitPakin waitPakin1 = new WaitPakin();
@@ -115,46 +106,90 @@
List<WaitPakinItem> items = new ArrayList<>();
for (PakinItem pakinItem1 : waitPakin.getItems()) {
- //涓嶈壇鏍囩缁勬墭
- 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())
- .setPlatItemId(warehouseAreasItems.getPlatItemId())
- .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
- .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
- .setProjectCode(warehouseAreasItems.getProjectCode())
- .setBatch(warehouseAreasItems.getSplrBatch())
- .setUnit(warehouseAreasItems.getStockUnit())
- .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
- .setMatnrId(warehouseAreasItems.getMatnrId())
- .setMaktx(warehouseAreasItems.getMaktx())
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setMatnrCode(warehouseAreasItems.getMatnrCode());
- WkOrder 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()));
- }
+
+ // 濡傛灉ASN鍗曞彿涓虹┖锛屼粠鐗╂枡淇℃伅琛ㄨ幏鍙栫墿鏂欎俊鎭紝涓嶆煡璇㈡敹璐у尯
+ if (StringUtils.isBlank(pakinItem1.getAsnCode())) {
+ if (Objects.isNull(pakinItem1.getMatnrId())) {
+ throw new CoolException("鐗╂枡ID涓嶈兘涓虹┖锛侊紒");
+ }
+
+ // 浠庣墿鏂欎俊鎭〃鑾峰彇鐗╂枡淇℃伅
+ Matnr matnr = matnrMapper.selectById(pakinItem1.getMatnrId());
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡淇℃伅涓嶅瓨鍦紝鐗╂枡ID锛�" + pakinItem1.getMatnrId());
+ }
+
+ // 璁剧疆缁勬墭鏄庣粏淇℃伅锛堜笉璁剧疆source锛屽洜涓轰笉鍦ㄦ敹璐у尯锛�
+ pakinItem.setPakinId(waitPakin1.getId())
+ .setSource(null) // 涓嶅湪鏀惰揣鍖猴紝source璁句负null
+ .setAsnId(null)
+ .setAsnCode(null)
+ .setAsnItemId(null)
+ .setIsptResult(null)
+ .setPlatItemId(null)
+ .setPlatOrderCode(null)
+ .setPlatWorkCode(null)
+ .setProjectCode(null)
+ .setBatch(null)
+ .setUnit(matnr.getStockUnit())
+ .setFieldsIndex(matnr.getFieldsIndex())
+ .setMatnrId(matnr.getId())
+ .setMaktx(matnr.getName())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(matnr.getCode());
+
+ // 璁剧疆缁勬墭鏁伴噺
+ if (pakinItem1.getReceiptQty() == null || pakinItem1.getReceiptQty().compareTo(0.0) <= 0) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紒锛�");
+ }
+ pakinItem.setAnfme(pakinItem1.getReceiptQty())
+ .setTrackCode(pakinItem1.getTrackCode());
+ } else {
+ // 鏈堿SN鍗曞彿锛屼粠鏀惰揣鍖鸿幏鍙栫墿鏂欎俊鎭�
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
+ if (null == warehouseAreasItems) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
+ }
+
+ pakinItem.setAnfme(warehouseAreasItems.getAnfme())
+ .setPakinId(waitPakin1.getId())
+ .setSource(warehouseAreasItems.getId())
+ .setAsnId(warehouseAreasItems.getAsnId())
+ .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())
+ .setMatnrId(warehouseAreasItems.getMatnrId())
+ .setMaktx(warehouseAreasItems.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(warehouseAreasItems.getMatnrCode());
+
+ WkOrder 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("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
+ 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());
}
- pakinItem.setAnfme(waitPakinItem.getReceiptQty())
- .setTrackCode(waitPakinItem.getTrackCode());
}
}
+
items.add(pakinItem);
}
@@ -170,6 +205,11 @@
// Double total = Math.round((sum + waitSum) * 100) / 100.0;
for (WaitPakinItem pakinItem : items) {
+ // 濡傛灉source涓虹┖锛堟病鏈堿SN鍗曞彿锛屼笉鍦ㄦ敹璐у尯锛夛紝璺宠繃鏀惰揣鍖烘洿鏂�
+ if (Objects.isNull(pakinItem.getSource())) {
+ continue;
+ }
+
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
.eq(WarehouseAreasItem::getId, pakinItem.getSource()));
if (Objects.isNull(one)) {
--
Gitblit v1.9.1