From c8a2aee3eb27a1ee7ee21a298b869b2f4fb053f0 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 26 六月 2023 23:09:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    8 +++++---
 1 files changed, 5 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 0538030..2d9eb30 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -86,7 +86,7 @@
                     }
                     // 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
                     for (WrkDetl wrkDetl : wrkDetls) {
-
+                        wrkDetl.setBatch("");
                         LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                         if (null != locDetl) {
                             if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
@@ -130,6 +130,7 @@
                         locMast.setFrozen(wrkMast.getFrozen());
                         locMast.setIoTime(now);
                         locMast.setModiTime(now);
+                        locMast.setFrozenMemo(wrkMast.getMemo());
                         if (!locMastService.updateById(locMast)) {
                             exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                         }
@@ -237,8 +238,8 @@
                         }
                     }
                     break;
-                // 搴撲綅绉昏浆
-                case 11:
+                case 11:// 搴撲綅绉昏浆
+                case 111:// 搴撲綅绉昏浆(楂橀鍖哄煙)
                     // 榛樿鐩爣搴撲綅鏄┖鏉�
                     String locSts = "D";
                     // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
@@ -351,6 +352,7 @@
                         locMast.setFrozen(0);
                         locMast.setModiTime(now);
                         locMast.setIoTime(now);
+                        locMast.setFrozenMemo("");
                         if (!locMastService.updateById(locMast)) {
                             exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                         }

--
Gitblit v1.9.1