diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs index 1e427b46f..ca48b804d 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs @@ -39,6 +39,8 @@ public class JobController : AbpController private readonly IAssembleIssueJobAppService _assembleIssueJobAppService; private readonly IKittingIssueJobAppService _kittingIssueJobAppService; private readonly ISparePartIssueJobAppService _sparePartIssueJobAppService; + private readonly IUnplannedIssueJobAppService _unplannedIssueJobAppService; + private readonly IUnplannedReceiptJobAppService _unplannedReceiptJobAppService; /// /// @@ -70,7 +72,9 @@ public class JobController : AbpController ICoatingIssueJobAppService coatingIssueJobAppService, IAssembleIssueJobAppService assembleIssueJobAppService, IKittingIssueJobAppService kittingIssueJobAppService, - ISparePartIssueJobAppService sparePartIssueJobAppService) + ISparePartIssueJobAppService sparePartIssueJobAppService, + IUnplannedIssueJobAppService unplannedIssueJobAppService, + IUnplannedReceiptJobAppService unplannedReceiptJobAppService) { _userWorkGroupAppService = userWorkGroupAppService; _countJobAppService = countJobAppService; @@ -90,6 +94,8 @@ public class JobController : AbpController _assembleIssueJobAppService = assembleIssueJobAppService; _kittingIssueJobAppService = kittingIssueJobAppService; _sparePartIssueJobAppService = sparePartIssueJobAppService; + _unplannedIssueJobAppService = unplannedIssueJobAppService; + _unplannedReceiptJobAppService = unplannedReceiptJobAppService; } /// @@ -348,6 +354,36 @@ public class JobController : AbpController } }).ConfigureAwait(false); list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob }); + + //非生产领料 + var unplannedIssueJobAppService = await _unplannedIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase + { + Condition = new Condition + { + Filters = new List + { + new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"), + new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In") + } + } + }).ConfigureAwait(false); + list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob }); + + //非生产退料 + var unplannedreceiptJobAppService = await _unplannedReceiptJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase + { + Condition = new Condition + { + Filters = new List + { + new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"), + new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In") + } + } + }).ConfigureAwait(false); + list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob }); + + return new ListResultDto(list); } }