From 71d838e032d13a46a07917f5606862496220ea74 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 08 一月 2024 08:35:35 +0800
Subject: [PATCH] # 入库拣货功能添加

---
 src/main/webapp/static/js/pla/plaDetl.js |  325 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 313 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index fc9080d..1962af6 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -5,6 +5,7 @@
 var matCodeLayerIdx;
 var data = [];
 var checkStatus = [];
+var dataCheck = [];
 function getCol() {
     var cols = [
         {field: 'id', title: 'id', align: 'center',hide:true}
@@ -16,8 +17,9 @@
         ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�', hide:true}
         ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿', hide:true}
         ,{field: 'line', align: 'center',title: '鐢熶骇绾�', hide:true}
-        ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷', hide:true}
-        ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷', hide:true}
+        ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷'}
+        ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷'}
+        ,{field: 'filmWrap', align: 'center',title: '缂犺啘', edit: true}
         ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�'}
         ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�'}
         ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true}
@@ -25,20 +27,25 @@
         ,{field: 'yellowness', align: 'center',title: '榛勫害',  hide:true}
         ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�', hide:true}
         ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true}
+        ,{field: 'l', align: 'center',title: 'l鍊�', edit: true, hide:true}
+        ,{field: 'a', align: 'center',title: 'a鍊�', edit: true, hide:true}
+        ,{field: 'b', align: 'center',title: 'b鍊�', edit: true, hide:true}
+        ,{field: 'fillIn', align: 'center',title: '濉厖(%)', edit: true}
         ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��', hide:true}
         ,{field: 'problem', align: 'center',title: '璐ㄩ噺闂', hide:true}
         ,{field: 'stash', align: 'center',title: '浠撳簱', edit:true}
         ,{field: 'locNo', align: 'center',title: '搴撲綅', edit:true}
         ,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�', edit:true}
         ,{field: 'status', align: 'center',title: '鐘舵��', edit:true}
-        ,{field: 'createUser', align: 'center',title: '鍗曞彿', edit:true}
-        ,{field: 'createUser', align: 'center',title: '鍑哄簱鏃堕棿', edit:true}
-        ,{field: 'createUser', align: 'center',title: '閲嶉噺', edit:true}
-        ,{field: 'createUser', align: 'center',title: '缁忓姙浜�', edit:true}
-        ,{field: 'createUser', align: 'center',title: '娴佽浆褰㈠紡', edit:true}
-        ,{field: 'createUser', align: 'center',title: '瀹㈡埛鍚嶇О', edit:true}
-        ,{field: 'createUser', align: 'center',title: '璋冩嫧鍒�', edit:true}
-        ,{field: 'createUser', align: 'center',title: '澶囨敞', edit:true}
+        ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook'}
+        ,{field: 'orderNo', align: 'center',title: '鍗曞彿', edit:true}
+        ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', edit:true}
+        ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', edit:true}
+        ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', edit:true}
+        ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', edit:true}
+        ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', edit:true}
+        ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', edit:true}
+        ,{field: 'memo', align: 'center',title: '澶囨敞', edit:true}
     ];
     return cols;
 }
@@ -100,6 +107,76 @@
         }
     });
 
