From bfa307fb0fe82ce6f5a2ea354fcee43d9d1f0fa1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 13 四月 2026 09:53:06 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 128 +++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7afbf9d..55bb2db 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -185,23 +185,19 @@
wrkDetl.getStandby3(),
wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
}
- try {
- if (!Cools.isEmpty(orderDetlPakin)) {
- if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
- wrkDetl.getMatnr(),
- orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
- wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
- wrkDetl.getAnfme())) {
- // exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
- // wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
- + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
+ if (!Cools.isEmpty(orderDetlPakin)) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(),
+ wrkDetl.getMatnr(),
+ orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(),
+ wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(),
+ wrkDetl.getAnfme())) {
+ // exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
+ // wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
+ + "],[locNo=" + wrkMast.getLocNo() + "]");
}
- } catch (Exception ignore) {
-
}
}
// 淇敼搴撲綅鐘舵�� S ====>> F
@@ -370,35 +366,35 @@
.eq("supp_code", wrkDetl.getSuppCode())
.eq("matnr", wrkDetl.getMatnr())
.eq("loc_no", locMast.getLocNo()));
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
+// .eq("three_code", wrkDetl.getThreeCode()) //TODO 骞舵澘鏃堕渶瑕佷慨鏀笲SCODE涓鸿鍗昩scode
+ .eq("supp_code", wrkDetl.getSuppCode())
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("order_no", wrkDetl.getOrderNo()));
+ if (!Cools.isEmpty(detlPakin)) {
+ //浠诲姟鏄庣粏鏁伴噺=鏂板叆搴撴暟閲� + 鍘熷簱瀛樻暟閲�
+ double locQty = 0.0;
+ if (!Objects.isNull(locDetl)) {
+ locQty = locDetl.getAnfme();
+ }
+ double v = Math.round((wrkDetl.getAnfme() - locQty) * 10000) / 10000.0;
+ double v1 = Math.round((detlPakin.getQty() + v) * 10000) / 10000.0;
+ detlPakin.setQty(v1);
+ detlPakin.setWorkQty(v1);
+ detlPakin.setAdjustQty(wrkDetl.getAdjustQty());
+ detlPakin.setSplusQty(wrkDetl.getSplusQty());
+ if (!orderDetlPakinService.update(detlPakin, new EntityWrapper<OrderDetlPakin>()
+ .eq("matnr", detlPakin.getMatnr())
+ .eq("supp_code", detlPakin.getSuppCode())
+ .eq("order_no", detlPakin.getOrderNo()))) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
+ + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
if (null != locDetl) {
- // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin detlPakin = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
-// .eq("three_code", wrkDetl.getThreeCode()) //TODO 骞舵澘鏃堕渶瑕佷慨鏀笲SCODE涓鸿鍗昩scode
- .eq("supp_code", wrkDetl.getSuppCode())
- .eq("matnr", wrkDetl.getMatnr())
- .eq("order_no", wrkDetl.getOrderNo()));
- try {
- if (!Cools.isEmpty(detlPakin)) {
- double v = Math.round((wrkDetl.getAnfme() - locDetl.getAnfme()) * 10000) / 10000.0;
- double v1 = Math.round((detlPakin.getQty() + v) * 10000) / 10000.0;
- detlPakin.setQty(v1);
- detlPakin.setWorkQty(v1);
- detlPakin.setAdjustQty(wrkDetl.getAdjustQty());
- detlPakin.setSplusQty(wrkDetl.getSplusQty());
- if (!orderDetlPakinService.update(detlPakin, new EntityWrapper<OrderDetlPakin>()
- .eq("matnr", detlPakin.getMatnr())
- .eq("supp_code", detlPakin.getSuppCode())
- .eq("order_no", detlPakin.getOrderNo()))) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
- + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- } catch (Exception e) {
- log.error(e.getMessage());
- }
-
LocDetl detl = new LocDetl();
detl.setAnfme(wrkDetl.getAnfme());
detl.setStandby1(wrkDetl.getSuppCode());
@@ -452,27 +448,27 @@
}
}
- String agvSta = null;
- if (wrkMast.getIoType().equals(TaskIOType.MERGE_IN.type)) {
- agvSta = wrkMast.getPauseMk();
- }
- List<BasStationDetl> basStationDetls = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", agvSta));
- if (Objects.isNull(basStationDetls) || basStationDetls.isEmpty()) {
- // . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
- if (!Objects.isNull(agvSta)) {
- // 淇敼鐩爣绔欑偣淇℃伅
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", agvSta));
- if (Objects.isNull(station)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
- }
- basStationDetlService.delete(new EntityWrapper<BasStationDetl>()
- .eq("dev_no", station.getDevNo()));
- station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- }
- }
+// String agvSta = null;
+// if (wrkMast.getIoType().equals(TaskIOType.MERGE_IN.type)) {
+// agvSta = wrkMast.getPauseMk();
+// }
+// List<BasStationDetl> basStationDetls = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", agvSta));
+// if (Objects.isNull(basStationDetls) || basStationDetls.isEmpty()) {
+// // . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
+// if (!Objects.isNull(agvSta)) {
+// // 淇敼鐩爣绔欑偣淇℃伅
+// BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", agvSta));
+// if (Objects.isNull(station)) {
+// throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+// }
+// basStationDetlService.delete(new EntityWrapper<BasStationDetl>()
+// .eq("dev_no", station.getDevNo()));
+// station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
+// if (!basStationService.updateById(station)) {
+// throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+// }
+// }
break;
// 鐩樼偣鍏ュ簱
case 57:
@@ -1081,6 +1077,7 @@
}
return SUCCESS;
}
+
if (wrkMast.getTaskType().equals("agv_back")) {
wrkMast.setWrkSts(TaskStatusType.AGV_INVENTORY_UPDATED_IN.type);
wrkMast.setModiTime(new Date());
@@ -1089,6 +1086,7 @@
}
return SUCCESS;
}
+
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
if (!Objects.isNull(wrkMast.getSourceStaNo())) {
BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
@@ -1099,10 +1097,10 @@
station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
}
station.setBarcode("");
+// basStationService.updateById(station);
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
-
basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
}
}
--
Gitblit v1.9.1