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/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/webapp/views/locDetl/locDetl.html | 32 +++++++++++++++++++++-----------
src/main/java/com/zy/common/web/param/CanningLineInLocParam.java | 3 +++
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/webapp/views/pakStore/locDetlQuery.html | 10 ++++++++++
src/main/java/com/zy/common/web/WcsController.java | 3 +++
src/main/webapp/static/js/common.js | 2 +-
7 files changed, 42 insertions(+), 13 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 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
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 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
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 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
+ wrkDetl.setBrand(param.isLabeling() ? "鏈创鏍�" : "宸茶创鏍�");
wrkDetl.setWrkNo(workNo);
wrkDetl.setAnfme(wrkDetl1.getAnfme());
wrkDetl.setZpallet(wrkMast1.getBarcode());
diff --git a/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java b/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
index c94ca58..754dccc 100644
--- a/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
+++ b/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
@@ -40,4 +40,7 @@
// 璐存爣鎴愬姛鍚�
private boolean tbFlag;
+ // 鏄惁璐存爣 false 璐存爣锛宼rue 涓嶈创鏍�
+ private boolean labeling;
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3298208..4d9d046 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -345,6 +345,9 @@
<if test="maktx!=null and maktx!='' ">
and a.maktx like '%' + #{maktx} + '%'
</if>
+ <if test="brand!=null and brand!='' ">
+ and a.brand like '%' + #{brand} + '%'
+ </if>
<if test="anfme!=null and anfme!='' ">
and a.anfme like '%' + #{anfme} + '%'
</if>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index c7bf17d..80ae972 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -231,7 +231,7 @@
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
,{field: 'model', align: 'center',title: '妗跺瀷', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'brand', align: 'center',title: '璐存爣鍚�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index b70068b..c76cff6 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -13,7 +13,7 @@
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
,{field: 'model', align: 'center',title: '妗剁被鍨�'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'brand', align: 'center',title: '璐存爣鍚�'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 427b4e4..956440a 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -57,16 +57,26 @@
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="frozen" class="layui-input" type="text" autocomplete="off">-->
-<!-- <!– <option style="display: none"></option>–>-->
-<!-- <option value="">鍐荤粨鍚�</option>-->
-<!-- <option value="0">鏈喕缁�</option>-->
-<!-- <option value="1">宸插喕缁�</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="frozen" class="layui-input" type="text" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value="">鍐荤粨鍚�</option>
+ <option value="0">鏈喕缁�</option>
+ <option value="1">宸插喕缁�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="brand" class="layui-input" type="text" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value="">璐存爣鍚�</option>
+ <option value="鏈创鏍�">鏈创鏍�</option>
+ <option value="宸茶创鏍�">宸茶创鏍�</option>
+ </select>
+ </div>
+ </div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
@@ -97,7 +107,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-primary layui-bg-blue layui-btn-sm" id="frozen-btn" lay-event="frozen" style="margin-top: 1px">鍐荤粨</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="unfreeze-btn" lay-event="unfreeze" style="margin-top: 1px">瑙ｅ喕</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 1px">瀵煎嚭</button>
</div>
</script>
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 4b9f90f..dce8e16 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -86,6 +86,16 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="brand" class="layui-input" type="text" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value="">璐存爣鍚�</option>
+ <option value="鏈创鏍�">鏈创鏍�</option>
+ <option value="宸茶创鏍�">宸茶创鏍�</option>
+ </select>
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
--
Gitblit v1.9.1