From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc

---
 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 161ce8e..c8f8338 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -2522,6 +2522,7 @@
                                 SkuName = boxInfo.SkuName,
                                 Standard = sku.Standard,
                                 ProductionTime = boxInfo.ProductionTime,
+                                ExpirationTime = boxInfo.ExpirationTime,
                                 SupplierLot = boxInfo.SupplierLot,
                                 InspectStatus = boxInfo.InspectStatus,
                                 InspectMark = boxInfo.InspectMark,
@@ -2695,6 +2696,7 @@
                                     SkuName = demo.SkuName,
                                     Standard = noticeDetail.Standard,
                                     ProductionTime = demo.ProductionTime,
+                                    ExpirationTime = demo.ExpirationTime,
                                     SupplierLot = demo.SupplierLot,
                                     InspectStatus = demo.InspectStatus,
                                     InspectMark = demo.InspectMark,

--
Gitblit v1.8.0