From 45dd167e12e11af8dc7929ff1475623c80fc3578 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 30 十月 2024 13:59:33 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/locCheckOut.js |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index aeef93f..d2e5b58 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,5 +1,6 @@
 var locDetlLayerIdx;
 var tableIns;
+var locDetlData = [];
 function getCol() {
     var cols = [
         {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
@@ -36,25 +37,19 @@
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
     table.on('toolbar(chooseData)', function (obj) {
-        var data = locDetlData;
         switch (obj.event) {
             case 'outbound':
-                if (data.length === 0){
-                    layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+                if (locDetlData.length === 0){
+                    layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
                 } else {
                     var staNo = $("#staNoSelect").val();
                     if (staNo === "" || staNo === null){
-                        layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+                        layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
                         return;
                     }
-                    var locDetls = [];
-                    data.forEach(function(elem) {
-                        // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
-                        locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
-                    });
                     let param = {
                         outSite: staNo,
-                        locDetls: locDetls
+                        locDetls: locDetlData
                     }
                     $.ajax({
                         url: baseUrl+"/locCheck/out/start",
@@ -65,12 +60,12 @@
                         success: function (res) {
                             if (res.code === 200){
                                 locDetlData = [];
-                                tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
-                                layer.msg(res.msg);
+                                tableIns.reload({data: locDetlData});
+                                layer.msg(res.msg, {icon: 1});
                             } else if (res.code === 403){
                                 top.location.href = baseUrl+"/";
                             } else {
-                                layer.msg(res.msg)
+                                layer.msg(res.msg, {icon: 2})
                             }
                         }
                     });
@@ -122,10 +117,10 @@
 
 // 娣诲姞琛ㄦ牸鏁版嵁
 function addTableData(data) {
-    for (var i=0;i<data.length;i++){
+    for (let i=0;i<data.length;i++){
         let pass = false;
-        for (var j=0;j<locDetlData.length;j++){
-            if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+        for (let j=0;j<locDetlData.length;j++){
+            if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
                 pass = true;
                 break;
             }

--
Gitblit v1.9.1