From 17ff4e0c0ede8f6cacd88525d1ac7a1cf44eb0af Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 10 三月 2021 16:22:44 +0800
Subject: [PATCH] 1.0.6 pda关联嘱托，支持点击物料编号查看物料的生成单号功能
---
src/main/webapp/static/js/locMatStatus/locMatStatus.js | 2 +-
src/main/webapp/views/pda/combPro.html | 40 +++++++++++++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/entity/CombBillQueryVo.java | 2 ++
src/main/java/com/zy/asrs/controller/MobileController.java | 1 +
4 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 222e296..418fd3c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -119,6 +119,7 @@
vo.setMatNo(waitPakin.getMatnr());
vo.setMatName(waitPakin.getMaktx());
vo.setCount(waitPakin.getAnfme());
+ vo.setWarehouse(waitPakin.getWarehouse());
vos.add(vo);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
index 5b01716..0de6cec 100644
--- a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
+++ b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
@@ -14,4 +14,6 @@
private Double count;
+ private String warehouse;
+
}
diff --git a/src/main/webapp/static/js/locMatStatus/locMatStatus.js b/src/main/webapp/static/js/locMatStatus/locMatStatus.js
index 434c70a..f6c67f4 100644
--- a/src/main/webapp/static/js/locMatStatus/locMatStatus.js
+++ b/src/main/webapp/static/js/locMatStatus/locMatStatus.js
@@ -560,7 +560,7 @@
}
// 鏇存柊鐗╂枡鐘舵��
$.ajax({
- url: baseUrl+"/locDetl/getAllLocDetlData?loc_no=" + param.loc_no + "&matnr=" + param.matnr + "&matStatusFlag=" + param.matStatusFlag,
+ url: baseUrl+"/locDetl/getAllLocDetlData?loc_no=" + param.loc_no + "&matnr=" + param.matnr + "&mat_status=" + param.matStatusFlag,
headers: {'token': localStorage.getItem('token')},
// data: JSON.stringify(param),
dataType:'json',
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 1c120d8..7ad5d90 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -98,6 +98,24 @@
<button id="remove" onclick="remove()">绉婚櫎</button>
<button id="confirm" onclick="confirm()">淇濆瓨</button>
</div>
+
+<!-- 鏄剧ず鐢熸垚鍗曞彿寮圭獥 -->
+<div id="warehouseModal" style="display: none; text-align: center; padding-top: 10px">
+ <div class="form-item">
+ <span>鐗╂枡</span>
+ <input id="matNo2" type="text" disabled="disabled" style="width: 70%">
+ </div>
+ <div class="form-item">
+ <span>鍚嶇О</span>
+ <input id="matName2" type="text" disabled="disabled" style="width: 70%">
+ </div>
+ <div class="form-item">
+ <span>鐢熸垚鍗曞彿</span>
+ <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
+ </div>
+ <button onclick="closeWarehouse()" style="margin-top: 8px">鍏抽棴</button>
+</div>
+
</body>
<script>
window.onload = function(){document.getElementById("code").focus();}
@@ -116,7 +134,7 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', event: 'warehouse', style: 'cursor: pointer;color: blue'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
@@ -143,11 +161,31 @@
}
});
break;
+ case 'warehouse':
+ layer.open({
+ type: 1,
+ offset: '20px',
+ title: '鐢熸垚鍗曞彿鏄庣粏',
+ shadeClose: true,
+ area: ['80%', '180px'],
+ content: $("#warehouseModal"),
+ success: function (layero, index) {
+ $('#matNo2').val(data.matNo);
+ $('#matName2').val(data.matName);
+ $('#warehouse').val(data.warehouse);
+ }
+ });
+ break;
}
});
});
+ /* 鍏抽棴鐢熸垚鍗曞彿鏄庣粏 */
+ function closeWarehouse() {
+ layer.closeAll();
+ }
+
function findCode(el) {
if (el.value.length === 7) {
$('#billNo').focus();
--
Gitblit v1.9.1