From 8359572be2164aec32219fafd5e72f4035067dff Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 01 八月 2023 08:52:26 +0800
Subject: [PATCH] agv 订单出库功能

---
 src/main/webapp/static/js/order/out.js |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index b68649a..bfe89c1 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -143,6 +143,12 @@
     }
 
     function pakoutPreviewDialog(data) {
+        for(var i=0; i<data.length; i++){
+            if(!data[i].staNos){
+                data[i].staNos = data[i].agvStaNos;
+                data[i].staNo = data[i].agvStaNo;
+            }
+        }
         var tableCache;
         layer.open({
             type: 1
@@ -170,10 +176,11 @@
                         {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
                         {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: 'locNo', title: '璐т綅', align: 'center', templet: '#locNoTpl'},
                         {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                         // {type: 'checkbox', merge: ['locNo']},
                     ]],
+                    //cols: getCol(data),
                     done: function (res) {
                         tableMerge.render(this);
                         $('.layui-table-body.layui-table-main').css("overflow", "auto");
@@ -186,7 +193,8 @@
                     let data = tableCache[index];
                     for (let i = 0; i<tableCache.length; i++) {
                         if (tableCache[i].locNo === data.locNo) {
-                            tableCache[i]['staNo'] = Number(obj.elem.value);
+                            //tableCache[i]['staNo'] = Number(obj.elem.value);
+                            tableCache[i]['staNo'] = obj.elem.value;
                         }
                     }
                     obj.othis.children().find("input").css("color", "blue");
@@ -231,7 +239,8 @@
                             // 纭
                             form.on('submit(staBatchSelectConfirm)', function (obj) {
                                 let loadIdx = layer.load(2);
-                                let batchSta = Number(obj.field.batchSta);
+                                //let batchSta = Number(obj.field.batchSta);
+                                let batchSta = obj.field.batchSta;
                                 let arr = [];
                                 for (let i = 0; i<tableCache.length; i++) {
                                     tableCache[i]['staNo'] = batchSta;
@@ -270,6 +279,13 @@
 
     function pakout(tableCache, layerIndex) {
         // let loadIndex = layer.load(2);
+        for(var i=0; i<tableCache.length; i++){
+            if(tableCache[i].agvStaNos){
+                tableCache[i].agvStaNo = tableCache[i].staNo;
+                tableCache[i].staNos = null;
+                tableCache[i].staNo = null;
+            }
+        }
         notice.msg('姝ｅ湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4});
         $.ajax({
             url: baseUrl + "/out/pakout/auth",
@@ -439,6 +455,12 @@
     }
 
     function pakoutPreviewMergeDialog(data) {
+        for(var i=0; i<data.length; i++){
+            if(!data[i].staNos){
+                data[i].staNos = data[i].agvStaNos;
+                data[i].staNo = data[i].agvStaNo;
+            }
+        }
         var mergeTabCache;
         layer.open({
             type: 1
@@ -466,7 +488,7 @@
                         {field: 'specs', 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: 'locNo', title: '璐т綅', align: 'center', templet: '#locNoTpl'},
                         {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                         // {type: 'checkbox', merge: ['locNo']},
                     ]],
@@ -482,7 +504,8 @@
                     let data = mergeTabCache[index];
                     for (let i = 0; i<mergeTabCache.length; i++) {
                         if (mergeTabCache[i].locNo === data.locNo) {
-                            mergeTabCache[i]['staNo'] = Number(obj.elem.value);
+                            //mergeTabCache[i]['staNo'] = Number(obj.elem.value);
+                            mergeTabCache[i]['staNo'] = obj.elem.value;
                         }
                     }
                     obj.othis.children().find("input").css("color", "blue");
@@ -527,7 +550,8 @@
                             // 纭
                             form.on('submit(staBatchSelectConfirm)', function (obj) {
                                 let loadIdx = layer.load(2);
-                                let batchSta = Number(obj.field.batchSta);
+                                //let batchSta = Number(obj.field.batchSta);
+                                let batchSta = obj.field.batchSta;
                                 let arr = [];
                                 for (let i = 0; i<mergeTabCache.length; i++) {
                                     mergeTabCache[i]['staNo'] = batchSta;

--
Gitblit v1.9.1