From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/webapp/views/pda/stockCheck.html | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 5dfcfc8..a0f7a2b 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -98,16 +98,16 @@
<!-- 淇敼鏁伴噺寮圭獥 -->
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
<div class="form-item">
+ <span>搴撲綅</span>
+ <input id="locNo" type="text" disabled="disabled" style="width: 70%">
+ </div>
+ <div class="form-item">
<span>鐗╂枡</span>
- <input id="matnr" type="text" disabled="disabled" style="width: 70%">
+ <input id="matNo" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item">
<span>鍚嶇О</span>
- <input id="maktx" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>棰滆壊</span>
- <input id="color" type="text" disabled="disabled" style="width: 70%">
+ <input id="matName" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -117,7 +117,7 @@
<button onclick="add()">+</button>
</div>
</div>
- <button id="remove" onclick="remove()">绉婚櫎</button>
+ <button id="remove" onclick="remove()" style="display:none">绉婚櫎</button>
<button id="confirm" onclick="confirm()">淇濆瓨</button>
</div>
</body>
@@ -155,7 +155,7 @@
}
,{field: 'matNo', align: 'center', title: '浜у搧缂栫爜', event: 'modify'}
,{field: 'matName', align: 'center', title: '浜у搧鍚嶇О', event: 'modify'}
- // ,{field: 'color', align: 'center', title: '棰滆壊', event: 'modify'}
+ ,{field: 'locNo', align: 'center', title: '搴撲綅', event: 'modify'}//, hide: true
]],
done: function (res, curr, count) {
}
@@ -177,7 +177,7 @@
$('#matNo').val(data.matNo);
$('#matName').val(data.matName);
$('#count').val(data.count);
- // $('#color').val(data.color);
+ $('#locNo').val(data.locNo);
}
});
break;
@@ -213,14 +213,14 @@
form.on('select(changeDevNo)', function (data) {
souceData = []; // 鍒濆鍖栬〃鏍兼暟鎹褰�
$.ajax({
- url: baseUrl + "/erp/queryMatFromDevNo?devNo=" + data.value,
+ url: baseUrl + "/mobile/check/queryMatFromDevNo?devNo=" + data.value,
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
method: 'GET',
async: false,
success: function (res) {
if (res.code === 200) {
- console.log('鏁版嵁', res);
+ // console.log('鏁版嵁', res);
locDetlData = res.data;
if (res.data && res.data.length > 0) {
res.data.map(function (item) {
@@ -280,7 +280,7 @@
for (var i = 0; i < data.length; i++) {
var toPush = true;
for (var j = 0; j < locDetlData.length; j++) {
- if (data[i].matNo === locDetlData[j].matNo) {
+ if (data[i].matNo === locDetlData[j].matNo && data[i].locNo === locDetlData[j].locNo) {
toPush = false;
}
}
@@ -292,13 +292,13 @@
}
function addTableData(data) {
- if (isEmpty(data.matNo) || isEmpty(data.str8)) {
+ if (isEmpty(data.matNo)) {
tips("鎻愬彇澶辫触", true);
return;
}
var toPush = true;
for (var j = 0; j < locDetlData.length; j++) {
- if (data.matNo === locDetlData[j].matnr && data.str8 === locDetlData[j].color) {
+ if (data.matNo === locDetlData[j].matNo && data.locNo === locDetlData[j].locNo) {
toPush = false;
}
}
@@ -333,8 +333,9 @@
function confirm() {
var matNo = $('#matNo').val();
var count = $('#count').val();
+ var locNo = $('#locNo').val();
for (var j = 0; j < locDetlData.length; j++) {
- if (matnr === locDetlData[j].matnr) {
+ if (matNo === locDetlData[j].matNo && locNo === locDetlData[j].locNo) {
if (count < minCount) {
tips("鏁伴噺蹇呴』澶т簬0", true);
return;
@@ -342,6 +343,7 @@
locDetlData[j].count = Number(count);
}
}
+ // debugger
tableIns.reload({data: locDetlData});
layer.close(anfmeLayer);
tips("淇敼鎴愬姛");
@@ -350,9 +352,9 @@
// 绉婚櫎鐗╂枡
function remove() {
var matNo = $('#matNo').val();
- var color = $('#color').val();
+ var locNo = $('#locNo').val();
for (var j = 0; j < locDetlData.length; j++) {
- if (matNo === locDetlData[j].matNo) {
+ if (matNo === locDetlData[j].matNo && locNo === locDetlData[j].locNo) {
locDetlData.splice(j, 1);
}
}
@@ -406,7 +408,7 @@
if (locDetlData.length > 0) {
for (var i = 0; i < locDetlData.length; i++) {
if (locDetlData[i].count === null || locDetlData[i].count === 0 || locDetlData[i].count === undefined) {
- tips(locDetlData[i].matnr + "鍟嗗搧鏁伴噺閿欒", true);
+ tips(locDetlData[i].matNo + "鍟嗗搧鏁伴噺閿欒", true);
return;
}
}
@@ -417,7 +419,7 @@
checkList.push({
locNo: item.locNo,
matNo: item.matNo,
- count: item.count
+ checkQty: item.count
});
});
}
@@ -434,11 +436,11 @@
// 鐩樼偣鎺ュ彛 /work/stock/check
$.ajax({
- url: baseUrl+"/erp/stock/check",
+ url: baseUrl+"/mobile/stock/check",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
checkList: checkList,
- sourceList: sourceList,
+ // sourceList: sourceList,
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
--
Gitblit v1.9.1