tyrp接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Eos/Plans/PlanManager.cs

@@ -32,6 +32,8 @@ public class PlanManager : DomainService, IPlanManager
             p.WmsState = 1;
             p.WmsDate = Clock.Now;
         });
-        await _repository.BulkUpdateAsync(plans).ConfigureAwait(false);
+        //await _repository.BulkUpdateAsync(plans).ConfigureAwait(false);
+
+        await _repository.UpdateManyAsync(plans).ConfigureAwait(false);
     }
 }

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

@@ -45,7 +45,7 @@ public class ProductReader : IReader
             return new List<IncomingFromExternal>();
         }
         //Product逐一转换为ItemPack
-        var incomingDataList = BuildIncomingFromExternalFromProductAsync(toBeProcessedProducts.Where(r => string.IsNullOrWhiteSpace(r.Code)).ToList());
+        var incomingDataList = BuildIncomingFromExternalFromProductAsync(toBeProcessedProducts.Where(r => !string.IsNullOrWhiteSpace(r.Code)).ToList());
         await _incomingFromExternalManager.CreateBulkAsync(incomingDataList).ConfigureAwait(false);
 
         return incomingDataList;

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

@@ -1,7 +1,7 @@
 {
   "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=DataExchange_Main;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"
   },
 

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs

@@ -8,6 +8,7 @@ using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.WMS.Dict;
+using static StackExchange.Redis.Role;
 
 namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Incoming;
 
@@ -68,10 +69,13 @@ public class DictConverter : IIncomingConverter
             var exchangeDictRequest = JsonSerializer.Deserialize<DictExchangeDto>(first.DestinationDataContent);
             var wmsDictRequest = _objectMapper.Map<DictExchangeDto, DictEditInput>(exchangeDictRequest);
             wmsDictRequest.Items = new List<DictItemInput>();
+          var  masterId = _guidGenerator.Create();
             foreach (var incomingFromExternal in group.ToList())
             {
                 var dictlRequest = JsonSerializer.Deserialize<DictExchangeDto>(incomingFromExternal.DestinationDataContent);
                 var wmsDictItemRequest = _objectMapper.Map<DictItemExchangeDto, DictItemInput>(exchangeDictRequest.Detail);
+                wmsDictItemRequest.Id = _guidGenerator.Create();
+                wmsDictItemRequest.MasterId = masterId;
                 wmsDictItemRequest.Enabled = true;
                 wmsDictRequest.Items.Add(wmsDictItemRequest);
             }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs

@@ -27,6 +27,7 @@ public class SupplierConverter : IIncomingConverter
 
 )
     {
+        _incomingFromExternalManager = incomingFromExternalManage;
         _incomingToWmsManager = incomingToWmsManager;
         _objectMapper = objectMapper;
         _logger = logger;

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs

@@ -117,7 +117,7 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 //读取并保存Dictpj
                 var dictpjOutsFromExternalList = await DictpjReader.ReadAsync().ConfigureAwait(false);
                 //转换Dictpj
-                await dictConverter.ConvertAsync(dictOutsFromExternalList).ConfigureAwait(false);
+                await dictConverter.ConvertAsync(dictpjOutsFromExternalList).ConfigureAwait(false);
 
                 Logger.LogInformation($"Read Customer");//客户资料
                 var CustomerReader = workerContext.ServiceProvider.GetRequiredService<CustomerReader>();

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

@@ -1,13 +1,13 @@
 {
   "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=DataExchange_Main;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",
     "TYRP": "Server=10.164.113.32,1818\\SHDB;Database=TYRP;Uid=ShWmsUser;Pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
-    "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=mesuser; Pwd=mesuser1234;Charset=cp850;" //iso_1
+    "SYBASE_TYRP": "Data Source=10.164.115.137; Port=5000; Database=mesdb; Uid=sa; Pwd=dawning;Charset=cp850;" //iso_1
   },
 
   "AuthServer": {
-    "Authority": "http://dev.ccwin-in.com:60083/",
+    "Authority": "http://10.164.113.31:60083/",
     "RequireHttpsMetadata": "false",
     "SwaggerClientId": "admin",
     "SwaggerClientSecret": "1q2w3E*",
@@ -26,16 +26,16 @@
 
   "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/"
     }
   },
   "TyrpOptions": {

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

@@ -1,13 +1,13 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=10.164.113.32,1818\\SHDB;Database=DataExchange_Main;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;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=DataExchange_Main;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*",
@@ -26,16 +26,16 @@
 
   "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": {