From 009e869b09a63efbc5e58e22f88ad0ed2a315e2b Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 16:12:16 +0800
Subject: [PATCH] Merge branch 'yyk'

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

diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 43c99f9..da587ad 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -598,7 +598,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) { //鎴愬姛
@@ -923,11 +923,14 @@
                             for (var i = 0; i < res.data.length; i++) {
                                 if (i == 0) {
                                     $("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
-                                        .SkuName + "-" + res.data[i].LotNo +
-                                        '</option>');
+                                        .SkuName);
                                 } else {
                                     $("#goodSelect1").append('<option value =' + res.data[i].Id + '>' + res.data[i]
-                                        .SkuName + "-" + res.data[i].LotNo +
+                                        .SkuName);
+                                }
+                                if (res.data[i].LotNo != null)
+                                {
+                                    $("#goodSelect1").append("-" + res.data[i].LotNo +
                                         '</option>');
                                 }
 

--
Gitblit v1.8.0