From 3ab9a944e397e4dcfd6c9dfac619ed3f52cc7ba5 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 15 二月 2023 18:02:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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..fb369ff 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -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());
                         }
@@ -243,7 +244,7 @@
                     String locSts = "D";
                     // 搴撲綅绉昏浆鍒ゆ柇鏄惁涓虹┖鏉跨Щ杞�
                     if (wrkMast.getEmptyMk().equals("N")) {
-                        locSts = "F";
+                        locSts = "R";
                         // 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
                         if (!locDetlService.updateLocNo(wrkMast.getLocNo(), wrkMast.getSourceLocNo())) {
                             exceptionHandle("搴撲綅绉昏浆 ===>> 杞Щ搴撳瓨鏄庣粏鏁版嵁澶辫触锛沎婧愬簱浣�={0}],[鐩爣搴撲綅={1}]", wrkMast.getSourceLocNo(), wrkMast.getLocNo());
@@ -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