From 47bc6df60ec490bf80534df494ef291cf85b050d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 13 八月 2024 15:00:16 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 12 +++---
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 43 ++++++++++++---------
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html | 11 ++++-
zy-asrs-wms/src/main/webapp/static/js/common.js | 33 +++++++++-------
zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml | 3 +
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html | 11 ++++-
6 files changed, 69 insertions(+), 44 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index d92a820..7c4dd27 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -47,15 +47,15 @@
private Long tagId;
/**
- * 鍟嗗搧缂栧彿
+ * 鍝佸彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍝佸彿")
private String matnr;
/**
- * 鍟嗗搧鍚嶇О
+ * 鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鍚嶇О")
private String maktx;
/**
@@ -71,9 +71,9 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鏈哄瀷
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鏈哄瀷")
private String model;
/**
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
index 1bc9fa3..36b1b7d 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
@@ -23,6 +23,9 @@
<if test="map.maktx!=null and map.maktx!='' ">
and a.maktx like '%' + #{map.maktx} + '%'
</if>
+ <if test="map.zpallet!=null and map.zpallet!='' ">
+ and a.zpallet like '%' + #{map.zpallet} + '%'
+ </if>
<if test="map.batch!=null and map.batch!='' ">
and a.batch like '%' + #{map.batch} + '%'
</if>
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 a19a452..ea219fc 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -184,14 +184,21 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+ {field: 'matnr', align: 'center',title: '鍝佸彿', width: 180}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'model', align: 'center',title: '鏈哄瀷', hide: false}
+ ,{field: 'decrees', align: 'center',title: '鍒朵护', hide: false}
+ ,{field: 'imgNum', align: 'center',title: '鍥惧彿', hide: false}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'length', align: 'center',title: '闀垮害', hide: false}
+ ,{field: 'width', align: 'center',title: '瀹藉害', hide: false}
+ ,{field: 'height', align: 'center',title: '楂樺害', hide: false}
+
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
@@ -204,10 +211,8 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+
+ ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
@@ -221,14 +226,14 @@
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'owner', align: 'center',title: '璐т富'}
@@ -262,11 +267,11 @@
]
var detlColsWrkDetl = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ {field: 'matnr', align: 'center',title: '鍝佸彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'owner', align: 'center',title: '璐т富'}
diff --git a/zy-asrs-wms/src/main/webapp/views/mat/mat.html b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
index 7345b5e..5db8078 100644
--- a/zy-asrs-wms/src/main/webapp/views/mat/mat.html
+++ b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
@@ -203,31 +203,38 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
+ <label class="layui-form-label layui-form-required">鍚嶇О</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips"
+ <input name="maktx" placeholder="璇疯緭鍏ュ悕绉�" class="layui-input" lay-vertype="tips"
lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">閰嶇疆</label>
+ <label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
+ <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠鍑�閲�</label>
+ <label class="layui-form-label">閲嶉噺</label>
<div class="layui-input-block">
- <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
+ <input name="weight" placeholder="璇疯緭鍏ラ噸閲�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
+ <label class="layui-form-label">闀垮害</label>
<div class="layui-input-block">
- <input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
+ <input name="length" placeholder="闀垮害" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹藉害</label>
+ <div class="layui-input-block">
+ <input name="width" placeholder="瀹藉害" class="layui-input">
</div>
</div>
@@ -235,38 +242,38 @@
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
+ <label class="layui-form-label layui-form-required">鍝佸彿</label>
<div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips"
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�" class="layui-input" lay-vertype="tips"
lay-verify="required" required="">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">浠ｇ爜</label>
+ <label class="layui-form-label">鏈哄瀷</label>
<div class="layui-input-block">
- <input name="model" type="number" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+ <input name="model" type="number" placeholder="璇疯緭鍏ユ満鍨�" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">搴撳瓨涓婇檺</label>
+ <label class="layui-form-label">鍒朵护</label>
<div class="layui-input-block">
- <input name="safeQty" placeholder="搴撳瓨涓婇檺" class="layui-input">
+ <input name="decrees" placeholder="鍒朵护" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠姣涢噸</label>
+ <label class="layui-form-label">鍥惧彿</label>
<div class="layui-input-block">
- <input name="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+ <input name="imgNum" placeholder="鍥惧彿" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
+ <label class="layui-form-label">楂樺害</label>
<div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+ <input name="height" placeholder="楂樺害" class="layui-input">
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 3d40081..00e8877 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -58,17 +58,22 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="owner" placeholder="鎷ユ湁鑰呯紪鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="owner" placeholder="璐т富" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <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">
+ <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="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
index 706089c..63e9a08 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -53,17 +53,22 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <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="batch" placeholder="搴忓垪鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" 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">
+ <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="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
--
Gitblit v1.9.1