From eb9f657ffcf402bab8d9b3413ec7ede45d8e21d4 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期六, 20 十二月 2025 18:18:42 +0800
Subject: [PATCH] 空托出库2排未统计异常
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index a496365..343d469 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1254,6 +1254,43 @@
if (zpalletCount2 > 0) {
throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo());
}
+
+ // 鍗峰彿
+ HashMap<String, Object> yy = new HashMap<>();
+ // 绠卞彿
+ HashMap<String, Object> zz = new HashMap<>();
+ List<GwmsGenerateInventoryDto.Rolls> rolls = obj.getRolls();
+ for(GwmsGenerateInventoryDto.Rolls roll :rolls) {
+ barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("model", roll.getRollNo()));
+ if (barcodeCount2 > 0) {
+ throw new CoolException("鍗峰彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + roll.getRollNo());
+ }
+ zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("model", roll.getRollNo()));
+ if (zpalletCount2 > 0) {
+ throw new CoolException("鍗峰彿宸插瓨鍦ㄥ簱瀛橈細" + roll.getRollNo());
+ }
+
+ barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("unit", roll.getBoxNo()));
+ if (barcodeCount2 > 0) {
+ throw new CoolException("绠卞彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + roll.getBoxNo());
+ }
+ zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("unit", roll.getBoxNo()));
+ if (zpalletCount2 > 0) {
+ throw new CoolException("绠卞彿宸插瓨鍦ㄥ簱瀛橈細" + roll.getBoxNo());
+ }
+
+ if (yy.get(roll.getRollNo()) != null) {
+ throw new CoolException("鏄庣粏涓瓨鍦�2鏉＄浉鍚岀殑鍗峰彿锛�" + roll.getRollNo());
+ } else {
+ yy.put(roll.getRollNo(), roll.getRollNo());
+ }
+
+ if (zz.get(roll.getBoxNo()) != null) {
+ throw new CoolException("鏄庣粏涓瓨鍦�2鏉＄浉鍚岀殑绠卞彿锛�" + roll.getBoxNo());
+ } else {
+ zz.put(roll.getBoxNo(), roll.getBoxNo());
+ }
+ }
if (xx.get(obj.getPackageGroupNo()) != null) {
throw new CoolException("鏄庣粏涓瓨鍦�2鏉＄浉鍚岀殑鍖呰缁勫彿锛�" + obj.getPackageGroupNo());
} else {
@@ -1535,7 +1572,7 @@
return "鍑哄簱缁撴灉涓婃姤鎴愬姛";
}
- private void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
+ public void ckjgsbPushMes(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
GwmsGenerateInventoryDto gwmsGenerateInventoryDto = new GwmsGenerateInventoryDto();
gwmsGenerateInventoryDto.setWarehouseType(4);
gwmsGenerateInventoryDto.setBarcode(wrkMast.getBarcode());
@@ -1562,8 +1599,8 @@
matList.setStockType(wrkMast.getStaNo() == 2041 ? "杩斾慨鍑哄簱" : "鎴愬搧鍑哄簱");
matList.setBoxType(wrkDetl.getColor());
matList.setRollType(wrkDetl.getManu());
- matList.setWideInWidth(wrkDetl.getSku());
- matList.setThickness(wrkDetl.getItemNum());
+ matList.setWideInWidth(wrkDetl.getItemNum());
+ matList.setThickness(wrkDetl.getSku());
List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
wrkDetl.getUnit(), wrkDetl.getMaktx(), wrkDetl.getLength(),
@@ -1645,7 +1682,7 @@
// 瀵绘壘绌烘墭鐩樺簱浣嶏紝鍏堟壘娴呭簱浣�
List<LocMast> locMasts;
locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D")
- .orderAsc(Arrays.asList("row1", "lev1", "bay1")).in("crn_no", crnNoList).in("row1", 3, 4, 6, 7, 10, 11, 14, 15, 18, 19, 22, 23));
+ .orderAsc(Arrays.asList("row1", "lev1", "bay1")).in("crn_no", crnNoList).in("row1", 2, 3, 6, 7, 10, 11, 14, 15, 18, 19, 22, 23));
if (locMasts.isEmpty()) {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D")
.orderAsc(Arrays.asList("row1", "lev1", "bay1")).in("crn_no", crnNoList).in("row1", 1, 4, 5, 8, 9, 12, 13, 16, 17, 20, 21, 24));
@@ -1673,7 +1710,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(14D);
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
--
Gitblit v1.9.1