From 4c98ecfe56a77a17352d01163b9b86fa98f0f2a9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 14:47:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/common/web/WcsController.java | 2 ++
1 files changed, 2 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..6ea48e3 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) {
@@ -149,6 +150,7 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
waitPakins.forEach(waitPakin -> {
+ waitPakin.setBatch("");
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
--
Gitblit v1.9.1