看板修改

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<List<AsnTimeWindowDashboardDto>> GetAsnTimeWindowsAsync()
+    public virtual async Task<List<AsnTimeWindowDashboardDto>> GetAsnTimeWindowsAsync(string datetime)
     {
-        return await GetAsnTimeWindowDashboardsAsync();
+        return await GetAsnTimeWindowDashboardsAsync(datetime).ConfigureAwait(false);
     }
 
-    private async Task<List<AsnTimeWindowDashboardDto>> GetAsnTimeWindowDashboardsAsync()
+    private async Task<List<AsnTimeWindowDashboardDto>> 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<List<SupplierAsnDTO>> GetSupplierAsnsAsync()
+    private async Task<List<SupplierAsnDTO>> 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<List<SupplierDTO>> GetSuppliersAsync(IEnumerable<string> codes)
     {
-        return await this._supplierApp.GetByCodesAsync(codes);
+        return await this._supplierApp.GetByCodesAsync(codes).ConfigureAwait(false);
     }
 
     private async Task<List<PurchaseReceiptNoteDTO>> GetPurchaseReceiptNotesAsync(IEnumerable<string> asnNumbers)
     {
-        return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers);
+        return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers).ConfigureAwait(false);
     }
 
     /// <summary>

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<List<PlanAndActualDashboardDto>> GetPlanAndActualListAsync()
         {
-            return await GetPlanAndActualDashboardsAsync();
+            return await GetPlanAndActualDashboardsAsync().ConfigureAwait(false);
         }
 
         private async Task<List<PlanAndActualDashboardDto>> 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<List<PlanAndActualDashboardDto>> ConvertToPlanAndActualDashboards(List<SupplierAsnDTO> supplierAsns, List<SupplierDTO> suppliers, List<PurchaseReceiptNoteDTO> purchaseReceiptNotes, List<PutawayNoteDTO> putawayNotes, List<ItemSafetyStockDTO> 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));
         }
-
+        /// <summary>
+        /// 显示7天数据
+        /// </summary>
+        /// <returns></returns>
         private async Task<List<SupplierAsnDTO>> 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<List<SupplierDTO>> GetSuppliersAsync(IEnumerable<string> codes)
         {
-            return await this._supplierApp.GetByCodesAsync(codes);
+            return await this._supplierApp.GetByCodesAsync(codes).ConfigureAwait(false);
         }
 
         private async Task<List<PurchaseReceiptNoteDTO>> GetPurchaseReceiptNotesAsync(IEnumerable<string> asnNumbers)
         {
-            return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers);
+            return await this._purchaseReceiptNoteApp.GetListByAsnNumbers(asnNumbers).ConfigureAwait(false);
         }
 
         private async Task<List<PutawayNoteDTO>> GetPutawayNotesAsync(IEnumerable<string> asnNumbers)

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<List<PurchaseReceiptItemDashboardDto>> 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();
 

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<List<SupplierAsnDTO>> 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<SupplierAsn>, List<SupplierAsnDTO>>(entities);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/InspectNotes/InspectNoteManager.cs

@@ -16,6 +16,7 @@ public class InspectNoteManager : SfsStoreManagerBase<InspectNote, InspectNoteDe
     public override async Task<InspectNote> 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<InspectNote, InspectNoteDe
         foreach (var entity in entities)
         {
             entity.SummaryDetails.ForEach(p => 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<InspectNote, InspectNoteDe
         var inspectNote = new InspectNote();
         inspectNote.SetId(entity.Id);
         inspectNote.Details.AddRange(details);
+        details.ForEach(p => p.InspectDate = DateTime.Now);
         inspectNote.Worker = entity.Worker;
 
         await Repository.UpdateAsync(entity).ConfigureAwait(false);