From a0131e8ae6dedaac1f48e6dd40aee5955e205a9c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 30 四月 2026 18:14:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 b04fef3..618dbb5 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -451,13 +451,29 @@
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())){
+ WrkMast wrkMast1 = wrkMastService.selectOne(
+ new EntityWrapper<WrkMast>()
+ .eq("barcode", wrkMast.getBarcode())
+ .eq("io_type", 101)
+ );
+
+ if (Cools.isEmpty(wrkMast1)) {
break;
}
- if(!Cools.isEmpty(wrkMast1)) {
+
+ if ("Y".equals(wrkMast1.getLogMk().trim())) {
wrkMast1.setOveMk("Y");
+ if(!wrkMastService.updateById(wrkMast1)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鏇存柊閫�搴撹法鍖哄煙瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast1.getWrkNo());
+ }
+ break;
}
+ if (Objects.isNull(wrkMast1.getIsSuplus())) {
+ break;
+ }
+
+ wrkMast1.setOveMk("Y");
if(!wrkMastService.updateById(wrkMast1)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鏇存柊閫�搴撹法鍖哄煙瀹屾垚鐘舵�佸け璐�; [workNo=" + wrkMast1.getWrkNo());
--
Gitblit v1.9.1