From c03895eaeb98be4777dc8a943d4c1132fa469ee9 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Wed, 31 May 2023 13:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AsnTimeWindowController.cs | 24 +++++++------ .../Controllers/PlanAndActualController.cs | 36 ++++++++++--------- .../Controllers/PurchaseReceiptController.cs | 2 +- .../SupplierAsns/SupplierAsnAppService.cs | 2 +- .../Notes/InspectNotes/InspectNoteManager.cs | 3 ++ 5 files changed, 38 insertions(+), 29 deletions(-) diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/AsnTimeWindowController.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/AsnTimeWindowController.cs index be8a7352b..02833dc6a 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/AsnTimeWindowController.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/AsnTimeWindowController.cs @@ -28,22 +28,22 @@ public class AsnTimeWindowController : AbpController } [HttpGet("asn-time-window")] - public virtual async Task> GetAsnTimeWindowsAsync() + public virtual async Task> GetAsnTimeWindowsAsync(string datetime) { - return await GetAsnTimeWindowDashboardsAsync(); + return await GetAsnTimeWindowDashboardsAsync(datetime).ConfigureAwait(false); } - private async Task> GetAsnTimeWindowDashboardsAsync() + private async Task> GetAsnTimeWindowDashboardsAsync(string datetime) { - var supplierAsns = await this.GetSupplierAsnsAsync(); + var supplierAsns = await this.GetSupplierAsnsAsync(datetime).ConfigureAwait(false); var supplierCodes = supplierAsns.Select(t => t.SupplierCode).Distinct(); - var suppliers = await GetSuppliersAsync(supplierCodes); + var suppliers = await GetSuppliersAsync(supplierCodes).ConfigureAwait(false); var asnNumbers = supplierAsns.Select(t => t.Number); - var purchaseReceiptNotes = await GetPurchaseReceiptNotesAsync(asnNumbers); + var purchaseReceiptNotes = await GetPurchaseReceiptNotesAsync(asnNumbers).ConfigureAwait(false); return this.ConvertToAsnTimeWindowDashboards( supplierAsns, @@ -96,9 +96,11 @@ public class AsnTimeWindowController : AbpController return dtos; } - private async Task> GetSupplierAsnsAsync() + private async Task> GetSupplierAsnsAsync(string datetime) { - var startTime = DateTime.Today.AddHours(DashboardConst.AsnReceiptTimeLimitHour); + var time = Convert.ToDateTime(datetime); + + var startTime = time.AddHours(DashboardConst.AsnReceiptTimeLimitHour); var endTime = startTime.AddDays(1).AddSeconds(-1); @@ -108,17 +110,17 @@ public class AsnTimeWindowController : AbpController endTime.AddDays(-1); } - return await this._supplierAsnApp.GetByStartTimeEndTimeAsync(startTime, endTime); + return await this._supplierAsnApp.GetByStartTimeEndTimeAsync(startTime, endTime).ConfigureAwait(false); } private async Task> GetSuppliersAsync(IEnumerable codes) { - return await this._supplierApp.GetByCodesAsync(codes); + return await this._supplierApp.GetByCodesAsync(codes).ConfigureAwait(false); } private async Task> GetPurchaseReceiptNotesAsync(IEnumerable asnNumbers) { - return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers); + return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers).ConfigureAwait(false); } /// diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PlanAndActualController.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PlanAndActualController.cs index 3c91b8ddf..8a057f785 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PlanAndActualController.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PlanAndActualController.cs @@ -43,31 +43,31 @@ namespace Win_in.Sfs.Wms.Dashboard.Host.Controllers [HttpGet("plan-actual-list")] public virtual async Task> GetPlanAndActualListAsync() { - return await GetPlanAndActualDashboardsAsync(); + return await GetPlanAndActualDashboardsAsync().ConfigureAwait(false); } private async Task> GetPlanAndActualDashboardsAsync() { - var supplierAsns = await this.GetSupplierAsnsAsync(); + var supplierAsns = await this.GetSupplierAsnsAsync().ConfigureAwait(false); var supplierCodes = supplierAsns.Select(t => t.SupplierCode).Distinct(); - var suppliers = await GetSuppliersAsync(supplierCodes); + var suppliers = await GetSuppliersAsync(supplierCodes).ConfigureAwait(false); var asnNumbers = supplierAsns.Select(t => t.Number); - var purchaseReceiptNotes = await GetPurchaseReceiptNotesAsync(asnNumbers); + var purchaseReceiptNotes = await GetPurchaseReceiptNotesAsync(asnNumbers).ConfigureAwait(false); - var putawayNotes = await this.GetPutawayNotesAsync(asnNumbers); + var putawayNotes = await this.GetPutawayNotesAsync(asnNumbers).ConfigureAwait(false); - var itemSafetyStorks = await this.GetItemSafetyStocksAsync(supplierAsns); + var itemSafetyStorks = await this.GetItemSafetyStocksAsync(supplierAsns).ConfigureAwait(false); return await this.ConvertToPlanAndActualDashboards( supplierAsns, suppliers, purchaseReceiptNotes, putawayNotes, - itemSafetyStorks); + itemSafetyStorks).ConfigureAwait(false); } private async Task> ConvertToPlanAndActualDashboards(List supplierAsns, List suppliers, List purchaseReceiptNotes, List putawayNotes, List itemSafetyStorks) @@ -114,8 +114,8 @@ namespace Win_in.Sfs.Wms.Dashboard.Host.Controllers dto.MinQty = itemSafetyStork.MinStock; } - var purchaseOrderDtos = await _purchaseOrderApp.GetListBySupplierCodeAsync(supplierAsn.SupplierCode, detail.ItemCode); - var supllierAsn = await _supplierAsnApp.GetForTodayListAsync(); + var purchaseOrderDtos = await _purchaseOrderApp.GetListBySupplierCodeAsync(supplierAsn.SupplierCode, detail.ItemCode).ConfigureAwait(false); + var supllierAsn = await _supplierAsnApp.GetForTodayListAsync().ConfigureAwait(false); var poNumberList = supllierAsn.Select(p => p.PoNumber).ToList(); purchaseOrderDtos = purchaseOrderDtos.Where(p => poNumberList.Contains(p.Number)).ToList(); @@ -142,7 +142,7 @@ namespace Win_in.Sfs.Wms.Dashboard.Host.Controllers dtos.Add(dto); } - var purchaseReceiptJobDtos = await _purchaseReceiptJobApp.GetListBySupplierCodeOnTodayAsync(supplierAsn.SupplierCode); + var purchaseReceiptJobDtos = await _purchaseReceiptJobApp.GetListBySupplierCodeOnTodayAsync(supplierAsn.SupplierCode).ConfigureAwait(false); dto.ReceiptNoteCount = purchaseReceiptJobDtos.Count(p => p.JobStatus == EnumJobStatus.Done); @@ -162,12 +162,16 @@ namespace Win_in.Sfs.Wms.Dashboard.Host.Controllers { return purchaseReceipts.Sum(t => t.Details.Count(t => t.ItemCode == itemCode)); } - + /// + /// 显示7天数据 + /// + /// private async Task> GetSupplierAsnsAsync() { - var startTime = DateTime.Today.AddHours(DashboardConst.AsnReceiptTimeLimitHour); + var startTime = DateTime.Today.AddDays(-6).AddHours(DashboardConst.AsnReceiptTimeLimitHour); + + var endTime = startTime.AddDays(7).AddSeconds(-1); - var endTime = startTime.AddDays(1).AddSeconds(-1); if (DateTime.Now.Hour < DashboardConst.AsnReceiptTimeLimitHour) { @@ -175,17 +179,17 @@ namespace Win_in.Sfs.Wms.Dashboard.Host.Controllers endTime.AddDays(-1); } - return await this._supplierAsnApp.GetByStartTimeEndTimeAsync(startTime, endTime); + return await this._supplierAsnApp.GetByStartTimeEndTimeAsync(startTime, endTime).ConfigureAwait(false); } private async Task> GetSuppliersAsync(IEnumerable codes) { - return await this._supplierApp.GetByCodesAsync(codes); + return await this._supplierApp.GetByCodesAsync(codes).ConfigureAwait(false); } private async Task> GetPurchaseReceiptNotesAsync(IEnumerable asnNumbers) { - return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers); + return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers).ConfigureAwait(false); } private async Task> GetPutawayNotesAsync(IEnumerable asnNumbers) diff --git a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PurchaseReceiptController.cs b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PurchaseReceiptController.cs index 6ecbf7f47..eba7ccf00 100644 --- a/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PurchaseReceiptController.cs +++ b/be/Hosts/Win_in.Sfs.Wms.Dashboard.Host/Controllers/PurchaseReceiptController.cs @@ -123,7 +123,7 @@ namespace Win_in.Sfs.Wms.Dashboard.Host.Controllers private async Task> GetPurchaseReceiptItemDashboardAsync() { var inspectNoteDetailDto = await _inspectNoteAppService.GetInspectNoteDetailByToDayTaskAsync(); - var packingCodeList = inspectNoteDetailDto.Where(p => p.Status == EnumInventoryStatus.OK).Select(p => p.PackingCode).ToList(); + var packingCodeList = inspectNoteDetailDto.Where(p => p.Status == EnumInventoryStatus.OK|| p.Status == EnumInventoryStatus.INSP).Select(p => p.PackingCode).ToList(); var balances = await _balanceApp.GetListByPackingCodesAsync(packingCodeList); balances = balances.Where(p => p.LocationCode == "INSPECT").ToList(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs index 1bf717949..75372d398 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/SupplierAsns/SupplierAsnAppService.cs @@ -390,7 +390,7 @@ public class SupplierAsnAppService : public virtual async Task> GetForTodayUnReceivedListAsync() { var entities = await _repository.GetListAsync( - p => p.PlanArriveDate == DateTime.Today + p => p.PlanArriveDate.Day == DateTime.Today.Day&& p.PlanArriveDate.Year == DateTime.Today.Year && p.PlanArriveDate.Month == DateTime.Today.Month && (p.Status != EnumSupplierAsnStatus.Received && p.Status != EnumSupplierAsnStatus.Cancelled), true).ConfigureAwait(false); return ObjectMapper.Map, List>(entities); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InspectNotes/InspectNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InspectNotes/InspectNoteManager.cs index 37e88d411..3b75b3c16 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InspectNotes/InspectNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InspectNotes/InspectNoteManager.cs @@ -16,6 +16,7 @@ public class InspectNoteManager : SfsStoreManagerBase CreateAsync(InspectNote entity) { entity.SummaryDetails.ForEach(p => p.SetIdAndNumber(GuidGenerator, entity.Id, entity.Number)); + entity.Details.ForEach(p => p.InspectDate = DateTime.Now); return await base.CreateAsync(entity).ConfigureAwait(false); } @@ -25,6 +26,7 @@ public class InspectNoteManager : SfsStoreManagerBase p.SetIdAndNumber(GuidGenerator, entity.Id, entity.Number)); + entity.Details.ForEach(p => p.InspectDate = DateTime.Now); } return await base.CreateManyAsync(entities).ConfigureAwait(false); @@ -51,6 +53,7 @@ public class InspectNoteManager : SfsStoreManagerBase p.InspectDate = DateTime.Now); inspectNote.Worker = entity.Worker; await Repository.UpdateAsync(entity).ConfigureAwait(false);