From fe4e1f97ca40fa3a88ab2e7e5e91eb191a3210b5 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 23 Oct 2024 11:27:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Jobs/JobController.cs | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) 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); } } From 3e25a969c330b08b299bea95d606bedd37ff26fd Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Wed, 23 Oct 2024 11:50:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnplannedIssueJobAppService.cs | 20 +++++++++---------- .../UnplannedReceiptJobAppService.cs | 18 ++++++++--------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs index b00b2c5e8..fb9a27201 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs @@ -360,10 +360,6 @@ public class UnplannedIssueJobAppService switch (locationDto.Type) { - case EnumLocationType.SEMI: - job.IsHasPackingCode = 0; - job.UnplannedIssueType = EnumUnplannedIssueType.Raw; - break; case EnumLocationType.CUST: job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; @@ -384,11 +380,7 @@ public class UnplannedIssueJobAppService job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Raw; break; - case EnumLocationType.DimensionalStorehouse: - job.UnplannedIssueType = EnumUnplannedIssueType.Raw; - job.IsHasPackingCode = 0; - break; - + //------------------ case EnumLocationType.KittingWip: job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; @@ -397,10 +389,16 @@ public class UnplannedIssueJobAppService job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; break; + case EnumLocationType.SEMI: + job.IsHasPackingCode = 0; + job.UnplannedIssueType = EnumUnplannedIssueType.Wip; + break; + case EnumLocationType.DimensionalStorehouse: + job.UnplannedIssueType = EnumUnplannedIssueType.Wip; + job.IsHasPackingCode = 0; + break; } - - job.ItemCode = requestDtoDetail.ItemCode; job.ItemName = requestDtoDetail.ItemName; job.ItemDesc1 = requestDtoDetail.ItemDesc1; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs index d00cb7589..0fd0d5e92 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs @@ -219,10 +219,6 @@ public class UnplannedReceiptJobAppService switch(locationDtos.First().Type) { - case EnumLocationType.SEMI: - job.IsHasPackingCode = 0; - job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; - break; case EnumLocationType.CUST: job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; @@ -243,11 +239,7 @@ public class UnplannedReceiptJobAppService job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; break; - case EnumLocationType.DimensionalStorehouse: - job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; - job.IsHasPackingCode = 0; - break; - + //-------------- case EnumLocationType.KittingWip: job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip; @@ -256,6 +248,14 @@ public class UnplannedReceiptJobAppService job.IsHasPackingCode = 0; job.UnplannedReceiptType = EnumUnplannedReceiptType.Wip; break; + case EnumLocationType.SEMI: + job.IsHasPackingCode = 0; + job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; + break; + case EnumLocationType.DimensionalStorehouse: + job.UnplannedReceiptType = EnumUnplannedReceiptType.Raw; + job.IsHasPackingCode = 0; + break; } jobs.Add(job);