From 1a29ad0fea9932f3d0bb56c939ccc32c877a34d8 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 19 二月 2024 16:08:59 +0800
Subject: [PATCH] 1

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

diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 43c99f9..771b746 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -311,6 +311,7 @@
                                         </div>
                                     </div>
                                 </td>
+                                <td></td> 
                             </tr>
                             <tr>
                                 <td>
@@ -598,7 +599,7 @@
                     form.render('select');
 
                     var param = {
-                        Type: "2,5,6"
+                        Type: "2,5,6,7"
                     };
                     sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
                         if (res.code == 0) { //鎴愬姛
@@ -921,14 +922,29 @@
                         if (res.code == 0) { //鎴愬姛
                             asnDetails = res.data;
                             for (var i = 0; i < res.data.length; i++) {
-                                if (i == 0) {
-                                    $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                if(skuNo!='' && skuNo==res.data[i].SkuNo){
+                                    if (i == 0) {
+                                        $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                            .SkuName);
+                                    } else {
+                                        $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+                                            .SkuName);
+                                    }
+                                    if (res.data[i].LotNo != null)
+                                    {
+                                        $("#goodSelect1").append("-" + res.data[i].LotNo +
+                                            '</option>');
+                                    }      
+                                }else {
+                                    if(res.data[i].LotNo=='' || res.data[i].LotNo == null){
+                                        $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+                                        .SkuName +
+                                        '</option>');
+                                    }else{
+                                        $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
                                         .SkuName + "-" + res.data[i].LotNo +
                                         '</option>');
-                                } else {
-                                    $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
-                                        .SkuName + "-" + res.data[i].LotNo +
-                                        '</option>');
+                                    }   
                                 }
 
                             }

--
Gitblit v1.8.0