接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Eos/Arrives/ArriveDbContextModelCreatingExtensions.cs

@@ -11,12 +11,12 @@ public static class ArriveDbContextModelCreatingExtensions
         builder.Entity<ArriveNote>(b =>
         {
             //Configure table & schema Name
-            b.ToTable(options.TablePrefix + "Sync_arrive", options.Schema);
+            b.ToTable(options.TablePrefix + "Sync_arrrive", options.Schema);
             //Configure ABP properties
             b.ConfigureByConvention();
 
             //Properties
-            b.Property(q => q.Id);
+            b.Property(q => q.Id).ValueGeneratedOnAdd();
             b.Property(q => q.PlanBillNo).HasMaxLength(255);
             b.Property(q => q.ShipBillNo).HasMaxLength(255);
             b.Property(q => q.DocNo).HasMaxLength(255);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Eos/Returns/ReturnDbContextModelCreatingExtensions.cs

@@ -16,7 +16,7 @@ public static class ReturnDbContextModelCreatingExtensions
             b.ConfigureByConvention();
 
             //Properties
-            b.Property(q => q.Id);
+            b.Property(q => q.Id).ValueGeneratedOnAdd();
             b.Property(q => q.PlanBillNo).HasMaxLength(255);
             b.Property(q => q.ShipBillNo).HasMaxLength(255);
             b.Property(q => q.DocNo).HasMaxLength(255);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

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

@@ -41,7 +41,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent;
     typeof(DataExchangeEntityFrameworkCoreModule),
     typeof(DataExchangeDomainFawtygEosModule),
     typeof(DataExchangeEntityFrameworkCoreFawtygModule),
-        typeof(AbpAccountApplicationContractsModule)
+    typeof(AbpAccountApplicationContractsModule)
     )]
 public class EosAgentModule : AbpModule
 {
@@ -165,8 +165,8 @@ public class EosAgentModule : AbpModule
     ApplicationInitializationContext context)
     {
 
-        context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
-        //  context.AddBackgroundWorker<TyrpOutgoingBackgroundWorker>();
+        //context.AddBackgroundWorkerAsync<EosIncomingBackgroundWorker>();
+        context.AddBackgroundWorkerAsync<EosOutgoingBackgroundWorker>();
     }
 
 }

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

@@ -43,21 +43,21 @@ public class EosIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Plan
         await planConverter.ConvertAsync(plansFromExternalList).ConfigureAwait(false);
 
-        //Logger.LogInformation($"Read Ship");
-        //var shipHandleService = workerContext.ServiceProvider.GetRequiredService<ShipReader>();
-        //var shipConverter = workerContext.ServiceProvider.GetRequiredService<ShipConverter>();
-        ////读取并保持Ship
-        //var shipsFromExternalList = await shipHandleService.ReadAsync().ConfigureAwait(false);
-        ////转换Ship
-        //await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Read Ship");
+        var shipHandleService = workerContext.ServiceProvider.GetRequiredService<ShipReader>();
+        var shipConverter = workerContext.ServiceProvider.GetRequiredService<ShipConverter>();
+        //读取并保持Ship
+        var shipsFromExternalList = await shipHandleService.ReadAsync().ConfigureAwait(false);
+        //转换Ship
+        await shipConverter.ConvertAsync(shipsFromExternalList).ConfigureAwait(false);
 
-        //Logger.LogInformation($"Read Product");
-        //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($"Read Product");
+        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/PlanConverter.cs