+    table.on('tool(plaDetl)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'look') {
+            var $a = $(obj.tr).find('a[lay-event="look"]');
+            var offset = $a.offset();
+            var top = offset.top;
+            var left = offset.left;
+            layer.open({
+                type: 1,
+                title: false,
+                area: '1200px',
+                offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+                shade: .01,
+                shadeClose: true,
+                fixed: false,
+                content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+                success: function (layero) {
+                    table.render({
+                        elem: '#lookSSXMTable',
+                        headers: {token: localStorage.getItem('token')},
+                        url: baseUrl+'/plaQty/list/auth',
+                        where: {
+                            batch: data.batch,
+                            package_no: data.packageNo
+                        },
+                        page: true,
+                        cellMinWidth: 100,
+                        cols: [[
+                            {type: 'numbers'},
+                            {field: 'orderNo', title: '鍗曞彿'},
+                            {field: 'pakoutTime', title: '鍑哄簱鏃堕棿'},
+                            {field: 'orderWeight', title: '閲嶉噺'},
+                            {field: 'handlerBy', title: '缁忓姙浜�'},
+                            {field: 'transfer', title: '娴佽浆褰㈠紡'},
+                            {field: 'customer', title: '瀹㈡埛鍚嶇О'},
+                            {field: 'allocate', title: '璋冩嫧鍒�'},
+                            {field: 'memo', title: '澶囨敞'},
+                        ]],
+                        request: {
+                            pageName: 'curr',
+                            pageSize: 'limit'
+                        },
+                        parseData: function (res) {
+                            return {
+                                'code': res.code,
+                                'msg': res.msg,
+                                'count': res.data.total,
+                                'data': res.data.records
+                            }
+                        },
+                        response: {
+                            statusCode: 200
+                        },
+                        done: function () {
+                            $(layero).find('.layui-table-view').css('margin', '0');
+                        },
+                        size: ''
+                    });
+                }
+            });
+
+        }
+    })
+
+    // 鎼滅储鏍忔悳绱簨浠�
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(false);
+    });
 
     // 閲嶇疆浜嬩欢
     form.on('submit(reset)', function (data) {
@@ -114,8 +191,37 @@
     }
 
     // 閲嶈浇琛ㄦ牸
-    function tableReload() {
-        tableIns.reload({data: matCodeData});
+    // function tableReload() {
+    //     tableIns.reload({data: matCodeData});
+    // }
+    function tableReload(child) {
+        var searchData = {
+        };
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        (child ? parent.tableIns : tableIns).reload({
+            where: searchData,
+            page: {
+                curr: pageCurr
+            },
+            done: function (res, curr, count) {
+                if (res.code === 403) {
+                    top.location.href = baseUrl+"/";
+                }
+                pageCurr=curr;
+                if (res.data.length === 0 && count !== 0) {
+                    tableIns.reload({
+                        where: searchData,
+                        page: {
+                            curr: pageCurr-1
+                        }
+                    });
+                    pageCurr -= 1;
+                }
+                limit(child);
+            }
+        });
     }
 
 
@@ -181,5 +287,200 @@
         })
     })
 
