From 6cd9f18cd85472b5d7ccc0a6e0f6924da4dbd6e5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 25 八月 2021 13:21:30 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/webapp/static/js/matOut/matOut.js |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/static/js/matOut/matOut.js b/src/main/webapp/static/js/matOut/matOut.js
index cfd471f..c5be543 100644
--- a/src/main/webapp/static/js/matOut/matOut.js
+++ b/src/main/webapp/static/js/matOut/matOut.js
@@ -36,7 +36,7 @@
 
     // 椤甸潰淇敼
     table.on('edit(chooseData)', function (obj) {
-        updateLocDetlData(obj.data.locNo, obj.data.billNo, obj.data.seqNo, obj.data.matNo, Number(obj.value));
+        updateLocDetlData(obj.data.billNo, obj.data.seqNo, obj.data.matNo, Number(obj.value));
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -55,7 +55,7 @@
                     debugger
                     var locDetls = [];
                     data.forEach(function(elem) {
-                        locDetls.push({locNo: elem.locNo,billNo:elem.billNo,seqNo:elem.seqNo, matNo: elem.matNo, count: elem.count});
+                        locDetls.push({billNo:elem.billNo, seqNo:elem.seqNo, matNo: elem.matNo, count: elem.count});
                     });
                     let param = {
                         outSite: staNo,
@@ -90,7 +90,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].billNo === data.billNo && locDetlData[i].seqNo === data.seqNo) {
                         locDetlData.splice(i, 1);
                     }
                 }
@@ -99,14 +99,14 @@
         }
     });
 
-    function updateLocDetlData(locNo, matNo, count) {
+    function updateLocDetlData(billNo, seqNo, matNo, 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]["anfme"]) {
+                    if (locDetlData[i]["billNo"] === billNo && locDetlData[i]["seqNo"] === seqNo){
+                        if (count > locDetlData[i]["qty"]) {
                             layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
                         } else {
                             locDetlData[i]["count"] = count;

--
Gitblit v1.9.1