From 4c4b488961660194d75e910e476ede81e6061b3d Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 05 五月 2021 12:58:10 +0800
Subject: [PATCH] 1.立库、平库入库修改功能调整，生产单号列前置 2.erp对接功能微调
---
src/main/webapp/static/js/pakStore/pakStore.js | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index b9d27f0..8ba81be 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -14,13 +14,24 @@
style: 'color: blue;font-weight: bold'
}
];
- matCols.map(function (item) {
- if (item.field === 'str6' || item.field === 'str5') {
- item.edit = 'text';
- item.style = 'color: blue;font-weight: bold';
- }
- })
- cols.push.apply(cols, matCols);
+ var matColsSelf = [
+ {field: 'str5', align: 'center',title: '鐢熶骇鍗曞彿', edit: 'text'}
+ ,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
+ ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�', hide: true}
+ ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О', width: 500}
+ ,{field: 'str2', align: 'center',title: '鐗╂枡绫诲埆'}
+ ,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'}
+ ,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅', hide: true}
+ ,{field: 'str4', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'str6', align: 'center',title: '閫氱煡鍗曞彿', edit: 'text'}
+ ,{field: 'str7', align: 'center',title: '榛樿浠撳簱', hide: true}
+ ,{field: 'str17', align: 'center',title: '鍙噰璐�', hide: true}
+ ,{field: 'str18', align: 'center',title: '鍙负瀛愪欢', hide: true}
+ ,{field: 'str21', align: 'center',title: '鎴愭湰璁＄畻鏂规硶', hide: true}
+ ,{field: 'str22', align: 'center',title: '閲囪喘鍗曚綅', hide: true}
+ ,{field: 'str23', align: 'center',title: '閿�鍞崟浣�', hide: true}
+ ];
+ cols.push.apply(cols, matColsSelf);
cols.push({field: 'matStatus', title: '鐗╂枡鐘舵��', align: 'center', width: 120, templet: '#matStatus'});
cols.push({fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80});
return cols;
@@ -54,6 +65,9 @@
if (obj.field === 'count') {
updateMatCodeData(obj.data.matNo, Number(obj.value));
}
+ if (obj.field === 'str5' || obj.field === 'str6') {
+ updateMatCodeData2(obj.data.matnr, obj.value, obj.data.index, obj.field);
+ }
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -75,6 +89,10 @@
}
if (matCodeData[i].count === 0) {
layer.msg("鏁伴噺涓嶈兘涓洪浂");
+ return;
+ }
+ if (matCodeData[i].str5 == null || matCodeData[i].str5 == '' || matCodeData[i].str5 == undefined) {
+ layer.msg("璇疯緭鍏ョ敓浜у崟鍙�");
return;
}
}
@@ -161,6 +179,18 @@
});
}
+ function updateMatCodeData2(matnr, value, index, field) {
+ for (var i = 0; i < matCodeData.length; i++) {
+ if (matCodeData[i]["matnr"] === matnr && matCodeData[i]["index"] === index) {
+ matCodeData[i][field] = value;
+ }
+ }
+
+ tableIns.reload({
+ data: matCodeData,
+ });
+ }
+
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
function getInBound() {
$.ajax({
--
Gitblit v1.9.1