From c5b1af3ab966596ee5ec8b79df75df59e40fd881 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 07 六月 2025 10:32:24 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 2531cd2..cc3eeeb 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -197,6 +197,10 @@
                             {field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
                             // {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
+                            {field: 'batch', title: '鎵规'},
+                            {field: 'beBatch', title: '琛屽彿'},
+                            {field: 'sourceLocName', title: '婧愪粨搴�'},
+                            {field: 'targetLocName', title: '鐩爣浠撳簱'},
                             {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
                             // {field: 'unit', title: '鍗曚綅'},
@@ -271,6 +275,11 @@
                             layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
                             return false;
                         }
+
+                        if (nList[xi].batch === ""){
+                            layer.msg('鎵规涓嶈兘涓虹┖', {icon: 2});
+                            return false;
+                        }
                     }
                     for (let xi = 0; xi < nList.length; xi++) {
                         if (nList[xi].owner <= 0){
@@ -321,6 +330,7 @@
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'weight', title: '閲嶉噺', edit: true},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+                        {field: 'batch', title: '鎵规(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'payment', title: '璐х墿鐘舵��', style: 'color: blue;font-weight: bold', templet: '#payment'},
                         // {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
@@ -550,7 +560,7 @@
 
     // 淇敼璁㈠崟鐘舵��
     function doModify(orderId, orderNo, settle) {
-        layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
+        layer.confirm('纭畾瑕佹墜鍔ㄤ笂鎶ュ悧锛�', {
             shade: .1,
             skin: 'layui-layer-admin'
         }, function (i) {
@@ -559,12 +569,10 @@
             console.log(orderId);
             console.log(settle);
             $.ajax({
-                url: baseUrl+"/order/update/auth",
+                url: baseUrl+"/order/report",
                 headers: {'token': localStorage.getItem('token')},
                 data: {
-                    id: orderId,
                     orderNo: orderNo,
-                    settle: settle
                 },
                 method: 'POST',
                 success: function (res) {
@@ -633,14 +641,15 @@
                     var barcodeUrl = baseUrl + "/order/code/auth?type=1&param=" + res.data[0].docNum;
                     console.log("barcodeUrl:"+barcodeUrl);
                     json.barcodeUrl = barcodeUrl;
+                    console.log(json.data);
                     for (let i = 0; i < json.data.length; i++) {
                         var templateDom = $("#templatePreview" + templateNo);
                         var className = templateDom.attr("class");
 
                         if (className === 'template-barcode') {
-                            json.data[i]["barcodeUrl"] = baseUrl + "/order/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 + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
                         } else {
-                            json.data[i]["barcodeUrl"] = baseUrl + "/order/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 + "/order/code/auth?type=2&param=" + (json.data[i].orderNo+";"+json.data[i].matnr+";");
                         }
                     }
                     var tpl = templateDom.html();

--
Gitblit v1.9.1