diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/ProductManager.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/ProductManager.cs
index 48f434901..7c6975547 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/ProductManager.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Products/ProductManager.cs
@@ -24,7 +24,7 @@ public class ProductManager : DomainService, IProductManager
         }
         else
         {
-            plans = await _repository.GetListAsync(r => r.EosDate != null).ConfigureAwait(false);
+            plans = await _repository.GetListAsync(r => r.EosDate != null&& r.EosDate > DateTime.Now.AddDays(-1)).ConfigureAwait(false);
         }
 
         return plans;
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs
index 641033e6e..28f70da1d 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ShipConverter.cs
@@ -105,6 +105,7 @@ public class ShipConverter : IIncomingConverter
             purchaseLabel.ItemDesc1 = item.Desc1;
             purchaseLabel.Uom = item.BasicUom;
             purchaseLabel.ItemDesc2 = item.Desc2;
+            purchaseLabel.ExpireDate = DateTime.Now.AddDays(item.GetValidateDays());
         }
         else
         {
@@ -112,6 +113,7 @@ public class ShipConverter : IIncomingConverter
             purchaseLabel.ItemDesc1 = "";
             purchaseLabel.Uom = "";
             purchaseLabel.ItemDesc2 = "";
+            purchaseLabel.ExpireDate = DateTime.Now;
         }
         purchaseLabel.LabelType = EnumLabelType.PurchaseLabel;
         var supplierDto = await _supplierAppService.GetByCodeAsync(exchangeAsn.SupplierCode).ConfigureAwait(false);
@@ -135,7 +137,7 @@ public class ShipConverter : IIncomingConverter
         purchaseLabel.SupplierItemName = exchangeAsn.Detail.SupplierItemName;
       
       
-        purchaseLabel.ExpireDate = DateTime.Now.AddDays(item.GetValidateDays());
+      
         purchaseLabel.ExtraProperties = new ExtraPropertyDictionary();
         purchaseLabel.LabelStatus = LabelStatus.Enable;
         purchaseLabel.Specifications = item.Color;