From 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 03 十二月 2022 13:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 ++
1 files changed, 2 insertions(+), 0 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..0a7f1ee 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());
}
@@ -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