+    $(document).on('click','#rework', function () {
+        let data = table.cache.plaDetl;
+        let dataSave = [];
+        let dataOld = [];
+        for(var i=0; i<data.length; i++){
+            if(data[i].LAY_CHECKED){
+                dataSave.push(data[i]);
+            }else {
+                dataOld.push(data[i]);
+            }
+        }
+
+        if(!dataSave || dataSave.length < 1){
+            layer.msg("鏈嬀閫夛紝璇峰厛鍕鹃�夐渶瑕侀噸鍋氱殑搴撳瓨");
+            return;
+        }
+
+        layer.confirm('纭畾閲嶅仛閫変腑鐨勫簱瀛樺悧锛�', {
+            shade: .1,
+            skin: 'layui-layer-admin'
+        }, function (i) {
+            layer.close(i);
+            $.ajax({
+                url: baseUrl+"/pla/rework/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: JSON.stringify(dataSave),
+                contentType:'application/json;charset=UTF-8',
+                method: 'POST',
+                async: false,
+                success: function (res) {
+                    if (res.code === 200){
+                        layer.msg("鎻愪氦鎴愬姛");
+                        table.reload('productionInfoTable',{
+                            data: dataOld
+                        })
+                    } else if (res.code === 403){
+
+                    }else {
+                        layer.msg(res.msg, {icon: 2})
+                    }
+                }
+            })
+        })
+    })
+
+    $(document).on('click','#updateZpallet', function () {
+        let data = table.cache.plaDetl;
+        let dataSave = [];
+        let dataOld = [];
+        for(var i=0; i<data.length; i++){
+            if(data[i].LAY_CHECKED){
+                data[i].step = 1;
+                dataSave.push(data[i]);
+            }else {
+                dataOld.push(data[i]);
+            }
+        }
+        dataCheck = dataSave;
+
+        if(!dataSave || dataSave.length < 1){
+            layer.msg("鏈嬀閫夛紝璇峰厛鍕鹃�夐渶瑕佹洿鏀圭殑搴撳瓨");
+            return;
+        }
+
+        layer.open({
+            type: 2,
+            title: '鎹㈠寘瑁�/鎵樼洏/缂犺啘',
+            maxmin: true,
+            area: ['500px', top.detailHeight],
+            shadeClose: false,
+            content: 'update.html',
+            success: function(layero, index){
+                layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+                layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+
+                var iframe = window['layui-layer-iframe' + index];
+                iframe.child(dataSave)
+            }
+        });
+    })
+
+    $(document).on('click','#sellout', function () {
+
+        let data = table.cache.plaDetl;
+        let dataSave = [];
+        let dataOld = [];
+        for(var i=0; i<data.length; i++){
+            if(data[i].LAY_CHECKED){
+                if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
+                    layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱锛岃閲嶆柊閫夋嫨");
+                    return;
+                }
+                dataSave.push(data[i]);
+            }else {
+                dataOld.push(data[i]);
+            }
+        }
+        dataCheck = dataSave;
+
+        if(!dataSave || dataSave.length < 1){
+            layer.msg("鏈嬀閫夛紝璇峰厛鍕鹃�夐渶瑕佹洿鏀圭殑搴撳瓨");
+            return;
+        }
+        if(dataSave.length > 1){
+            layer.msg("璇峰嬀閫変竴鏉″簱瀛樻槑缁�");
+            return;
+        }
+
+        layer.open({
+            type: 2,
+            title: '鍗栧嚭',
+            maxmin: true,
+            area: ['800px', top.detailHeight],
+            shadeClose: false,
+            content: 'sellout.html',
+            success: function(layero, index){
+                layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+                layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+
+                var iframe = window['layui-layer-iframe' + index];
+                iframe.child(dataSave)
+            }
+        });
+    })
+
+    $(document).on('click','#pickup', function () {
+
+        let data = table.cache.plaDetl;
+        let dataSave = [];
+        let dataOld = [];
+        for(var i=0; i<data.length; i++){
+            if(data[i].LAY_CHECKED){
+                if(data[i].status === "寰呭叆搴�" || data[i].status === "鍏ㄩ儴鍑哄簱"){
+                    layer.msg("閫変腑鐨勬槑缁嗚繕鏈叆搴撴垨鑰呭凡鍏ㄩ儴鍑哄簱锛岃閲嶆柊閫夋嫨");
+                    return;
+                }
+                dataSave.push(data[i]);
+            }else {
+                dataOld.push(data[i]);
+            }
+        }
+        dataCheck = dataSave;
+
+        if(!dataSave || dataSave.length < 1){
+            layer.msg("鏈嬀閫夛紝璇峰厛鍕鹃�夐渶瑕佹洿鏀圭殑搴撳瓨");
+            return;
+        }
+        if(dataSave.length > 1){
+            layer.msg("璇峰嬀閫変竴鏉″簱瀛樻槑缁�");
+            return;
+        }
+
+        layer.open({
+            type: 2,
+            title: '鍗栧嚭',
+            maxmin: true,
+            area: ['800px', top.detailHeight],
+            shadeClose: false,
+            content: 'pickup.html',
+            success: function(layero, index){
+                layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+                layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+
+                var iframe = window['layui-layer-iframe' + index];
+                iframe.child(dataSave)
+            }
+        });
+    })
+
+    $(document).on('click','#returned', function () {
+
+        layer.open({
+            type: 2,
+            title: '閫�鍥�',
+            maxmin: true,
+            area: ['800px', '800px'],
+            shadeClose: false,
+            content: 'returned.html',
+            success: function(layero, index){
+                layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+
+            }
+        });
+    })
+
 })
 
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+

--
Gitblit v1.9.1