From 3f9b7886fa35a79db3ff2a5f47bd44214f5202e0 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 13 三月 2021 15:22:35 +0800
Subject: [PATCH] 1.0.3 pda关联嘱托-隐藏物料名称，显示生成单号，并传入生成单号，组托根据（物料编号+生成单号+通知单号）判断唯一性
---
src/main/webapp/views/pda/combPro.html | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 1c120d8..610e91e 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -89,6 +89,10 @@
<span>鍚嶇О</span>
<input id="matName" 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>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
@@ -98,6 +102,7 @@
<button id="remove" onclick="remove()">绉婚櫎</button>
<button id="confirm" onclick="confirm()">淇濆瓨</button>
</div>
+
</body>
<script>
window.onload = function(){document.getElementById("code").focus();}
@@ -117,7 +122,8 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'warehouse', align: 'center', title: '鐢熸垚鍗曞彿'}
+// {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -133,12 +139,13 @@
offset: '20px',
title: '淇敼鏁伴噺',
shadeClose: true,
- area: ['80%', '200px'],
+ area: ['80%', '220px'],
content: $("#modify"),
success: function (layero, index) {
$('#matNo').val(data.matNo);
$('#matName').val(data.matName);
$('#count').val(data.count);
+ $('#warehouse').val(data.warehouse);
maxCount = data.count;
}
});
@@ -160,7 +167,7 @@
for (var i=0;i<data.length;i++) {
var toPush = true;
for (var j=0;j<matData.length;j++){
- if (data[i].matNo === matData[j].matNo) {
+ if (data[i].matNo === matData[j].matNo && data[i].warehouse === matData[j].warehouse) {
matData[j].count = Number(matData[j].count) + Number(data[i].count);
toPush = false;
}
@@ -181,7 +188,8 @@
if (isEmpty(el.value)) {
return;
}
- var billNo = el.value.split(",")[0].split("=")[1];
+// var billNo = el.value.split(",")[0].split("=")[1];
+ var billNo = el.value;
if (isEmpty(billNo)) {
return;
}
@@ -227,8 +235,9 @@
function confirm(){
var matNo = $('#matNo').val();
var count = $('#count').val();
+ var warehouse = $("#warehouse").val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
+ if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
if (count > maxCount || count < minCount) {
tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
return;
@@ -244,8 +253,9 @@
// 绉婚櫎鐗╂枡
function remove() {
var matNo = $('#matNo').val();
+ var warehouse = $("#warehouse").val();
for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo) {
+ if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
matData.splice(j, 1);
}
}
@@ -297,13 +307,15 @@
return;
}
var billNo = $('#billNo').val();
+ var warehouse = $('#warehouse').val();
$.ajax({
url: baseUrl+"/mobile/comb/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
barcode: barcode,
combMats: matData,
- billNo: billNo
+ billNo: billNo,
+ warehouse: warehouse,
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
--
Gitblit v1.9.1