From d731537b22c6ececd52aa48a8d1353fa41b1e1ea Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 15:15:34 +0800
Subject: [PATCH] #工作档管理的，工作档明细查询，同上品号，名称，品号拉长，有文字宽度拉长
---
zy-asrs-wms/src/main/webapp/static/js/common.js | 14 +++++++-------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java | 6 ++++++
zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html | 10 ++++++++++
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
index 5147bf3..1296e1a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkDetlController.java
@@ -49,6 +49,12 @@
if (!Cools.isEmpty(param.get("wrk_mast_id"))) {
wrapper.eq(WrkDetl::getWrkMastId, param.get("wrk_mast_id"));
}
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.like(WrkDetl::getMatnr, param.get("matnr"));
+ }
+ if (!Cools.isEmpty(param.get("maktx"))) {
+ wrapper.like(WrkDetl::getMaktx, param.get("maktx"));
+ }
return R.ok(wrkDetlService.page(new Page<>(curr, limit), wrapper));
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index 83804f4..c0b9450 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -278,16 +278,16 @@
]
var detlColsWrkDetl = [
- {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
+ {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true, width: 150}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true, width: 150}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'owner', align: 'center',title: '璐т富'}
- ,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 70}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', width: 100}
+ ,{field: 'owner', align: 'center',title: '璐т富', width: 80}
+ ,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘', width: 100}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', width: 80}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html b/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html
index 2fd64e7..1902578 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl.html
@@ -26,6 +26,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰呯紪鍙�" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1