From f2c15afd5db47e5ebec1cefd3c17cfb605688187 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 16:06:53 +0800
Subject: [PATCH] 修改PDA托盘绑定

---
 Pda/View/AsnSetting/productEnterQuantity.html |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Pda/View/AsnSetting/productEnterQuantity .html b/Pda/View/AsnSetting/productEnterQuantity.html
similarity index 96%
rename from Pda/View/AsnSetting/productEnterQuantity .html
rename to Pda/View/AsnSetting/productEnterQuantity.html
index caaa38d..43c99f9 100644
--- a/Pda/View/AsnSetting/productEnterQuantity .html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -705,6 +705,7 @@
 					AsnNo: $("#bar").val(),
 					PalletNo: $("#STOCKCODE").val(),
 					AsnDetailId: parseInt($("#goodSelect").val()),
+                    LotNo:$("#goodSelect").find("option:selected").text(),
 					BoxNo: $("#BOXCODE").val(),
 					IsContinue: isContinue,
 					TailBoxNo: $("#BOXCODE2").val(),
@@ -851,25 +852,44 @@
                     var param = {
                         AsnNo: $("#bar").val(),
                     };
-                    synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
+                    synData(IP + "/PdaAsn/GetBindArrivalNoticeDetails", param, 'post', function (res) {
                         console.log("鍑哄簱鍙o細" + JSON.stringify(res))
                         if (res.code == 0) { //鎴愬姛
                             asnDetails = res.data;
                             for (var i = 0; i < res.data.length; i++) {
                                 if(skuNo!='' && skuNo==res.data[i].SkuNo){
-                                    $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                    if(res.data[i].LotNo=='' || res.data[i].LotNo == null){
+                                        $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                        .SkuName +
+                                        '</option>');
+                                    }else{
+                                        $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                         .SkuName + "-" + res.data[i].LotNo +
                                         '</option>');
+                                    }                                    
                                 }else{
                                     if (i == 0) {
-                                        $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                        if(res.data[i].LotNo=='' || res.data[i].LotNo == null){
+                                            $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                            .SkuName +
+                                            '</option>');
+                                        }else{
+                                            $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                             .SkuName + "-" + res.data[i].LotNo +
                                             '</option>');
-                                        } else {
-                                            $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
-                                                .SkuName + "-" + res.data[i].LotNo +
-                                                '</option>');
                                         }
+                                        
+                                    } else {
+                                        if(res.data[i].LotNo=='' || res.data[i].LotNo == null){
+                                            $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+                                            .SkuName +
+                                            '</option>');
+                                        }else{
+                                            $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+                                            .SkuName + "-" + res.data[i].LotNo +
+                                            '</option>');
+                                        }                                         
+                                     }
                                 }							
                             }
                             form.render('select');

--
Gitblit v1.8.0