@@ -14,6 +14,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent;
 
 public class PlanConverter : IIncomingConverter
 {
+    private readonly IIncomingFromExternalManager _incomingFromExternalManager;
     private readonly IIncomingToWmsManager _incomingToWmsManager;
     private readonly IItemBasicAppService _itemBasicAppService;
     private readonly IItemPackAppService _itemPackAppService;
@@ -27,10 +28,12 @@ public class PlanConverter : IIncomingConverter
         IItemPackAppService itemPackAppService,
         IObjectMapper objectMapper,
         ILogger<PlanConverter> logger,
-               IConfiguration configuration
+               IConfiguration configuration,
+                IIncomingFromExternalManager incomingFromExternalManager
 
     )
     {
+        _incomingFromExternalManager = incomingFromExternalManager;
         _incomingToWmsManager = incomingToWmsManager;
         _itemBasicAppService = itemBasicAppService;
         _itemPackAppService = itemPackAppService;
@@ -48,7 +51,8 @@ public class PlanConverter : IIncomingConverter
         //按PlanBillNo合并PurchaseOrder
         var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(incomingToWmsDataList).ConfigureAwait(false);
-
+        //归档
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
     private async Task<List<IncomingToWms>> BuildIncomingToWmsOfPurchaseOrderAsync(List<IncomingFromExternal> incomingDataList)

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

@@ -37,8 +37,7 @@ public class PlanReader : IReader
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
     {
         //从EOS读取待处理Plan
-        var aa = await _planManager.GetToBeProcessedListAsync().ConfigureAwait(false);
-        var toBeProcessedPlans = aa.Take(100).ToList();
+        var toBeProcessedPlans = await _planManager.GetToBeProcessedListAsync().ConfigureAwait(false);
         if (!toBeProcessedPlans.Any())
         {
             _logger.LogInformation("no plans");

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

@@ -15,6 +15,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent.Incoming;
 
 public class ProductConverter : IIncomingConverter
 {
+    private readonly IIncomingFromExternalManager _incomingFromExternalManager;
     private readonly IIncomingToWmsManager _incomingToWmsManager;
     private readonly ISupplierAppService _supplierAppService;
     private readonly IObjectMapper _objectMapper;
@@ -27,9 +28,11 @@ public class ProductConverter : IIncomingConverter
         IObjectMapper objectMapper,
         ILogger<ProductConverter> logger,
         IGuidGenerator guidGenerator,
-          IConfiguration configuration
+          IConfiguration configuration,
+           IIncomingFromExternalManager incomingFromExternalManager
     )
     {
+        _incomingFromExternalManager = incomingFromExternalManager;
         _incomingToWmsManager = incomingToWmsManager;
         _objectMapper = objectMapper;
         _supplierAppService = supplierAppService;
@@ -53,7 +56,8 @@ public class ProductConverter : IIncomingConverter
         incomingToWmsDataList.AddRange(supplierItemIncomingToWmsDataList);
         //添加IncomingToWms
         await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false);
-
+        //归档
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
     private async Task<List<IncomingToWms>> BuildItemPackIncomingToWmsOfProductAsync(List<IncomingFromExternal> incomingDataList)

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

@@ -17,6 +17,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent;
 
 public class ShipConverter : IIncomingConverter
 {
+    private readonly IIncomingFromExternalManager _incomingFromExternalManager;
     private readonly IIncomingToWmsManager _incomingToWmsManager;
     private readonly IObjectMapper _objectMapper;
     private readonly IItemBasicAppService _itemBasicAppService;
@@ -29,9 +30,11 @@ public class ShipConverter : IIncomingConverter
         , IItemBasicAppService itemBasicAppService
         , IItemPackAppService itemPackAppService
         , ILogger<ShipConverter> logger,
-          IConfiguration configuration
+          IConfiguration configuration,
+           IIncomingFromExternalManager incomingFromExternalManager
         )
     {
+        _incomingFromExternalManager = incomingFromExternalManager;
         _incomingToWmsManager = incomingToWmsManager;
         _objectMapper = objectMapper;
         _itemBasicAppService = itemBasicAppService;
@@ -54,6 +57,8 @@ public class ShipConverter : IIncomingConverter
 
         var purchaseLabelList = BuildIncomingToWmsOfPurchaseLabelAsync(incomingFromExternalList);
         await _incomingToWmsManager.CreateManyAsync(purchaseLabelList).ConfigureAwait(false);
+        //归档
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
     }
 
     private List<IncomingToWms> BuildIncomingToWmsOfPurchaseLabelAsync(List<IncomingFromExternal> incomingFromExternalList)

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

@@ -32,7 +32,8 @@ public class ShipReader : IReader
     public virtual async Task<List<IncomingFromExternal>> ReadAsync()
     {
         //从EOS读取待处理Ship
-        var toBeProcessedShips = await _shipManager.GetToBeProcessedListAsync().ConfigureAwait(false);
+        var aa = await _shipManager.GetToBeProcessedListAsync().ConfigureAwait(false);
+        var toBeProcessedShips = aa.Take(5).ToList();
         if (!toBeProcessedShips.Any())
         {
             _logger.LogInformation("no ships");

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ArriveConverter.cs

@@ -35,7 +35,7 @@ public class ArriveConverter : IOutgoingConverter
     {
         var outgoingToExternalList = new List<OutgoingToExternal>();
 
-        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseReceipt, EnumSystemType.SCP).ConfigureAwait(false);
+        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseReceipt, EnumSystemType.EOS).ConfigureAwait(false);
 
         foreach (var outgoingFromWms in outgoingFromWmsList)
         {

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/ReturnConverter.cs

@@ -35,7 +35,7 @@ public class ReturnConverter : IOutgoingConverter
     {
         var outgoingToExternalList = new List<OutgoingToExternal>();
 
-        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseReturn, EnumSystemType.SCP).ConfigureAwait(false);
+        var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseReturn, EnumSystemType.EOS).ConfigureAwait(false);
 
         foreach (var outgoingFromWms in outgoingFromWmsList)
         {

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

@@ -99,6 +99,7 @@ public class BomReader : IReader
             SourceSystem = EnumSystemType.ERP.ToString(),
             SourceDataId = bom.mes_bom_assy.ToString(),
             SourceDataDetailCode = bom.mes_bom_part.ToString(),
+            SourceDataGroupCode = bom.mes_bom_part.ToString(),
             SourceDataContent = JsonSerializer.Serialize(bom),
             WriteTime = DateTime.Now,
             Writer = nameof(TyrpIncomingBackgroundWorker),
@@ -114,8 +115,8 @@ public class BomReader : IReader
         {
             Product = bom.mes_bom_assy,
             Component = bom.mes_bom_part,
-            BeginTime = DateTime.ParseExact(bom.mes_bom_chg_e, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture),
-            EndTime = DateTime.ParseExact(bom.mes_bom_chg_b, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture),
+            BeginTime = DateTime.ParseExact(bom.mes_bom_chg_b, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture),
+            EndTime = DateTime.ParseExact(bom.mes_bom_chg_e, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture),
             ComponentQty = bom.mes_bom_qty
         };
 

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

@@ -59,13 +59,13 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 common.updatedt = DateTime.Now;
                 common.isupdate = false;
 
-                Logger.LogInformation($"Read ItemBasic");//零件
-                var itemBasicReader = workerContext.ServiceProvider.GetRequiredService<ItemBasicReader>();
-                var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>();
-                //读取并保存itemBasic
-                var itemBasicOutsFromExternalList = await itemBasicReader.ReadAsync().ConfigureAwait(false);
-                //转换itemBasic
-                await itemBasicConverter.ConvertAsync(itemBasicOutsFromExternalList).ConfigureAwait(false);
+                //Logger.LogInformation($"Read ItemBasic");//零件
+                //var itemBasicReader = workerContext.ServiceProvider.GetRequiredService<ItemBasicReader>();
+                //var itemBasicConverter = workerContext.ServiceProvider.GetRequiredService<ItemBasicConverter>();
+                ////读取并保存itemBasic
+                //var itemBasicOutsFromExternalList = await itemBasicReader.ReadAsync().ConfigureAwait(false);
+                ////转换itemBasic
+                //await itemBasicConverter.ConvertAsync(itemBasicOutsFromExternalList).ConfigureAwait(false);
 
                 //Logger.LogInformation($"Read User");//用户和部门
                 //var userReader = workerContext.ServiceProvider.GetRequiredService<UserReader>();
@@ -80,13 +80,13 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 ////转换department 
                 //await departmentConverter.ConvertAsync(departmentOutsFromExternalList).ConfigureAwait(false);
 
-                Logger.LogInformation($"Read InterfaceCalendar");//账期
-                var interfaceCalendarReader = workerContext.ServiceProvider.GetRequiredService<InterfaceCalendarReader>();
-                var interfaceCalendarConverter = workerContext.ServiceProvider.GetRequiredService<InterfaceCalendarConverter>();
-                //读取并保存InterfaceCalendar
-                var interfaceCalendarOutsFromExternalList = await interfaceCalendarReader.ReadAsync().ConfigureAwait(false);
-                //转换InterfaceCalendar
-                await interfaceCalendarConverter.ConvertAsync(interfaceCalendarOutsFromExternalList).ConfigureAwait(false);
+                //Logger.LogInformation($"Read InterfaceCalendar");//账期
+                //var interfaceCalendarReader = workerContext.ServiceProvider.GetRequiredService<InterfaceCalendarReader>();
+                //var interfaceCalendarConverter = workerContext.ServiceProvider.GetRequiredService<InterfaceCalendarConverter>();
+                ////读取并保存InterfaceCalendar
+                //var interfaceCalendarOutsFromExternalList = await interfaceCalendarReader.ReadAsync().ConfigureAwait(false);
+                ////转换InterfaceCalendar
+                //await interfaceCalendarConverter.ConvertAsync(interfaceCalendarOutsFromExternalList).ConfigureAwait(false);
 
                 //Logger.LogInformation($"Read Dict");//系统代码
                 //var dictReader = workerContext.ServiceProvider.GetRequiredService<DictReader>();
@@ -96,13 +96,13 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
                 ////转换Dict
                 //await dictConverter.ConvertAsync(dictOutsFromExternalList).ConfigureAwait(false);
 
-                //Logger.LogInformation($"Read Bom");
-                //var BomReader = workerContext.ServiceProvider.GetRequiredService<BomReader>();
-                //var BomConverter = workerContext.ServiceProvider.GetRequiredService<BomConverter>();
-                ////读取并保存Bom
-                //var bomsFromExternalList = await BomReader.ReadAsync().ConfigureAwait(false);
-                ////转换Bom
-                //await BomConverter.ConvertAsync(bomsFromExternalList).ConfigureAwait(false);
+                Logger.LogInformation($"Read Bom");
+                var BomReader = workerContext.ServiceProvider.GetRequiredService<BomReader>();
+                var BomConverter = workerContext.ServiceProvider.GetRequiredService<BomConverter>();
+                //读取并保存Bom
+                var bomsFromExternalList = await BomReader.ReadAsync().ConfigureAwait(false);
+                //转换Bom
+                await BomConverter.ConvertAsync(bomsFromExternalList).ConfigureAwait(false);
 
                 //Logger.LogInformation($"Read Supplier");//供应商
                 //var SupplierReader = workerContext.ServiceProvider.GetRequiredService<SupplierReader>();

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScontrolWriter.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Volo.Abp.Uow;
 using Win_in.Sfs.Wms.DataExchange.Domain;
 using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp;
 using Win_in.Sfs.Wms.DataExchange.Domain.Shared;
@@ -25,11 +26,12 @@ public class ScontrolWriter : IWriter
     /// <returns></returns>
     public virtual async Task WriteAsync(List<OutgoingToExternal> outgoingDataList)
     {
-        var dataInterfaceList = new List<Scontrol>();
-        var dataInterfaceDetailList = new List<Scmsend>();
+
         var groups = outgoingDataList.GroupBy(r => r.SourceDataGroupCode);
         foreach (var group in groups)
         {
+            var dataInterfaceList = new List<Scontrol>();
+            var dataInterfaceDetailList = new List<Scmsend>();
             var entitys = group.ToList();
 
             foreach (var entity in entitys)

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WmsoutmWriter.cs

@@ -27,11 +27,11 @@ public class WmsoutmWriter : IWriter
     /// <returns></returns>
     public virtual async Task WriteAsync(List<OutgoingToExternal> outgoingDataList)
     {
-        var dataInterfaceList = new List<Wmsoutm>();
-        var dataInterfaceDetailList = new List<Wmsoutd>();
         var groups = outgoingDataList.GroupBy(r => r.SourceDataGroupCode);
         foreach (var group in groups)
         {
+            var dataInterfaceList = new List<Wmsoutm>();
+            var dataInterfaceDetailList = new List<Wmsoutd>();
             var entitys = group.ToList();
 
             foreach (var entity in entitys)

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/TyrpAgentModule.cs

@@ -173,7 +173,7 @@ public class TyrpAgentModule : AbpModule
     {
 
          context.AddBackgroundWorkerAsync<TyrpIncomingBackgroundWorker>();
-        //  context.AddBackgroundWorker<TyrpOutgoingBackgroundWorker>();
+          //context.AddBackgroundWorkerAsync<TyrpOutgoingBackgroundWorker>();
     }
 
 }

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

@@ -26,13 +26,13 @@
 
   "RemoteServices": {
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:59094/"
+      "BaseUrl": "http://dev.ccwin-in.com:21294/"
     },
     "Store": {
-      "BaseUrl": "http://dev.ccwin-in.com:59095/"
+      "BaseUrl": "http://dev.ccwin-in.com:21295/"
     },
     "Label": {
-      "BaseUrl": "http://dev.ccwin-in.com:59092/"
+      "BaseUrl": "http://dev.ccwin-in.com:21292/"
     },
     "Auth": {
       "BaseUrl": "http://dev.ccwin-in.com:21293/"

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs

@@ -150,6 +150,6 @@ public class AgentModule : AbpModule
              ApplicationInitializationContext context)
     {
         context.AddBackgroundWorkerAsync<IncomingToWmsWorker>();
-        //   context.AddBackgroundWorker<OutgoingFromWmsWorker>();
+      //  context.AddBackgroundWorkerAsync<OutgoingFromWmsWorker>();
     }
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain.Shared/Enums/EnumSystemType.cs

@@ -12,5 +12,6 @@ public enum EnumSystemType
     MES = 3,
     JIS = 4,
     QMS = 5,
+    EOS= 6,
 
 }