From 029ffbf20db7196d4f460bc741fd5f36a80689ae Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 19:55:45 +0800
Subject: [PATCH] 空板回库称重再校验
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 bb1db08..f76c634 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -97,11 +97,6 @@
return FAIL.setMsg("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
-
-
-
-
-
break;
// 鍏ㄦ澘鍏ュ簱
case 1:
@@ -133,9 +128,9 @@
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
if (!Objects.isNull(wrkMast.getWrkCode())) {
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- } else {
locDetl.setAnfme(wrkDetl.getRealQty());
+ } else {
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
}
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
@@ -148,8 +143,9 @@
}
//鍒ゆ柇鍖归厤缂栫爜涓嶄负绌猴紝涓斾换鍔＄紪鐮佸寘鍚�-2锛岀‘璁や负鏈変笂缁勪换鍔�
- if (!Objects.isNull(wrkMast.getWrkCode()) && wrkMast.getWrkCode().contains("-2")) {
+ if (!Objects.isNull(wrkMast.getWrkCode())) {
//涓嶉渶瑕佹洿鏂板崟鎹俊鎭紙瀛愪换鍔℃棤鍗曟嵁
+
} else {
//姝ｅ父鍗曟嵁鎵嶅瓨瀛樺叆搴撳崟锛屼綔鍏ュ簱鍗曟嵁淇℃伅鏇存柊
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
@@ -452,15 +448,23 @@
}
/***/
- if (Objects.isNull(wrkMast.getWrkCode())) {
+ if (!Objects.isNull(wrkMast.getWrkCode())) {
LocMast lcmst = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
lcmst.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
if (!locMastService.updateById(lcmst)) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
-
+ LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", wrkMast.getSourceLocNo()));
+ if (Objects.isNull(bLocNo)) {
+ throw new CoolException("宸ヤ綅涓嶅瓨鍦� 锛侊紒");
+ }
+ bLocNo.setLocType(LocStsType.LOC_STS_TYPE_O.type);
+ if (!locAroundBindService.updateById(bLocNo)) {
+ throw new CoolException("宸ヤ綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()));
}
return SUCCESS;
--
Gitblit v1.9.1