From 3e29b0363ad4571183fc856fdbb893dcfe74a022 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 九月 2023 11:11:41 +0800
Subject: [PATCH] #预警

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index afa749e..b3f59d9 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -193,7 +193,7 @@
                             {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
 
-                            // {field: 'batch', title: '鎵瑰彿'},
+                            {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
                             {field: 'workQty', title: '浣滀笟鏁伴噺'},
                             {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -206,7 +206,6 @@
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
                             // {field: 'specs', title: '瑙勬牸'},
-                             {field: 'weight', title: '閲嶉噺'}
                         ]],
                         request: {
                             pageName: 'curr',
@@ -262,7 +261,11 @@
                     console.log(nList);
                     for (let xi = 0; xi < nList.length; xi++) {
                         if (nList[xi].anfme <= 0){
-                            layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+                            layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
+                            return false;
+                        }
+                        if (nList[xi].batch == null || nList[xi].batch == ""){
+                            layer.msg('鎵规涓嶅悎娉�', {icon: 2});
                             return false;
                         }
                         if (nList[xi].anfme < nList[xi].workQty){
@@ -312,7 +315,7 @@
                         {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
                         {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
                         {field: 'specs', title: '瑙勬牸'},
-                        {field: 'weight', title: '閲嶉噺', edit: true},
+                        {field: 'batch', title: '鎵规', edit: true},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
 
                         // {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},

--
Gitblit v1.9.1