From d9f292a9484ff1efb5d4ccc3076ff16d405459ca Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 15 三月 2024 11:24:29 +0800
Subject: [PATCH] Merge branch 'master' into Liudl

---
 HTML/views/ASNSetting/ArrivalNotice.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 918055e..4c52f8f 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1193,7 +1193,7 @@
 						layer.open({
 							type: 2,
 							title: '鐢熸垚鏍囩',
-							content: 'LabelPrintSelect.html?Id='+id,
+							content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
 							maxmin: true,
 							area: ['480px', '615px'],
 							btn: ['纭畾','鍙栨秷'],
@@ -1207,7 +1207,7 @@
 									console.log(field);
 									//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
 									//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
-									var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+									var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
 									
 									layer.open({
 										type: 2,

--
Gitblit v1.8.0