From 26493fe5a12ce09bd3cc489421b6e2872e6542c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:33:02 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 03e1024..f51f811 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -60,6 +60,7 @@
             switch (wrkMast.getIoType()) {
                 // 绌烘澘鍏ュ簱
                 case 10:
+                    wrkMast.setLogMk("Y");
                     // 淇敼搴撲綅鐘舵��=D
                     if (locMast.getLocSts().equals("S") || locMast.getLocSts().equals("Q")) {
                         if (!Cools.isEmpty(wrkMast.getBarcode())) {
@@ -117,7 +118,7 @@
                         // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
                         OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                         if (orderDetl==null){
-                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                         }
                         try {
                             if(!Cools.isEmpty(orderDetl)){
@@ -169,7 +170,7 @@
                         // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
                         OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                         if (orderDetl==null){
-                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                         }
                         try {
                             if(!Cools.isEmpty(orderDetl)){
@@ -271,6 +272,7 @@
                     break;
                 // 搴撲綅绉昏浆
                 case 11:
+                    wrkMast.setLogMk("Y");
                     // 榛樿鐩爣搴撲綅鏄┖鏉�
                     String locSts = "D";
                     // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
@@ -393,6 +395,7 @@
                     break;
                 // 绌烘澘鍑哄簱
                 case 110:
+                    wrkMast.setLogMk("Y");
                     // 淇敼搴撲綅鐘舵�� R ===>> O
                     if (locMast.getLocSts().equals("R")) {
                         locMast.setLocSts("O");

--
Gitblit v1.9.1