From 4ef4e287fe6597543a9628b6dae294c19f2b1d9c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 十月 2025 10:50:41 +0800
Subject: [PATCH] 1.新增订单出库挑选功能 2.新增订单明细表

---
 src/main/webapp/static/js/order/outAll.js |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/order/outAll.js b/src/main/webapp/static/js/order/outAll.js
index 98a3634..a8f5953 100644
--- a/src/main/webapp/static/js/order/outAll.js
+++ b/src/main/webapp/static/js/order/outAll.js
@@ -1,5 +1,8 @@
 var pageCurr;
 var insTb2;
+var matnR;
+var id;
+var anfme;
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
@@ -34,7 +37,7 @@
             ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
             ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
             ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
-            ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+            ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
             ,{field: 'specs', align: 'center',title: '瑙勬牸'}
             // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
             // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -54,7 +57,7 @@
             // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
             // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
             // ,{field: 'memo', align: 'center',title: '澶囨敞'}
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 200}
         ]],
         request: {
             pageName: 'curr',
@@ -120,12 +123,34 @@
             case 'pakoutPreview':
                 pakoutPreview([data.id])
                 break;
+            case 'outLocDetlQuery' :
+                outLocDetlQuery([data.matnr],[data.id],[data.enableQty])
+                break;
         }
     });
 
+    // 鎻愬彇搴撳瓨
+    function outLocDetlQuery(matnr,id,enableQty) {
+        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        matnR=matnr;
+        ID=id;
+        anfme=enableQty;
+        locDetlLayerIdx = layer.open({
+            type: 2,
+            title: false,
+            closeBtn: false,
+            maxmin: false,
+            area: ['90%', '85%'],
+            shadeClose: true,
+            content: 'outLocDetlQuery.html',
+            success: function(layero, index){
+                layer.close(loadIndex);
+            }
+        });
+    }
+
     function pakoutPreview(ids) {
         let loadIndex = layer.load(2);
-        console.log("1111")
         $.ajax({
             url: baseUrl + "/out/pakout2/preview/auth",
             headers: {'token': localStorage.getItem('token')},
@@ -160,7 +185,7 @@
                                     // {type: 'checkbox', merge: ['orderNo']},
                                     {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
                                     {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
-                                    {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+                                    {field: 'batch', title: '鎵瑰彿', align: 'center'},
                                     {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
                                     {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
                                     {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},

--
Gitblit v1.9.1