From bf46a1c66ff99b3797e6637de6aaaa1b359844c1 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 03 二月 2023 14:45:43 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

---
 src/main/java/com/zy/common/web/WcsController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3652900..565d014 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -142,6 +142,7 @@
         if(waitPakins.size()>0) {
             WaitPakin one = waitPakins.get(0);
             wrkMast.setFrozen(one.getFrozen());
+            wrkMast.setMemo(one.getMemo());
         }
         boolean res = wrkMastService.insert(wrkMast);
         if (!res) {

--
Gitblit v1.9.1