Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

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;

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;

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/appsettings.json

@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=dev.ccwin-in.com,13319;Database=Wms_XianChang_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;TrustServerCertificate=True",
-    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=Wms_XianChang_DataExchange_Main_Dy_ShangHai;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;TrustServerCertificate=True"
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
   },
 
 
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -19,23 +19,23 @@
     "client_id": "Auth_App",
     "client_secret": "1q2w3E*",
     "grant_type": "password",
-    "username": "jiekou1",
+    "username": "jiekou",
     "password": "1q2w3E*"
   },
 
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://10.164.113.31:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://10.164.113.31:60085/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:60082/"
+      "BaseUrl": "http://10.164.113.31:60082/"
     },
     "Auth": {
-      "BaseUrl": "http://dev.ccwin-in.com:60083/"
+      "BaseUrl": "http://10.164.113.31:60083/"
     }
   },
   "DataExchangeOptions": {