From 203e2664c13883f8bb64f638cb1794c0b4480ec2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 27 四月 2025 08:24:20 +0800
Subject: [PATCH] 完成米多泉州wms开发

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   10 +++++++---
 1 files changed, 7 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 2326428..df2e686 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,12 @@
         Date now = new Date();
         LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
         try {
-            if (null == locMast) {
+            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() + "]");
             }
-            assert locMast != null;
+
             switch (wrkMast.getIoType()) {
                 // 绌烘澘鍏ュ簱
                 case 10:
@@ -69,7 +69,7 @@
                         if (!Cools.isEmpty(wrkMast.getBarcode())) {
                             locMast.setBarcode(wrkMast.getBarcode());
                         }
-                        locMast.setLocSts("D");
+                        locMast.setLocSts(wrkMast.getSourceStaNo() == 1027 || wrkMast.getSourceStaNo() == 1020 ? "M" : "Z");
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
                         if (!locMastService.updateById(locMast)) {
@@ -518,6 +518,10 @@
                     break;
                 // 绌烘澘鍑哄簱
                 case 110:
+                    // 绌烘瘝鎵樼洏鍑哄簱
+                case 111:
+                    // 绌哄瓙鎵樼洏鍑哄簱
+                case 112:
                     // 淇敼搴撲綅鐘舵�� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
                         locMast.setLocSts("O");

--
Gitblit v1.9.1