From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能

---
 src/main/java/com/zy/common/web/WcsController.java |    3 +++
 1 files changed, 3 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 602759d..f45c097 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -303,6 +303,7 @@
             // 鐢熸垚宸ヤ綔妗f槑缁�----------------------------------------------------
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.sync(mat);
+            wrkDetl.setBrand(param.isLabeling() ? "鏈创鏍�" : "宸茶创鏍�");
             wrkDetl.setWrkNo(wrkMast.getWrkNo());
             wrkDetl.setAnfme(wrkDetl1.getAnfme());
             wrkDetl.setZpallet(wrkMast1.getBarcode());
@@ -348,6 +349,7 @@
             // 鐢熸垚宸ヤ綔妗f槑缁�----------------------------------------------------
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.sync(mat);
+            wrkDetl.setBrand(param.isLabeling() ? "鏈创鏍�" : "宸茶创鏍�");
             wrkDetl.setWrkNo(wrkMast.getWrkNo());
             wrkDetl.setAnfme(wrkDetl1.getAnfme());
             wrkDetl.setZpallet(wrkMast1.getBarcode());
@@ -402,6 +404,7 @@
                 // 鐢熸垚宸ヤ綔妗f槑缁�
                 WrkDetl wrkDetl = new WrkDetl();
                 wrkDetl.sync(mat);
+                wrkDetl.setBrand(param.isLabeling() ? "鏈创鏍�" : "宸茶创鏍�");
                 wrkDetl.setWrkNo(workNo);
                 wrkDetl.setAnfme(wrkDetl1.getAnfme());
                 wrkDetl.setZpallet(wrkMast1.getBarcode());

--
Gitblit v1.9.1