From c16428f4d68b84fc09331671755487ce373fd657 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 21 四月 2026 15:01:50 +0800
Subject: [PATCH] #优化工作档和工作号事务V3.0.0.7
---
src/main/java/com/zy/asrs/task/WrkMastFinalizeProcessor.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastFinalizeProcessor.java b/src/main/java/com/zy/asrs/task/WrkMastFinalizeProcessor.java
index ead36b2..9faa869 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastFinalizeProcessor.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastFinalizeProcessor.java
@@ -97,13 +97,13 @@
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
log.error("鍏ュ簱瀹屾垚娓呯悊澶辫触锛岀洰鏍囧簱浣嶆洿鏂板け璐ャ�倃rkNo={}, locNo={}", wrkNo, wrkMast.getLocNo());
- return;
+ throw new IllegalStateException("鍏ュ簱瀹屾垚娓呯悊鏇存柊鐩爣搴撲綅澶辫触锛屼簨鍔″洖婊氥�倃rkNo=" + wrkNo + ", locNo=" + wrkMast.getLocNo());
}
archiveAndFinish(wrkMast);
if (wrkMastService.deleteByWrkNoAndCurrentWrkSts(wrkMast.getWrkNo(), WrkStsType.COMPLETE_INBOUND.sts) <= 0) {
log.error("鍏ュ簱瀹屾垚娓呯悊澶辫触锛屽垹闄ゅ伐浣滄。澶辫触鎴栫姸鎬佸凡鍙樺寲銆倃rkNo={}", wrkNo);
- return;
+ throw new IllegalStateException("鍏ュ簱瀹屾垚娓呯悊鍒犻櫎宸ヤ綔妗ｅけ璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo);
}
notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
@@ -142,13 +142,13 @@
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
log.error("鍑哄簱瀹屾垚娓呯悊澶辫触锛屾簮搴撲綅鏇存柊澶辫触銆倃rkNo={}, sourceLocNo={}", wrkNo, wrkMast.getSourceLocNo());
- return;
+ throw new IllegalStateException("鍑哄簱瀹屾垚娓呯悊鏇存柊婧愬簱浣嶅け璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo + ", sourceLocNo=" + wrkMast.getSourceLocNo());
}
archiveAndFinish(wrkMast);
if (wrkMastService.deleteByWrkNoAndCurrentWrkSts(wrkMast.getWrkNo(), WrkStsType.COMPLETE_OUTBOUND.sts) <= 0) {
log.error("鍑哄簱瀹屾垚娓呯悊澶辫触锛屽垹闄ゅ伐浣滄。澶辫触鎴栫姸鎬佸凡鍙樺寲銆倃rkNo={}", wrkNo);
- return;
+ throw new IllegalStateException("鍑哄簱瀹屾垚娓呯悊鍒犻櫎宸ヤ綔妗ｅけ璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo);
}
notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
@@ -186,7 +186,7 @@
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
log.error("绉诲簱瀹屾垚娓呯悊澶辫触锛岀洰鏍囧簱浣嶆洿鏂板け璐ャ�倃rkNo={}, locNo={}", wrkNo, wrkMast.getLocNo());
- return;
+ throw new IllegalStateException("绉诲簱瀹屾垚娓呯悊鏇存柊鐩爣搴撲綅澶辫触锛屼簨鍔″洖婊氥�倃rkNo=" + wrkNo + ", locNo=" + wrkMast.getLocNo());
}
sourceLocMast.setLocSts("O");
@@ -194,13 +194,13 @@
sourceLocMast.setModiTime(new Date());
if (!locMastService.updateById(sourceLocMast)) {
log.error("绉诲簱瀹屾垚娓呯悊澶辫触锛屾簮搴撲綅鏇存柊澶辫触銆倃rkNo={}, sourceLocNo={}", wrkNo, wrkMast.getSourceLocNo());
- return;
+ throw new IllegalStateException("绉诲簱瀹屾垚娓呯悊鏇存柊婧愬簱浣嶅け璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo + ", sourceLocNo=" + wrkMast.getSourceLocNo());
}
archiveAndFinish(wrkMast);
if (wrkMastService.deleteByWrkNoAndCurrentWrkSts(wrkMast.getWrkNo(), WrkStsType.COMPLETE_LOC_MOVE.sts) <= 0) {
log.error("绉诲簱瀹屾垚娓呯悊澶辫触锛屽垹闄ゅ伐浣滄。澶辫触鎴栫姸鎬佸凡鍙樺寲銆倃rkNo={}", wrkNo);
- return;
+ throw new IllegalStateException("绉诲簱瀹屾垚娓呯悊鍒犻櫎宸ヤ綔妗ｅけ璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo);
}
notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
@@ -222,6 +222,7 @@
archiveAndFinish(wrkMast);
if (wrkMastService.deleteByWrkNoAndCurrentWrkSts(wrkMast.getWrkNo(), WrkStsType.COMPLETE_CRN_MOVE.sts) <= 0) {
log.error("鍫嗗灈鏈虹Щ浣嶅畬鎴愭竻鐞嗗け璐ワ紝鍒犻櫎宸ヤ綔妗ｅけ璐ユ垨鐘舵�佸凡鍙樺寲銆倃rkNo={}", wrkNo);
+ throw new IllegalStateException("鍫嗗灈鏈虹Щ浣嶅畬鎴愭竻鐞嗗垹闄ゅ伐浣滄。澶辫触锛屼簨鍔″洖婊氥�倃rkNo=" + wrkNo);
}
});
}
@@ -242,7 +243,7 @@
archiveAndFinish(wrkMast);
if (wrkMastService.deleteByWrkNoAndMkIn(wrkMast.getWrkNo(), CANCEL_MKS) <= 0) {
log.error("鍙栨秷浠诲姟娓呯悊澶辫触锛屽垹闄ゅ伐浣滄。澶辫触鎴栨爣璁板凡鍙樺寲銆倃rkNo={}, mk={}", wrkNo, wrkMast.getMk());
- return;
+ throw new IllegalStateException("鍙栨秷浠诲姟娓呯悊鍒犻櫎宸ヤ綔妗ｅけ璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo + ", mk=" + wrkMast.getMk());
}
if (Objects.equals(wrkMast.getIoType(), WrkIoType.IN.id)) {
@@ -250,14 +251,18 @@
if (locMast != null) {
locMast.setLocSts(String.valueOf(LocStsType.O));
locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+ if (!locMastService.updateById(locMast)) {
+ throw new IllegalStateException("鍙栨秷浠诲姟娓呯悊鎭㈠鍏ュ簱鐩爣搴撲綅澶辫触锛屼簨鍔″洖婊氥�倃rkNo=" + wrkNo + ", locNo=" + wrkMast.getLocNo());
+ }
}
} else if (Objects.equals(wrkMast.getIoType(), WrkIoType.OUT.id)) {
LocMast locMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
if (locMast != null) {
locMast.setLocSts(String.valueOf(LocStsType.F));
locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+ if (!locMastService.updateById(locMast)) {
+ throw new IllegalStateException("鍙栨秷浠诲姟娓呯悊鎭㈠鍑哄簱婧愬簱浣嶅け璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo + ", sourceLocNo=" + wrkMast.getSourceLocNo());
+ }
}
} else if (Objects.equals(wrkMast.getIoType(), WrkIoType.LOC_MOVE.id)) {
LocMast sourceLocMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
@@ -265,12 +270,16 @@
if (sourceLocMast != null && String.valueOf(LocStsType.R).equals(sourceLocMast.getLocSts())) {
sourceLocMast.setLocSts(String.valueOf(LocStsType.F));
sourceLocMast.setModiTime(new Date());
- locMastService.updateById(sourceLocMast);
+ if (!locMastService.updateById(sourceLocMast)) {
+ throw new IllegalStateException("鍙栨秷浠诲姟娓呯悊鎭㈠绉诲簱婧愬簱浣嶅け璐ワ紝浜嬪姟鍥炴粴銆倃rkNo=" + wrkNo + ", sourceLocNo=" + wrkMast.getSourceLocNo());
+ }
}
if (locMast != null && String.valueOf(LocStsType.S).equals(locMast.getLocSts())) {
locMast.setLocSts(String.valueOf(LocStsType.O));
locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+ if (!locMastService.updateById(locMast)) {
+ throw new IllegalStateException("鍙栨秷浠诲姟娓呯悊鎭㈠绉诲簱鐩爣搴撲綅澶辫触锛屼簨鍔″洖婊氥�倃rkNo=" + wrkNo + ", locNo=" + wrkMast.getLocNo());
+ }
}
}
--
Gitblit v1.9.1