From d24fd92f40757374cf60f1148a91acb0cfb06287 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 21 三月 2024 16:58:52 +0800
Subject: [PATCH] 将托盘绑定限制条件修改为标签页,增加托盘绑定页单据下是否有贴标物料及方法。

---
 Pda/View/AsnSetting/productEnterQuantity.html |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index c8ec00d..223ec3a 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -621,7 +621,7 @@
                     form.render('select');
 
                     var param = {
-                        Type: "2,5,6,7"
+                        Type: "1,2,3,4,5,6,7"
                     };
                     sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
                         if (res.code == 0) { //鎴愬姛
@@ -732,8 +732,10 @@
                         BoxNo: $("#BOXCODE").val(),
                         IsContinue: isContinue,
                         TailBoxNo: $("#BOXCODE2").val(),
-                        Origin: "PDA"
+                        Origin: "PDA",
+                        TableType: xianshiyemian,
                     }
+                    console.log(param)
                     //缁勭洏
                     sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
                         if (res.code == 0) { //鎴愬姛 
@@ -786,7 +788,8 @@
                         LotNo: $("#goodSelect1").find("option:selected").text(),  //鐗╂枡鎵规
                         SkuQty: parseInt($("#SkuQty").val()), //鐗╂枡鏁伴噺
                         Demo: $("#NoticeDemo").val(), //鐗╂枡鏁伴噺
-                        Origin: "PDA"
+                        Origin: "PDA",
+                        TableType: xianshiyemian,
                     }
 
                     console.log(param)
@@ -905,6 +908,13 @@
                         console.log("鍑哄簱鍙o細" + JSON.stringify(res))
                         if (res.code == 0) { //鎴愬姛
                             asnDetails = res.data;
+                            if (asnDetails.length <= 0) {
+                                layer.msg('褰撳墠鍗曟嵁涓嬩笉瀛樺湪璐存爣鐗╂枡', {
+                                    icon: 2,
+                                    time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+                                });
+                                return;
+                            }
                             for (var i = 0; i < res.data.length; i++) {
                                 if (skuNo != '' && skuNo == res.data[i].SkuNo) {
                                     if (res.data[i].LotNo == '' || res.data[i].LotNo == null) {
@@ -968,6 +978,14 @@
                         console.log("鍑哄簱鍙o細" + JSON.stringify(res))
                         if (res.code == 0) { //鎴愬姛
                             asnDetails = res.data;
+                            // console.log(asnDetails.length)
+                            if (asnDetails.length <= 0) {
+                                layer.msg('褰撳墠鍗曟嵁涓嬩笉瀛樺湪涓嶈创鏍囩墿鏂�', {
+                                    icon: 2,
+                                    time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+                                });
+                                return;
+                            }
                             for (var i = 0; i < res.data.length; i++) {
                                 if (skuNo != '' && skuNo == res.data[i].SkuNo) {
 

--
Gitblit v1.8.0