From 5df041e4dd5e92e11af1d42457812b20f970adb3 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 06 七月 2025 16:11:27 +0800
Subject: [PATCH] 读取更新罐装线要桶数量
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 2326428..008fa17 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -55,12 +55,14 @@
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
try {
- if (null == locMast) {
-// 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() + "]");
+ }
}
- assert locMast != null;
+
switch (wrkMast.getIoType()) {
// 绌烘澘鍏ュ簱
case 10:
@@ -69,7 +71,7 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
locMast.setBarcode(wrkMast.getBarcode());
}
- locMast.setLocSts("D");
+ locMast.setLocSts(wrkMast.getPltType() == 1 ? "M" : "Z");
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -518,6 +520,10 @@
break;
// 绌烘澘鍑哄簱
case 110:
+ // 绌烘瘝鎵樼洏鍑哄簱
+ case 111:
+ // 绌哄瓙鎵樼洏鍑哄簱
+ case 112:
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
@@ -536,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