From 0ec5c7f90309e639f1001fa4287b3fdee4d25c86 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 17 Jul 2024 14:35:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3=E7=A0=81=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E8=BF=87=EF=BC=8C=202.=20=E8=A7=A3=E5=86=B3=20=E6=9C=AA?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=20=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BA=BA=EF=BC=9B=20=E8=B4=A8=E6=A3=80=E5=AE=8C?= =?UTF-8?q?=E6=88=90=20=E6=98=BE=E7=A4=BA=E6=A3=80=E9=AA=8C=E4=BA=BA=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreHttpApiHostModule.cs | 2 +- .../BaseDatas/SplitPackingRecController.cs | 3 +-- .../Inputs/SplitPackingRecEditInput.cs | 4 ++-- .../SplitPackings/SplitPackingRecManager.cs | 18 +++++++++++------ .../InventoryLabelAppService.cs | 2 +- .../Jobs/InspectJobs/InspectJobAppService.cs | 20 +++++++++---------- .../TransferNotes/TransferNoteAppService.cs | 2 +- .../Jobs/InspectJobs/InspectJobManager.cs | 8 ++++++-- .../PurchaseReceiptRequestEventHandler.cs | 7 +++++++ 9 files changed, 41 insertions(+), 25 deletions(-) diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs index 787bcc4a1..261e5b3b4 100644 --- a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs +++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/StoreHttpApiHostModule.cs @@ -102,7 +102,7 @@ public class StoreHttpApiHostModule : ModuleBase { ServiceConfigurationContext.Services.AddHttpClient("Label", (HttpClient client) => { - client.Timeout = TimeSpan.FromSeconds(180); + client.Timeout = TimeSpan.FromSeconds(300); }); ServiceConfigurationContext.Services.AddHttpClientProxies( diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs index 7f9d343b1..b2d9850d6 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/BaseDatas/SplitPackingRecController.cs @@ -66,7 +66,7 @@ public class SplitPackingRecController : AbpController } [HttpPost("batch-insert-test")] - public async Task BatchInsertTestAsync(List inputs, int recordCount) + public async Task BatchInsertTestAsync(List inputs, int recordCount, int pageSize = 50) { Stopwatch sw = new Stopwatch(); sw.Start(); @@ -79,7 +79,6 @@ public class SplitPackingRecController : AbpController } //分页 - int pageSize = 50; int pageTotal = PageHelper.GetTotalPages(operLst.Count, pageSize); for (int i = 1; i <= pageTotal; i++) { diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs index 2b2b079ee..8c6d4242d 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs @@ -137,8 +137,8 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 供应商代码 /// - [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] - public string PurchaseInfo_SupplierCode { get; set; } + //[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")] + //public string PurchaseInfo_SupplierCode { get; set; } /// /// 到货通知 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs index 97fb007fe..c636e43a2 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs @@ -46,12 +46,18 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager } #endregion //缓存数据 - var query = await _repository.GetQueryableAsync().ConfigureAwait(false); - var fromPackCodeLst = input.Select(itm => itm.FromPackingCode).ToList(); - var toPackCodeLst = input.Select(itm => itm.ToPackingCode).ToList(); - var historyLst = await query.Where(itm => fromPackCodeLst.Contains(itm.ToPackingCode) && (itm.OprType == OprTypeEnum.SplitBox || itm.OprType == OprTypeEnum.MergeBox)).ToListAsync().ConfigureAwait(false); //取顶级箱码时用到 - var hisLst2 = await query.Where(itm => fromPackCodeLst.Contains(itm.FromPackingCode)).ToListAsync().ConfigureAwait(false); - Dictionary hisLst3 = await query.Where(itm => toPackCodeLst.Contains(itm.FromPackingCode) && itm.OprType == OprTypeEnum.Other).ToDictionaryAsync(itm => itm.FromPackingCode, it2 => it2).ConfigureAwait(false); + List historyLst = new List(); + List hisLst2 = new List(); + Dictionary hisLst3 = new Dictionary(); + if (input.Any(itm => itm.OprType == OprTypeEnum.SplitBox || itm.OprType == OprTypeEnum.MergeBox)) + { + var query = await _repository.GetQueryableAsync().ConfigureAwait(false); + var fromPackCodeLst = input.Select(itm => itm.FromPackingCode).ToList(); + var toPackCodeLst = input.Select(itm => itm.ToPackingCode).ToList(); + historyLst = await query.Where(itm => fromPackCodeLst.Contains(itm.ToPackingCode) && (itm.OprType == OprTypeEnum.SplitBox || itm.OprType == OprTypeEnum.MergeBox)).ToListAsync().ConfigureAwait(false); //取顶级箱码时用到 + hisLst2 = await query.Where(itm => fromPackCodeLst.Contains(itm.FromPackingCode)).ToListAsync().ConfigureAwait(false); + hisLst3 = await query.Where(itm => toPackCodeLst.Contains(itm.FromPackingCode) && itm.OprType == OprTypeEnum.Other).ToDictionaryAsync(itm => itm.FromPackingCode, it2 => it2).ConfigureAwait(false); + } //遍历、批量插入 List operLst = new List(); diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs index db2f45689..d2098cd56 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs +++ b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs @@ -190,7 +190,7 @@ public class InventoryLabelAppService packRec.ToLot = inputObj.Lot; packRec.PurchaseInfo_PoNumber = inputObj.PoNumber; // 采购订单 packRec.PurchaseInfo_AsnNumber = inputObj.AsnNumber; //供应商发货单 - packRec.PurchaseInfo_SupplierCode = inputObj.SupplierCode; //供应商发货单 + //packRec.PurchaseInfo_SupplierCode = inputObj.SupplierCode; //供应商发货单 packRec.ArrivalNoticNumber = null; //到货通知 packRec.TaskOrderNumber = null; //任务单 packRec.ReceiptRecNumber = null; //收货记录单 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs index 5df4a8596..d98040ce0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/InspectJobs/InspectJobAppService.cs @@ -43,16 +43,16 @@ public class InspectJobAppService { var entity = ObjectMapper.Map(input); - if (_currentUser != null) - { - foreach (var item in entity.SummaryDetails) - { - if (item.InspectUser.IsNullOrEmpty()) - { - item.InspectUser = _currentUser.UserName; - } - } - } + //if (_currentUser != null) + //{ + // foreach (var item in entity.SummaryDetails) + // { + // if (item.InspectUser.IsNullOrEmpty()) + // { + // item.InspectUser = _currentUser.UserName; + // } + // } + //} var result = await _inspectJobManager.AddAsync(entity).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 154c3813b..9788188ed 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -474,7 +474,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase { packRec.PurchaseInfo_PoNumber = inventoryLabelDto.PoNumber; packRec.PurchaseInfo_AsnNumber = inventoryLabelDto.AsnNumber; - packRec.PurchaseInfo_SupplierCode = inventoryLabelDto.SupplierCode; + //packRec.PurchaseInfo_SupplierCode = inventoryLabelDto.SupplierCode; #region InventoryLabel兼容成员 var inputObj = inventoryLabelDto; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InspectJobs/InspectJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InspectJobs/InspectJobManager.cs index 2c3081d5b..8fa5d5f80 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InspectJobs/InspectJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/InspectJobs/InspectJobManager.cs @@ -158,8 +158,8 @@ public class InspectJobManager : SfsJobManagerBase //获取 汇总详情 var summaryDetailEntity = jobEntity.SummaryDetails.Find(p => p.Id == summaryDetailId); - var itemQuality = - await _itemQualityAclService.GetByItemCodeAsync(summaryDetailEntity.ItemCode, jobEntity.SupplierCode); + var itemQuality = await _itemQualityAclService.GetByItemCodeAsync(summaryDetailEntity.ItemCode, jobEntity.SupplierCode).ConfigureAwait(false); + if (itemQuality.InspectType != EnumInspectType.Exempt) { //获取质检标准 @@ -175,6 +175,10 @@ public class InspectJobManager : SfsJobManagerBase //构造 汇总详情 await BuildInspectJobSummaryDetailAsync(input, summaryDetailEntity).ConfigureAwait(false); + if (summaryDetailEntity.InspectUser.IsNullOrEmpty()) + { + summaryDetailEntity.InspectUser = currentUser.UserName; //lyt at 2024-07-17 未质检 不显示检验人； 质检完成 显示检验人 + } //判断 汇总详情是否全部执行完毕 if (jobEntity.SummaryDetails.All(p => p.SummaryInspectStatus != EnumSummaryInspectStatus.NotInspect)) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/PurchaseReceiptRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/PurchaseReceiptRequestEventHandler.cs index b2d0d8dbd..bdd0c4a7a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/PurchaseReceiptRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/PurchaseReceiptRequestEventHandler.cs @@ -67,6 +67,13 @@ public class PurchaseReceiptRequestEventHandler private async Task CreatePurchaseReceiptJob(PurchaseReceiptRequest purchaseReceiptRequest) { var createInput = await BuildPurchaseReceiptJobCreateInputAsync(purchaseReceiptRequest).ConfigureAwait(false); + foreach (var item in createInput) + { + if (string.IsNullOrEmpty(item.Worker)) + { + item.Worker = "admin!"; + } + } await _purchaseReceiptJobAppService.CreateManyAsync(createInput).ConfigureAwait(false); }