From ce0fcdaf2629e5b6ebef0f206b16ecad103e5c1e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 05 五月 2025 14:39:06 +0800
Subject: [PATCH] #盘点上报

---
 src/main/webapp/static/js/pakStore/stockAdjust.js |  188 +++++++++++++++++++++++++---------------------
 1 files changed, 102 insertions(+), 86 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index cb1e3ce..042a8b5 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -1,14 +1,30 @@
 var initCountVal = 0;
 var initAnfmeVal = "-";
-var removeBtn = true;
 var matCodeData = [];
 var currLocNo;
-layui.use(['table','laydate', 'form'], function() {
+var matCodeLayerIdx;
+function getCol() {
+    var cols = [
+        {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
+        ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+        ,{field: 'batch', align: 'center',title: '鎵瑰彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
+    ];
+    arrRemove(detlCols, "field", "anfme");
+    arrRemove(detlCols, "field", "batch");
+    cols.push.apply(cols, detlCols);
+    cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+    return cols;
+}
+
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function() {
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
     var layDate = layui.laydate;
     var form = layui.form;
+    var admin = layui.admin;
 
     tableIns = table.render({
         elem: '#chooseData',
@@ -17,16 +33,7 @@
         limit: 500,
         cellMinWidth: 50,
         toolbar: '#toolbar',
-        cols: [[
-            {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
-            {field: 'anfme', align: 'center',title: '鏁伴噺'},
-            {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-            {field: 'barcode', align: 'center', title: '鏉$爜'},
-            {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
-            {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
-            {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
-            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
-        ]],
+        cols: [getCol()],
         done: function (res, curr, count) {
             limit();
         }
@@ -34,7 +41,25 @@
 
     // 椤甸潰淇敼
     table.on('edit(chooseData)', function (obj) {
-        updateMatCodeData(obj.data.matNo, Number(obj.value));
+        let index = obj.tr.attr("data-index");
+        let data = matCodeData[index];
+        let modify = true;
+        if (obj.field === 'count'){
+            let vle = Number(obj.value);
+            if (isNaN(vle)) {
+                layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+                modify = false;
+            } else {
+                if (vle <= 0) {
+                    layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+                    modify = false;
+                }
+            }
+        }
+        if (modify) {
+            data[obj.field] = obj.value;
+        }
+        tableIns.reload({data: matCodeData});
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -42,21 +67,21 @@
         switch(obj.event) {
             case 'adjust':
                 if (isEmpty(currLocNo)) {
-                    layer.msg("璇峰厛妫�绱㈠簱浣�")
+                    layer.msg("璇峰厛妫�绱㈠簱浣�", {icon: 2})
                     inputTip($("#searchLocNo"));
                     return;
                 }
                 if (matCodeData.length === 0) {
-                    layer.msg("璇峰厛娣诲姞鐗╂枡");
+                    layer.msg("璇峰厛娣诲姞鏄庣粏", {icon: 2});
                     return;
                 }
                 for (var i=0;i<matCodeData.length;i++){
                     if (isNaN(matCodeData[i].count)) {
-                        layer.msg("璇疯緭鍏ユ暟瀛�");
+                        layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
                         return;
                     }
                     if (matCodeData[i].count < 0){
-                        layer.msg("鏁伴噺涓嶈兘灏忎簬闆�");
+                        layer.msg("鏁伴噺涓嶈兘灏忎簬闆�", {icon: 2});
                         return;
                     }
                 }
@@ -73,12 +98,12 @@
                         async: false,
                         success: function (res) {
                             if (res.code === 200){
-                                layer.msg(currLocNo + res.msg);
-                                reset();
+                                layer.msg(currLocNo + res.msg, {icon: 1});
+                                init(currLocNo)
                             } else if (res.code === 403){
                                 top.location.href = baseUrl+"/";
                             }else {
-                                layer.msg(res.msg)
+                                layer.msg(res.msg, {icon: 2})
                             }
                         }
                     })
@@ -92,12 +117,9 @@
         var data = obj.data;
         switch (obj.event) {
             case 'remove':
-                for (var i = matCodeData.length - 1; i >= 0; i--) {
-                    if (matCodeData[i].matNo === data.matNo) {
-                        matCodeData.splice(i, 1);
-                    }
-                }
-                tableIns.reload({data: matCodeData,done:function (res) {limit();}});
+                let index = obj.tr.attr("data-index");
+                matCodeData.splice(index, 1);
+                tableIns.reload({data: matCodeData});
                 break;
         }
     });
@@ -110,30 +132,25 @@
             layer.msg("璇疯緭鍏ュ簱浣嶅彿");
             return;
         }
-        http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
-            matCodeData = [];
-            let data = res.data.records;
-            for (var i = 0; i<data.length; i++) {
-                matCodeData.push({
-                    count: data[i].anfme,
-                    anfme: data[i].anfme,
-                    matNo: data[i].matnr,
-                    matName: data[i].maktx,
-                    barcode: data[i].zpallet,
-                    str1: data[i].altme,
-                    str2: data[i].bname,
-                    removeBtn: false
-                })
-            }
-            locTips(true, locNo);
-            tableReload();
-        })
+        init(locNo);
     });
 
     // 閲嶇疆浜嬩欢
     form.on('submit(reset)', function (data) {
         reset();
     });
+
+    function init(locNo) {
+        http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
+            matCodeData = [];
+            matCodeData = res.data.records;
+            for (var i = 0; i<matCodeData.length; i++) {
+                matCodeData[i]["count"] = matCodeData[i]["anfme"];
+            }
+            locTips(true, locNo);
+            tableReload();
+        })
+    }
 
     function reset() {
         clearFormVal($('#search-box'));
@@ -144,9 +161,7 @@
 
     // 閲嶈浇琛ㄦ牸
     function tableReload() {
-        tableIns.reload({data: matCodeData,done:function (res) {
-                limit();
-            }});
+        tableIns.reload({data: matCodeData});
     }
 
     // 搴撲綅鎻愮ず妗�
@@ -156,11 +171,11 @@
                 let data = res.data;
                 if (data != null) {
                     $(".retrieve").show();
-                    $("#locMsg").html(locNo + "&nbsp;,搴撲綅鐘舵�侊細" + data.locType$);
+                    $("#locMsg").html(locNo + "&nbsp;,搴撲綅鐘舵�侊細" + data.locSts$);
                     $('.not-retrieve').hide();
                     currLocNo = locNo;
                 } else {
-                    layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿");
+                    layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿", {icon: 2});
                     $('.not-retrieve').show();
                     $("#locMsg").html("");
                     $(".retrieve").hide();
@@ -176,45 +191,28 @@
         }
     }
 
-    function updateMatCodeData(matNo, count) {
-        if (isNaN(count)) {
-            layer.msg("璇疯緭鍏ユ暟瀛�");
-        } else {
-            if (count >= 0) {
-                for (var i=0;i<matCodeData.length;i++){
-                    if (matCodeData[i]["matNo"] === matNo){
-                        matCodeData[i]["count"] = count;
-                    }
-                }
-            } else {
-                layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+    $(document).on('click','#mat-query', function () {
+        if (isEmpty(currLocNo)) {
+            layer.msg("璇峰厛妫�绱㈠簱浣�")
+            inputTip($("#searchLocNo"));
+            return;
+        }
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        matCodeLayerIdx = admin.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'matQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
             }
-        }
-        tableIns.reload({data: matCodeData,done:function (res) {
-                limit();
-            }});
-    }
-})
+        });
+    })
 
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
-    if (isEmpty(currLocNo)) {
-        layer.msg("璇峰厛妫�绱㈠簱浣�")
-        inputTip($("#searchLocNo"));
-        return;
-    }
-    matCodeLayerIdx = layer.open({
-        type: 2,
-        title: '鎻愬彇鐗╂枡',
-        maxmin: true,
-        area: [top.detailWidth, top.detailHeight],
-        shadeClose: true,
-        content: 'matQuery.html',
-        success: function(layero, index){
-        }
-    });
-}
+})
 
 // 鎼滅储妗嗙┖鍊兼彁绀�
 function inputTip(el) {
@@ -223,3 +221,21 @@
         el.css("border-color", "#b8b8b8");
     }, 1000);
 }
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+    for (let i=0;i<data.length;i++){
+        for (let j=0;j<matCodeData.length;j++){
+            if (data[i].matnr === matCodeData[j].matnr && data[i].batch === matCodeData[j].batch) {
+                data.splice(i, 1);
+                break;
+            } else {
+                data[i]['anfme'] = initAnfmeVal;
+                data[i]['count'] = initCountVal;
+            }
+        }
+    }
+    matCodeData.push.apply(matCodeData, data);
+    tableIns.reload({data: matCodeData});
+    layer.close(matCodeLayerIdx);
+}

--
Gitblit v1.9.1