From 7fcf72f290f6c2a296390a10f4ee101fe070af88 Mon Sep 17 00:00:00 2001 From: "mingliang.tang" Date: Mon, 24 Apr 2023 18:59:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/MesIncomingBackgroundWorker.cs | 30 +++++++-------- .../AgentModule.cs | 2 +- .../IncomingToWmsWorker.cs | 38 +++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs index a4ba1f8e1..ea848c915 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs @@ -49,14 +49,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false); ////转换PullTask //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false); - Logger.LogInformation($"Read Scrap"); + //Logger.LogInformation($"Read Scrap"); - var scrapReader = workerContext.ServiceProvider.GetRequiredService(); - var scrapConverter = workerContext.ServiceProvider.GetRequiredService(); - //读取并保存Scrap - var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); - //转换Scrap - await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); + //var scrapReader = workerContext.ServiceProvider.GetRequiredService(); + //var scrapConverter = workerContext.ServiceProvider.GetRequiredService(); + ////读取并保存Scrap + //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); + ////转换Scrap + //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); //Logger.LogInformation($"Read Issue"); //var pckHandleService = workerContext.ServiceProvider.GetRequiredService(); @@ -66,14 +66,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase ////转换Pck //await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false); - Logger.LogInformation($"Read BackFlush");//耗用单 - var BackFlushReader = workerContext.ServiceProvider.GetRequiredService(); - var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService(); - //读取并保存BackFlush - var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); - //转换BackFlush - await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); - Logger.LogInformation($"Completed: Handling {Incoming}"); + //Logger.LogInformation($"Read BackFlush");//耗用单 + //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService(); + //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService(); + ////读取并保存BackFlush + //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); + ////转换BackFlush + //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); + //Logger.LogInformation($"Completed: Handling {Incoming}"); } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs index 3b5a3402e..31b6599f3 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs @@ -150,6 +150,6 @@ public class AgentModule : AbpModule ApplicationInitializationContext context) { context.AddBackgroundWorkerAsync(); - //context.AddBackgroundWorkerAsync(); + context.AddBackgroundWorkerAsync(); } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs index 6af3c0f18..9fc4f4695 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs @@ -79,67 +79,67 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase switch (dataType) { case EnumIncomingDataType.Department: - //await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleDepartmentsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.User: - //await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleUsersAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Item: - //await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleItemsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Location: - /* await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false)*/; + await incomingToWms.HandleErpLocationsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Bom: await incomingToWms.HandleBomsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Dict: - //await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleDictsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Supplier: - //await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleSuppliersAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.SupplierItem: - //await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleSupplierItemsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.ItemPack: - //await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleItemPacksAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Customer: - //await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleCustomersAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.CustomerItem: - //await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleCustomerItemsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.InterfaceCalendar: - //await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleInterfaceCalendarsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.PurchaseOrder: - //await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandlePurchaseOrdersAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.SaleOrder: - //await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleSaleOrdersAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.SupplierAsn: - //await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleAsnsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.ProductReceipt: await incomingToWms.HandleProductReceiptsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.MaterialRequest: - //await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleMaterialRequestsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.Scrap: - //await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleScrapsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.IssueConfirm: - //await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleIssueNoteConfirmAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.PurchaseLabel: - //await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleInventoryLabelsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.BackFlush: - //await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false); + await incomingToWms.HandleBackFlushsAsync(workerContext).ConfigureAwait(false); break; case EnumIncomingDataType.None: default: From a4031011f1937e2d86fbe5a3141408ba20b7c5c1 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 25 Apr 2023 13:20:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/DictConverter.cs | 2 +- .../WMS/ItemBasic/ItemBasicExchangeDto.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs index 0499c7eae..b1db11002 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictConverter.cs @@ -46,7 +46,7 @@ public class DictConverter : IIncomingConverter var materialRequestList = await BuildIncomingToWmsOfDictRequestAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateBulkAsync(materialRequestList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } private async Task> BuildIncomingToWmsOfDictRequestAsync(List incomingDataList) diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs index 4183180f5..f2bf0a16c 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemBasic/ItemBasicExchangeDto.cs @@ -68,6 +68,12 @@ public class ItemBasicExchangeDto [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] public string AbcClass { get; set; } + /// + /// 管理类型 + /// + [Display(Name = "管理类型")] + public EnumItemManageType ManageType { get; set; } = EnumItemManageType.Batch; + public override bool Equals(object obj) { if (obj is ItemBasicExchangeDto) From 3fa3242c61413f147b356a63be068e5daeb3c92a Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Tue, 25 Apr 2023 16:06:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/CustomerConverter.cs | 2 +- .../Incoming/DepartmentConverter.cs | 2 +- .../Incoming/InterfaceCalendarConverter.cs | 2 +- .../Incoming/ItemBasicReader.cs | 34 +++++++++++++++---- .../Incoming/SupplierConverter.cs | 2 +- .../Incoming/UserConverter.cs | 2 +- ...Wms.DataExchange.Application.Contracts.xml | 5 +++ 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs index bed551158..c3fcacf5e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/CustomerConverter.cs @@ -45,7 +45,7 @@ public class CustomerConverter : IIncomingConverter var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } private async Task> BuildIncomingToWmsOfPurchaseOrderAsync(List incomingDataList) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs index 364680786..12f17ef42 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DepartmentConverter.cs @@ -41,7 +41,7 @@ IIncomingFromExternalManager incomingFromExternalManager) var materialRequestList = await BuildIncomingToWmsOfDepartmentRequestAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } private async Task> BuildIncomingToWmsOfDepartmentRequestAsync(List incomingDataList) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs index d1e99dbf7..39a99f83b 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/InterfaceCalendarConverter.cs @@ -41,7 +41,7 @@ public class InterfaceCalendarConverter : IIncomingConverter var materialRequestList = await BuildIncomingToWmsOfInterfaceCalendarRequestAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } private async Task> BuildIncomingToWmsOfInterfaceCalendarRequestAsync(List incomingDataList) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs index e44c358d5..9cfadb08d 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/ItemBasicReader.cs @@ -109,23 +109,43 @@ public class ItemBasicReader : IReader private static ItemBasicExchangeDto BuildItemBasicToExchangeDto(mes_product product) { + string type = ""; + switch (product.mes_product_code) + { + case "10C01": + type = "成品"; + break; + case "10C02": + type = "成品"; + break; + case "10C03": + type = "物料"; + break; + case "10C04": + type = "半成品"; + break; + default: + type = "无"; + break; + } + var itemBasicRequest = new ItemBasicExchangeDto() { Code = product.mes_product_part, - Name = product.mes_product_desc, + Name = product.mes_product_part_ser, Desc1 = product.mes_product_desc, - // Desc2=product.mes_product_fih_factory, + //Desc2=product.mes_product_fih_factory,//目前没有这个字段 Status = product.mes_product_active == "Y" ? EnumItemStatus.Active : EnumItemStatus.Disable, #region 制造类别 //其中100404 托外-不带原料 、 10405 托外-带原料、10407客户提供料件没有对应字段 - CanMake = product.mes_product_mfg == "10401" ? false : true, //10401 自制 - CanBuy = product.mes_product_mfg == "10403" ? false : true, //10403 采购 - CanOutsourcing = product.mes_product_mfg == "10402" ? false : true,//10402 外包 - IsRecycled = product.mes_product_mfg == "10406" ? false : true, //10406 回收 + CanMake = product.mes_product_mfg == "10401" ? true : false, //10401 自制 + CanBuy = product.mes_product_mfg == "10403" ? true : false, //10403 采购 + CanOutsourcing = product.mes_product_mfg == "10402" ? true : false,//10402 外包 + IsRecycled = product.mes_product_mfg == "10406" ? true : false, //10406 回收 #endregion - Type = product.mes_product_code,//10C01成品、10C02原料、10C03物料、10C04半成品 + Type = type,//10C01成品、10C02原料、10C03物料、10C04半成品 Configuration = product.mes_product_spec, BasicUom = product.mes_product_unit, AbcClass = "", diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs index 59155ccd0..0e4e261ba 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/SupplierConverter.cs @@ -43,7 +43,7 @@ public class SupplierConverter : IIncomingConverter var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateBulkAsync(incomingToWmsDataList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } private async Task> BuildIncomingToWmsOfPurchaseOrderAsync(List incomingDataList) { diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs index 281e72901..175321a4f 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/UserConverter.cs @@ -39,7 +39,7 @@ public class UserConverter : IIncomingConverter var materialRequestList = await BuildIncomingToWmsOfIdentityUserRequestAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateManyAsync(materialRequestList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } private async Task> BuildIncomingToWmsOfIdentityUserRequestAsync(List incomingDataList) diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index e4bc696cb..38ca0c85c 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -661,6 +661,11 @@ 回收件 + + + 管理类型 + + 供应商编号 From c7985c163fded14a1c7c88d46d2fcd4c3c63f5d4 Mon Sep 17 00:00:00 2001 From: "mingliang.tang" Date: Tue, 25 Apr 2023 16:20:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/BackFluConverter.cs | 2 +- .../Incoming/MesIncomingBackgroundWorker.cs | 30 +++++++++---------- ...Wms.DataExchange.Application.Contracts.xml | 5 ++++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs index e7102b08a..602b3f018 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs @@ -50,7 +50,7 @@ public class BackFluConverter : IIncomingConverter var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false); await _incomingToWmsManager.CreateManyAsync(incomingToWmsDataList).ConfigureAwait(false); //归档 - await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false); + await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false); } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs index ea848c915..a4ba1f8e1 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs @@ -49,14 +49,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false); ////转换PullTask //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"Read Scrap"); + Logger.LogInformation($"Read Scrap"); - //var scrapReader = workerContext.ServiceProvider.GetRequiredService(); - //var scrapConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存Scrap - //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); - ////转换Scrap - //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); + var scrapReader = workerContext.ServiceProvider.GetRequiredService(); + var scrapConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存Scrap + var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); + //转换Scrap + await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); //Logger.LogInformation($"Read Issue"); //var pckHandleService = workerContext.ServiceProvider.GetRequiredService(); @@ -66,14 +66,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase ////转换Pck //await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"Read BackFlush");//耗用单 - //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService(); - //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存BackFlush - //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); - ////转换BackFlush - //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"Completed: Handling {Incoming}"); + Logger.LogInformation($"Read BackFlush");//耗用单 + var BackFlushReader = workerContext.ServiceProvider.GetRequiredService(); + var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存BackFlush + var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); + //转换BackFlush + await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); + Logger.LogInformation($"Completed: Handling {Incoming}"); } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index e4bc696cb..38ca0c85c 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -661,6 +661,11 @@ 回收件 + + + 管理类型 + + 供应商编号