From 90e8096a24e55fa40fbd5dbf7b9d94a6d88940d7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 20 七月 2025 16:20:59 +0800
Subject: [PATCH] 成品库出入库分配堆垛机顺序321
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 df2e686..8f19b75 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -55,10 +55,12 @@
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
try {
- if (null == locMast && wrkMast.getIoType() != 2) {
-// exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("宸ヤ綔妗workNo=" + wrkMast.getWrkNo() + "]搴撲綅鍙烽敊璇痆locNo=" + wrkMast.getLocNo() + "]");
+ if (wrkMast.getIoType() != 3) {
+ if (null == locMast) {
+ // exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("宸ヤ綔妗workNo=" + wrkMast.getWrkNo() + "]搴撲綅鍙烽敊璇痆locNo=" + wrkMast.getLocNo() + "]");
+ }
}
switch (wrkMast.getIoType()) {
@@ -69,7 +71,7 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
locMast.setBarcode(wrkMast.getBarcode());
}
- locMast.setLocSts(wrkMast.getSourceStaNo() == 1027 || wrkMast.getSourceStaNo() == 1020 ? "M" : "Z");
+ locMast.setLocSts(wrkMast.getPltType() == 1 ? "M" : "Z");
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -364,9 +366,9 @@
// 搴撲綅绉昏浆
case 11:
// 榛樿鐩爣搴撲綅鏄┖鏉�
- String locSts = "D";
+ String locSts = wrkMast.getEmptyMk();
// 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
- if (wrkMast.getEmptyMk().equals("N")) {
+ if (locSts.equals("N")) {
locSts = "F";
// 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
@@ -540,6 +542,10 @@
}
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(15L);
+ // 绌烘《鍑哄簱瀹屾垚锛岀姸鎬佹敼涓�2.璁惧涓婅蛋
+ if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
+ wrkMast.setWrkSts(2L);
+ }
wrkMast.setModiTime(now);
if (!wrkMastService.updateById(wrkMast)) {
// exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
--
Gitblit v1.9.1