From 80d1536b0ae830ce6c5b40f6e54ac31e0cd51a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 24 Oct 2024 17:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTOs/UnplannedIssueJobDTO.cs | 24 +++++++++++++ .../Inputs/UnplannedIssueJobEditInput.cs | 29 +++++++++++++++ .../UnplannedIssueJobAppService.cs | 11 +++--- .../UnplannedIssueJobs/UnplannedIssueJob.cs | 25 +++++++++++++ .../UnplannedIssueJobManager.cs | 36 ++++++++++--------- .../UnplannedIssueRequestAutoMapperProfile.cs | 28 ++++++++------- .../UnplannedIssueRequestEventHandler.cs | 2 +- 7 files changed, 122 insertions(+), 33 deletions(-) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs index 14f2a3b44..69fd52c4a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs @@ -98,6 +98,30 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } + diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs index 95422baf0..36b9f80f5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs @@ -119,6 +119,35 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } + + + + + + 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 994c6b8ea..348c067c3 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 @@ -6,6 +6,7 @@ using System.Reflection; using System.Threading.Tasks; using Castle.Components.DictionaryAdapter; using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml.Wordprocessing; using Irony; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -415,6 +416,12 @@ public class UnplannedIssueJobAppService job.FacDetails = new List(); job.WarehouseCode = balanceDtoGroup.First().WarehouseCode; job.BuildDate = DateTime.Now; + job.Explain = requestDtoDetail.Explain; + + job.CaseCode = requestDtoDetail.CaseCode; + job.ProjCapacityCode = requestDtoDetail.ProjCapacityCode; + job.OnceBusiCode = requestDtoDetail.OnceBusiCode; + job.Explain = requestDtoDetail.Explain; foreach (var balanceDto in balanceDtoGroup) { @@ -516,7 +523,6 @@ public class UnplannedIssueJobAppService job.UnplannedIssueType = EnumUnplannedIssueType.Raw; job.IsHasPackingCode = 0; break; - case EnumLocationType.KittingWip: job.IsHasPackingCode = 0; job.UnplannedIssueType = EnumUnplannedIssueType.Wip; @@ -526,9 +532,6 @@ public class UnplannedIssueJobAppService job.UnplannedIssueType = EnumUnplannedIssueType.Wip; 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.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs index 855417686..b8ac6a8d2 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs @@ -63,6 +63,31 @@ public class UnplannedIssueJob : SfsJobAggregateRootBase + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } + /// /// ERP料号 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs index 285e49c05..e1758f2f6 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs @@ -20,13 +20,15 @@ namespace Win_in.Sfs.Wms.Store.Domain; public class UnplannedIssueJobManager : SfsJobManagerBase, IUnplannedIssueJobManager { private readonly IBalanceRepository _balanceRepository; + private readonly IUnplannedIssueRequestRepository _requestRepository; public UnplannedIssueJobManager( IBalanceRepository balanceRepository, - - IUnplannedIssueJobRepository repository + IUnplannedIssueJobRepository repository, + IUnplannedIssueRequestRepository requestRepository ) : base(repository) { _balanceRepository = balanceRepository; + _requestRepository = requestRepository; } @@ -46,21 +48,23 @@ public class UnplannedIssueJobManager : SfsJobManagerBase p.Number == input.UnplannedIssueRequestNumber).w; + //request - - - - var first= entity.FacDetails.FirstOrDefault(); + //var first= entity.FacDetails.FirstOrDefault(); if (input.UnplannedIssueType == EnumUnplannedIssueType.Raw) { foreach (var detail in input.Details) { detail.SetIdAndNumber(GuidGenerator, input.Id, input.Number); - detail.ReasonCode = first.ReasonCode; - detail.CaseCode = first.CaseCode; - detail.ProjCapacityCode = first.ProjCapacityCode; - detail.OnceBusiCode = first.OnceBusiCode; - detail.Explain = first.Explain; + + detail.CaseCode = input.CaseCode; + detail.ProjCapacityCode = input.ProjCapacityCode; + detail.OnceBusiCode = input.OnceBusiCode; + detail.Explain = input.Explain; detail.Status = EnumInventoryStatus.OK; entity.AddDetail(detail); //发料子任务 赋值实际转移 @@ -71,11 +75,11 @@ public class UnplannedIssueJobManager : SfsJobManagerBase x.ItemCode ) -.Ignore(x => x.ItemName ) -.Ignore(x => x.ItemDesc1 ) -.Ignore(x => x.ItemDesc2 ) -.Ignore(x => x.FromErpLocationCode ) -.Ignore(x => x.Qty ) -.Ignore(x => x.IsHasPackingCode ) - + .Ignore(x => x.ItemCode) + .Ignore(x => x.ItemName) + .Ignore(x => x.ItemDesc1) + .Ignore(x => x.ItemDesc2) + .Ignore(x => x.FromErpLocationCode) + .Ignore(x => x.Qty) + .Ignore(x => x.IsHasPackingCode) + .Ignore(x => x.CaseCode) + .Ignore(x => x.ProjCapacityCode) + .Ignore(x => x.CaseCode) + .Ignore(x => x.OnceBusiCode) + .Ignore(x => x.Explain) @@ -85,10 +89,10 @@ public partial class StoreEventAutoMapperProfile : Profile CreateMap() .ForMember(x => x.UnplannedIssueRequestNumber, y => y.MapFrom(d => d.Number)).Ignore(x => x.JobNumber) .Ignore(x => x.ItemCode) - .Ignore(x=>x.ItemDesc1) - .Ignore(x=>x.ItemDesc2).Ignore(x=>x.Qty) - .Ignore(x=>x.FromErpLocationCode) - .Ignore(x=>x.ReasonCode) + .Ignore(x => x.ItemDesc1) + .Ignore(x => x.ItemDesc2).Ignore(x => x.Qty) + .Ignore(x => x.FromErpLocationCode) + .Ignore(x => x.ReasonCode) .Ignore(x => x.CaseCode) .Ignore(x => x.ProjCapacityCode) .Ignore(x => x.OnceBusiCode) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs index f6f1dd887..aca027384 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs @@ -188,7 +188,7 @@ public class UnplannedIssueRequestEventHandler var createInput = ObjectMapper.Map(entity); - + createInput.UnplannedIssueRequestNumber = entity.Number; createInput.JobType = EnumJobType.UnplannedIssueJob;