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/stockOut0.js |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/stockOut0.js b/src/main/webapp/static/js/pakStore/stockOut0.js
index 5d79121..0d05eb9 100644
--- a/src/main/webapp/static/js/pakStore/stockOut0.js
+++ b/src/main/webapp/static/js/pakStore/stockOut0.js
@@ -3,10 +3,10 @@
 function getCol() {
     var cols = [
         {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130,  style:'color: blue;font-weight: bold'}
-        ,{field: 'qty', align: 'center',title: '鍘熸暟閲�'}
+        ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
         ,{field: 'locNo$', 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;
@@ -34,7 +34,7 @@
 
     // 椤甸潰淇敼
     table.on('edit(chooseData)', function (obj) {
-        updateLocDetlData(obj.data.locNo, obj.data.matNo, Number(obj.value));
+        updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -52,7 +52,7 @@
                     }
                     var locDetls = [];
                     data.forEach(function(elem) {
-                        locDetls.push({locNo: elem.locNo, matNo: elem.matNo, count: elem.count});
+                        locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
                     });
                     let param = {
                         outSite: staNo,
@@ -87,7 +87,7 @@
         switch (obj.event) {
             case 'remove':
                 for (var i = locDetlData.length - 1; i >= 0; i--) {
-                    if (locDetlData[i].locNo === data.locNo && locDetlData[i].matNo === data.matNo) {
+                    if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
                         locDetlData.splice(i, 1);
                     }
                 }
@@ -96,14 +96,14 @@
         }
     });
 
-    function updateLocDetlData(locNo, matNo, count) {
+    function updateLocDetlData(locNo, matnr, count) {
         if (isNaN(count)) {
             layer.msg("璇疯緭鍏ユ暟瀛�");
         } else {
             if (count > 0) {
                 for (var i=0;i<locDetlData.length;i++){
-                    if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matNo"] === matNo){
-                        if (count > locDetlData[i]["qty"]) {
+                    if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
+                        if (count > locDetlData[i]["anfme"]) {
                             layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
                         } else {
                             locDetlData[i]["count"] = count;
@@ -162,7 +162,7 @@
     for (var i=0;i<data.length;i++){
         let pass = false;
         for (var j=0;j<locDetlData.length;j++){
-            if (data[i].matNo === locDetlData[j].matNo && data[i].locNo$ === locDetlData[j].locNo$) {
+            if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
                 pass = true;
                 break;
             }
@@ -170,7 +170,7 @@
         if (pass) {
             data.splice(i--, 1);
         } else {
-            data[i]["count"] = data[i]["qty"];
+            data[i]["count"] = data[i]["anfme"];
         }
 
     }

--
Gitblit v1.9.1