From ad9e95343ccec55d45d73d9e814b7c68ac38e9ca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 八月 2025 10:55:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 ec618ba..f549c1b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -64,7 +64,7 @@
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
try {
- if (null == locMast) {
+ if (null == locMast && wrkMast.getIoType() != 3) {
// exceptionHandle("宸ヤ綔妗workNo={0}]搴撲綅鍙烽敊璇痆locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("宸ヤ綔妗workNo=" + wrkMast.getWrkNo() + "]搴撲綅鍙烽敊璇痆locNo=" + wrkMast.getLocNo() + "]");
@@ -121,7 +121,7 @@
locDetl.setBarcode(wrkMast.getBarcode());
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
- locDetl.setBatch("");
+// locDetl.setBatch("");
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -206,7 +206,7 @@
}
// 淇敼鎹℃枡鍏ュ簱鐨勫簱瀛樻槑缁嗙殑鐞嗚揣鐘舵�佷负寰呯悊璐�
- locDetlMapper.updateLhStsByLocNo(wrkMast.getLocNo(),1);
+ locDetlMapper.updateLhStsByLocNo(wrkMast.getLocNo(),0);
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
@@ -407,7 +407,8 @@
Integer count = orderDetlMapper.selectCount(new EntityWrapper<OrderDetl>().lt("danger", 2).eq("order_no", orderNo));
if (count == 0) {
// 鏇存柊鍗曟嵁涓哄凡瀹屾垚
- orderMapper.updateSettleByOrderNo(orderNo,4,null);
+ // 鐩存帴鏇存柊涓�6宸蹭笂鎶ワ紝鏂逛究杞偍鍘嗗彶
+ orderMapper.updateSettleByOrderNo(orderNo,6,null);
}
}
} else { // 绌烘澘杞Щ娌℃湁宸ヤ綔鏄庣粏,浣嗘槸瑕佹洿鏂板崟鎹槑缁嗙姸鎬�
@@ -430,7 +431,7 @@
Integer count = orderDetlMapper.selectCount(new EntityWrapper<OrderDetl>().lt("danger", 2).eq("order_no", order.getOrderNo()));
if (count == 0) {
// 鏇存柊鍗曟嵁涓哄凡瀹屾垚
- orderMapper.updateSettleByOrderNo(order.getOrderNo(),4,null);
+ orderMapper.updateSettleByOrderNo(order.getOrderNo(),6,null);
}
}
--
Gitblit v1.9.1