接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/EosAgentModule.cs

@@ -166,7 +166,7 @@ public class EosAgentModule : AbpModule
     {
 
         context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
-        context.AddBackgroundWorkerAsync<EosOutgoingBackgroundWorker>();
+      //  context.AddBackgroundWorkerAsync<EosOutgoingBackgroundWorker>();
     }
 
 }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/EosIncomingBackgroundWorker.cs

@@ -51,13 +51,13 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Ship
         await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false);
 
-        Logger.LogInformation($"读取 产品");
-        var productHandleService = workerContext.ServiceProvider.GetRequiredService<ProductReader>();
-        var productConverter = workerContext.ServiceProvider.GetRequiredService<ProductConverter>();
-        //读取并保持Product
-        var productsFromExternalList = await productHandleService.ReadAsync().ConfigureAwait(false);
-        // 转换Product
-        await productConverter.ConvertAsync(productsFromExternalList).ConfigureAwait(false);
+        //Logger.LogInformation($"读取 产品");
+        //var productHandleService = workerContext.ServiceProvider.GetRequiredService<ProductReader>();
+        //var productConverter = workerContext.ServiceProvider.GetRequiredService<ProductConverter>();
+        ////读取并保持Product
+        //var productsFromExternalList = await productHandleService.ReadAsync().ConfigureAwait(false);
+        //// 转换Product
+        //await productConverter.ConvertAsync(productsFromExternalList).ConfigureAwait(false);
 
         Logger.LogInformation($"Completed: Handling {Incoming}");
     }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/PlanReader.cs

@@ -111,6 +111,7 @@ public class PlanReader : IReader
             {
                 0 => EnumExchangeDataAction.Add,
                 1 => EnumExchangeDataAction.Delete,
+                2=> EnumExchangeDataAction.Modify,
                 _ => throw new ArgumentOutOfRangeException()
             },
             SourceSystem = EnumSystemType.SCP.ToString(),

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/appsettings.json

@@ -1,12 +1,12 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_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",
-    "EOS": "Server=61.139.155.47;Database=EOSSH;Uid=wms;Pwd=1;TrustServerCertificate=True"
+    "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
+    "DataExchange": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_DataExchange_CC;uid=ccwin-in;pwd=Microsoft@2022;TrustServerCertificate=True;Encrypt=false",
+    "EOS": "Server=10.164.0.224;Database=EOSNEV;Uid=wms;Pwd=1;TrustServerCertificate=True"
   },
 
   "AuthServer": {
-    "Authority": "http://10.164.113.31:60083/",
+    "Authority": "http://dev.ccwin-in.com:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -25,13 +25,13 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://10.164.113.31:60084/"
+      "BaseUrl": "http://dev.ccwin-in.com:60084/"
     },
     "Store": {
-      "BaseUrl": "http://10.164.113.31:60085/"
+      "BaseUrl": "http://dev.ccwin-in.com:60085/"
     },
     "Label": {
-      "BaseUrl": "http://10.164.113.31:60082/"
+      "BaseUrl": "http://dev.ccwin-in.com:60082/"
     }
   },
   "EosOptions": {

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

@@ -29,7 +29,7 @@
       "BaseUrl": "http://dev.ccwin-in.com:60084/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:60085/"
+      "BaseUrl": "http://localhost:59095/"
     },
     "Label": {
       "BaseUrl": "http://dev.ccwin-in.com:60082/"

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Bases/SfsStoreManagerBase.cs

@@ -85,9 +85,9 @@ public abstract class SfsStoreManagerBase<TEntity, TDetailEntity>
 
     public virtual async Task<TEntity> GetByNumberAsync(string number)
     {
-        //return await Repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
-        var ret = await Repository.FirstOrDefaultAsync(itm => itm.Number == number).ConfigureAwait(false);
-        return ret;
+        return await Repository.FindAsync(p => p.Number == number,true).ConfigureAwait(false);
+       // var ret = await Repository.FirstOrDefaultAsync(itm => itm.Number == number).ConfigureAwait(false);
+        //return ret;
     }
 
     [UnitOfWork]