From 5ea75676b5decb2994d77d92553ad5151277dfc7 Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期六, 28 八月 2021 08:27:24 +0800
Subject: [PATCH] 1.0.3
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 8a429d3..5249314 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -5,7 +5,7 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
arrRemove(detlCols, "field", "anfme")
cols.push.apply(cols, detlCols);
@@ -35,7 +35,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matnr, Number(obj.value));
+ updateMatCodeData(obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,6 +52,7 @@
return;
}
for (var i=0;i<matCodeData.length;i++){
+
if (isNaN(matCodeData[i].count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
return;
@@ -67,7 +68,8 @@
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
locNo: currLocNo,
- list: matCodeData
+ list: matCodeData,
+ zpallet:zpa
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -90,11 +92,12 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
+
var data = obj.data;
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matnr === data.matnr) {
+ if (matCodeData[i].matNo === data.matNo) {
matCodeData.splice(i, 1);
}
}
@@ -174,13 +177,13 @@
}
}
- function updateMatCodeData(matnr, count) {
+ function updateMatCodeData(matNo, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count >= 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matnr"] === matnr){
+ if (matCodeData[i]["matNo"] === matNo){
matCodeData[i]["count"] = count;
}
}
@@ -221,29 +224,33 @@
el.css("border-color", "#b8b8b8");
}, 1000);
}
-
+var zpa=0
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
let applyData = [];
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<matCodeData.length;j++){
- if (data[i].matNo === matCodeData[j].matnr) {
+ zpa=matCodeData[0].zpallet
+ if (data[i].matNo === matCodeData[j].matNo) {
pass = true;
break;
}
}
+
if (!pass) {
applyData.push({
count: initCountVal,
anfme: initAnfmeVal,
removeBtn: true,
- matnr: data[i].matNo,
- maktx: data[i].matName,
- lgnum: data[i].str2,
- color: data[i].str3,
- bname: data[i].str4,
- altme: data[i].str1,
+ matNo: data[i].matNo,
+ matName: data[i].matName,
+ specs: data[i].specs,
+ color: data[i].color,
+ size: data[i].size,
+ unit: data[i].unit,
+ zpallet:zpa,
+ qty:0
})
}
}
--
Gitblit v1.9.1