From 1d895bd129a141f308d2ed4c4caaab55d2db104b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 19 十月 2025 15:10:35 +0800
Subject: [PATCH] 联调
---
src/main/webapp/static/js/locDetl/locDetl.js | 18 +++++++++---------
src/main/webapp/views/locDetl/locDetl.html | 2 +-
src/main/webapp/views/pakStore/clampDetlQuery.html | 2 +-
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 3 ++-
src/main/webapp/views/barcodeMatnr/barcodeMatnr.html | 2 +-
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 2 +-
src/main/webapp/static/js/common.js | 5 ++---
src/main/webapp/views/pakStore/emptyOut.html | 2 +-
src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html | 14 +++++++-------
9 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index 3763c6e..2eeae2d 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -162,7 +162,8 @@
CombParam.CombMat combMat=new CombParam.CombMat();
combMat.setMatnr(mat.getMatnr());
combMat.setMaktx(mat.getMaktx());
- combMat.setAnfme(waitPakin.getAnfme());
+// combMat.setAnfme(waitPakin.getAnfme());
+ combMat.setAnfme(1.0);
combMats.add(combMat);
combParam.setBarcode(waitPakin.getBarcode());
combParam.setCombMats(combMats);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 446f4a5..dfbe9ac 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,3 @@
-// var baseUrl = "/rqdzasrs";
var baseUrl = "/czkhasrs";
// 璇︽儏绐楀彛-楂樺害
@@ -229,9 +228,9 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true}
,{field: 'model', align: 'center',title: '濂楀彿', hide: false}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7e4ba8c..7ec2bb5 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -3,21 +3,21 @@
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'model', align: 'center',title: '浠ｇ爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true}
+ ,{field: 'model', align: 'center',title: '濂楀彿'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true}
,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200,hide:true, sort:true}
- ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�'}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: '鏉愯川', hide: false}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -25,7 +25,7 @@
,{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: 'weight', align: 'center',title: '鎬婚噸', hide: true}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
@@ -38,8 +38,8 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
- ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
- ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: false}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
+ ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
];
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
index 37cae47..21efd59 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr.html
@@ -21,7 +21,7 @@
</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>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
index 5c4bb45..99f550e 100644
--- a/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
+++ b/src/main/webapp/views/barcodeMatnr/barcodeMatnr_clamp.html
@@ -47,12 +47,12 @@
<!-- <input id="maktx" class="layui-input" type="text">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏁般��銆�閲忥細</label>
- <div class="layui-input-inline">
- <input id="anfme" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">鏁般��銆�閲忥細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="anfme" class="layui-input" type="text" lay-verify="number" >-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-inline" style="width:31%;">-->
<!-- <label class="layui-form-label">鍗曘��銆�浣嶏細</label>-->
<!-- <div class="layui-input-inline">-->
@@ -78,7 +78,7 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
+ <label class="layui-form-label">鍟嗗搧妯″叿鍚嶇О锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
<input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 25a9c19..5c139e9 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -31,7 +31,7 @@
</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">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 6690528..6d9b363 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -21,7 +21,7 @@
</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>
diff --git a/src/main/webapp/views/pakStore/clampDetlQuery.html b/src/main/webapp/views/pakStore/clampDetlQuery.html
index 2f5fbdf..e6f7fc6 100644
--- a/src/main/webapp/views/pakStore/clampDetlQuery.html
+++ b/src/main/webapp/views/pakStore/clampDetlQuery.html
@@ -73,7 +73,7 @@
</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">-->
diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index 7889257..3313934 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.html
@@ -96,7 +96,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="loc_type2" placeholder="搴撲綅绫诲瀷" lay-verify="number" autocomplete="off">
+ <input class="layui-input" type="text" name="loc_type2" placeholder="鎵樼洏绫诲瀷锛堟墭鐩橀浣嶆暟瀛楋級" lay-verify="number" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1