From 4f2b7db1184798a55046f04e17d5540b4a7e19f4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 29 四月 2026 11:12:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 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 5a47a0b..b04fef3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -450,17 +450,18 @@
// }
movLoc(wrkMast);
break;
- case 2:WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode",wrkMast.getBarcode()).eq("io_type",101));
- if(Objects.isNull(wrkMast1.getIsSuplus())){
- break;
- }
- if(!Cools.isEmpty(wrkMast1)) {
- wrkMast1.setOveMk("Y");
- }
- if(!wrkMastService.updateById(wrkMast1)) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鏇存柊閫�搴撹法鍖哄煙瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast1.getWrkNo());
- }break;
+ case 2:
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode",wrkMast.getBarcode()).eq("io_type",101));
+ if(Objects.isNull(wrkMast1.getIsSuplus())){
+ break;
+ }
+ if(!Cools.isEmpty(wrkMast1)) {
+ wrkMast1.setOveMk("Y");
+ }
+ if(!wrkMastService.updateById(wrkMast1)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鏇存柊閫�搴撹法鍖哄煙瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast1.getWrkNo());
+ }break;
default:
break;
}
@@ -508,6 +509,7 @@
public void movLoc(WrkMast wrkMast) {
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+
if (Objects.isNull(locMast)) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
}
@@ -619,19 +621,22 @@
wrkMastService.updateById(wrkMast1);
}
}
- movLoc(wrkMast);
- LocMast locMastTarget = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
- // 淇敼搴撲綅鐘舵�� S ====>> F
- if (locMastTarget.getLocSts().equals("S")) {
- locMastTarget.setLocSts("F");
- locMastTarget.setBarcode(wrkMast.getBarcode());
- locMastTarget.setIoTime(now);
- locMastTarget.setModiTime(now);
- if (!locMastService.updateById(locMastTarget)) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("閫�搴撹法鍖哄煙鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ if(!Objects.isNull(wrkMast.getLocNo())){
+ movLoc(wrkMast);
+ LocMast locMastTarget = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
+ // 淇敼搴撲綅鐘舵�� S ====>> F
+ if (locMastTarget.getLocSts().equals("S")) {
+ locMastTarget.setLocSts("F");
+ locMastTarget.setBarcode(wrkMast.getBarcode());
+ locMastTarget.setIoTime(now);
+ locMastTarget.setModiTime(now);
+ if (!locMastService.updateById(locMastTarget)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("閫�搴撹法鍖哄煙鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
}
}
+
if(!Objects.isNull(wrkMast.getPacked())){
LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", wrkMast.getSourceLocNo()));
if (Objects.isNull(bLocNo)) {
--
Gitblit v1.9.1