From 706f4c7f1ca5f44d6e246eaeee831d24305c49e6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 13:34:37 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index c803685..9a189f5 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -65,25 +65,30 @@
             case 'comb':
                 // 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
                 if (matCodeData.length === 0) {
-                    layer.msg("璇峰厛娣诲姞鐗╂枡");
+                    layer.msg("璇峰厛鎻愬彇鍟嗗搧", {icon: 2});
                     return;
                 }
                 // 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
                 for (var i=0;i<matCodeData.length;i++){
                     if (isNaN(matCodeData[i].anfme)) {
-                        layer.msg("璇疯緭鍏ユ暟瀛�");
+                        layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
                         return;
                     }
-                    if (matCodeData[i].anfme === 0){
-                        layer.msg("鏁伴噺涓嶈兘涓洪浂");
+                    if (matCodeData[i].anfme <= 0){
+                        layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
                         return;
                     }
+                }
+                let devpNo = $('#putSiteSelect').val();
+                if (isEmpty(devpNo)) {
+                    layer.msg("璇烽�夋嫨鍏ュ簱绔�", {icon: 2});
+                    return;
                 }
                 $.ajax({
                     url: baseUrl+"/full/store/put/start",
                     headers: {'token': localStorage.getItem('token')},
                     data: JSON.stringify({
-                        devpNo: Number($('#putSiteSelect').val()),
+                        devpNo: Number(devpNo),
                         list: matCodeData
                     }),
                     contentType:'application/json;charset=UTF-8',
@@ -91,32 +96,29 @@
                     async: false,
                     success: function (res) {
                         if (res.code === 200){
-                            layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
+                            layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data, {icon: 1});
                             matCodeData = [];
                             $('#focusMatByMat').val("");
                             tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
-                            document.getElementById("focusMatByMat").focus();
                         } else if (res.code === 403){
                             top.location.href = baseUrl+"/";
                         }else {
-                            layer.msg(res.msg)
+                            layer.msg(res.msg, {icon: 2})
                         }
                     }
                 })
+                break;
+            default:
                 break;
         }
     });
 
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(chooseData)', function(obj){
-        var data = obj.data;
         switch (obj.event) {
             case 'remove':
-                for (let i = matCodeData.length - 1; i >= 0; i--) {
-                    if (matCodeData[i].matNo === data.matNo && matCodeData[i].batch === data.batch) {
-                        matCodeData.splice(i, 1);
-                    }
-                }
+                let index = obj.tr.attr("data-index");
+                matCodeData.splice(index, 1);
                 tableIns.reload({data: matCodeData});
                 break;
         }

--
Gitblit v1.9.1