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/locNormal/locNormalIn.js |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/static/js/locNormal/locNormalIn.js b/src/main/webapp/static/js/locNormal/locNormalIn.js
index 88d3563..36a3723 100644
--- a/src/main/webapp/static/js/locNormal/locNormalIn.js
+++ b/src/main/webapp/static/js/locNormal/locNormalIn.js
@@ -15,12 +15,17 @@
             style: 'color: blue;font-weight: bold'
         }
     ];
-    locNormalCols.map(function (item) {
-        if (item.field === 'supplier' || item.field === 'mnemonic') {
-            item.edit = 'text';
-        }
-    })
-    cols.push.apply(cols, locNormalCols);
+    var locNormalColsSelf = [
+        {field: 'mnemonic', align: 'center',title: '鐢熶骇鍗曞彿', edit: 'text'}
+        ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
+        ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 400}
+        ,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
+        ,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
+        ,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿', edit: 'text'}
+        ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+        ,{field: 'altme', align: 'center',title: '鍗曚綅', hide: true}
+    ];
+    cols.push.apply(cols, locNormalColsSelf);
     // 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 +59,9 @@
         if (obj.field === 'anfme') {
             updateMatCodeData(obj.data.matnr, Number(obj.value), obj.data.index);
         }
+        if (obj.field === 'supplier' || obj.field === 'mnemonic') {
+            updateMatCodeData2(obj.data.matnr, obj.value, obj.data.index, obj.field);
+        }
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -75,6 +83,10 @@
                     }
                     if (matCodeData[i].anfme === 0) {
                         layer.msg("鏁伴噺涓嶈兘涓洪浂");
+                        return;
+                    }
+                    if (matCodeData[i].mnemonic == null || matCodeData[i].mnemonic == '' || matCodeData[i].mnemonic == undefined) {
+                        layer.msg("璇疯緭鍏ョ敓浜у崟鍙�");
                         return;
                     }
                 }
@@ -163,6 +175,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() {
         // 鑾峰彇浠撳簱涓嬫媺

--
Gitblit v1.9.1