From 0e46bb0cfc8b59ad5527f0b70c49f95aeac4bbbd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 05 一月 2024 13:38:05 +0800
Subject: [PATCH] # 入库拣货功能添加

---
 src/main/webapp/static/js/picking/picking.js |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 06fbb0f..2f1f451 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -27,7 +27,7 @@
             // {type: 'checkbox'}
             {type: 'numbers'}
             ,{field: 'wrkNo', align: 'center',title: 'id', hide:true}
-            ,{field: 'docNum',title: '鎷ｈ揣鍗曞彿' }
+            ,{field: 'doc_num',title: '鎷ｈ揣鍗曞彿' }
             ,{align: 'center', title: '浜岀淮鐮�', toolbar: '#operate', width: 200 , hide:true}
             ,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
             ,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -85,18 +85,19 @@
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(saasLog)', function(obj){
         var data = obj.data;
+        console.log(data);
         switch (obj.event) {
             case "btnPrint":
-                btnPrint(data.wrkNo, data.docNum, 4);
+                btnPrint(data.wrkNo, data.doc_num, 4);
                 break;
             case "wrkTrace":
-                btnPrint(data.wrkNo, data.docNum, 4);
+                btnPrint(data.wrkNo, data.doc_num, 4);
                 break;
             case "btnPrint2":
-                btnPrint2(data.wrkNo, data.docNum, 4);
+                btnPrint2(data.wrkNo, data.doc_num, 4);
                 break;
             case "del":
-                doDel(data.docNum);
+                doDel(data);
                 break;
             case "look":
                 var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -119,7 +120,7 @@
                             headers: {token: localStorage.getItem('token')},
                             url: baseUrl+'/ManPakOut/list/auth',
                             where: {
-                                doc_num: data.docNum,
+                                doc_num: data.doc_num,
                                 uuid: data.uuid
                             },
                             page: true,
@@ -130,8 +131,10 @@
                                 ,{field: 'docNum', align: 'center',title: '鎷ｈ揣鍗曞彿'}
                                 ,{field: 'uuid', align: 'center',title: 'uuid'}
                                 ,{field: 'locNo', align: 'center',title: '搴撲綅'}
-                                ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
-                                ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+                                ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+                                ,{field: 'barcode', align: 'center',title: '鍖呭彿'}
+                                // ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+                                // ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
                                 ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
                                 ,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
                                 ,{field: 'count', align: 'center',title: '瀹屾垚鏁�'}
@@ -295,9 +298,9 @@
                             var className = templateDom.attr("class");
 
                             if (className === 'template-barcode') {
-                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
+                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";"+json.data[i].barcode+";"+json.data[i].nodeId+";"+json.data[i].wrkNo+";");
                             } else {
-                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
+                                json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2&param=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";"+json.data[i].barcode+";"+json.data[i].nodeId+";"+json.data[i].wrkNo+";");
                             }
                         }
                         var tpl = templateDom.html();
@@ -317,8 +320,8 @@
             })
         }
 
-    function doDel(docNum) {
-        console.log(docNum)
+    function doDel(data) {
+        console.log(data)
         layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
             shade: .1,
             skin: 'layui-layer-admin'
@@ -329,7 +332,7 @@
                 url: baseUrl+"/pakout/delete/auth",
                 headers: {'token': localStorage.getItem('token')},
                 data:{
-                    docNum:docNum
+                    docNum:data.doc_num
                 },
                 method: 'GET',
                 success: function (res) {

--
Gitblit v1.9.1