From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 970f9d8..8a429d3 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -5,9 +5,9 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
- arrRemove(detlCols, "field", "qty")
+ arrRemove(detlCols, "field", "anfme")
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -35,7 +35,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ updateMatCodeData(obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -94,7 +94,7 @@
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].matnr === data.matnr) {
matCodeData.splice(i, 1);
}
}
@@ -124,7 +124,7 @@
matCodeData = [];
let data = res.data.records;
for (var i = 0; i<data.length; i++) {
- data[i]["count"] = data[i].qty;
+ data[i]["count"] = data[i].anfme;
data[i]["removeBtn"] = false;
matCodeData.push(data[i]);
}
@@ -174,13 +174,13 @@
}
}
- function updateMatCodeData(matNo, count) {
+ function updateMatCodeData(matnr, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count >= 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ if (matCodeData[i]["matnr"] === matnr){
matCodeData[i]["count"] = count;
}
}
@@ -228,7 +228,7 @@
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].matNo) {
+ if (data[i].matNo === matCodeData[j].matnr) {
pass = true;
break;
}
@@ -238,12 +238,12 @@
count: initCountVal,
anfme: initAnfmeVal,
removeBtn: true,
- matNo: data[i].matNo,
- matName: data[i].matName,
- specs: data[i].specs,
- size: data[i].size,
- unit: data[i].unit,
- color: data[i].color,
+ matnr: data[i].matNo,
+ maktx: data[i].matName,
+ lgnum: data[i].str2,
+ color: data[i].str3,
+ bname: data[i].str4,
+ altme: data[i].str1,
})
}
}
--
Gitblit v1.9.1