From 7b983df0c9fc8b1eb99429dd37699443c62e1d9d Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:35:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/common/web/WcsController.java | 6 ++++++
1 files changed, 6 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 5cd4bcd..565d014 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -138,6 +138,12 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+
+ if(waitPakins.size()>0) {
+ WaitPakin one = waitPakins.get(0);
+ wrkMast.setFrozen(one.getFrozen());
+ wrkMast.setMemo(one.getMemo());
+ }
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
--
Gitblit v1.9.1