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 | 7 +++++++
1 files changed, 7 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 5a1e540..f45c097 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -250,6 +250,10 @@
// 鏍规嵁浠诲姟鍙锋煡璇换鍔�
WrkMast wrkMast1 = wrkMastService.selectById(param.getWrkNo());
+ if (wrkMast1 == null || wrkMast1.getWrkSts() != 2 ){
+ log.error("缃愯瀹屾垚鍏ュ簱锛屼换鍔′笉瀛樺湪/鐘舵�佷笉涓�2锛歿}",param.getWrkNo());
+ return R.error("缃愯瀹屾垚鍏ュ簱锛屼换鍔′笉瀛樺湪/鐘舵�佷笉涓�2锛�" + param.getWrkNo());
+ }
// 鏍规嵁浠诲姟鍙锋煡璇换鍔℃槑缁�
WrkDetl wrkDetl1 = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast1.getWrkNo()));
@@ -299,6 +303,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
+ wrkDetl.setBrand(param.isLabeling() ? "鏈创鏍�" : "宸茶创鏍�");
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setAnfme(wrkDetl1.getAnfme());
wrkDetl.setZpallet(wrkMast1.getBarcode());
@@ -344,6 +349,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
+ wrkDetl.setBrand(param.isLabeling() ? "鏈创鏍�" : "宸茶创鏍�");
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setAnfme(wrkDetl1.getAnfme());
wrkDetl.setZpallet(wrkMast1.getBarcode());
@@ -398,6 +404,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
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