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 c8048c8aa..611b882b4 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 @@ -57,4 +57,48 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase public List FacDetails { set; get; } + /// + /// ERP料号 + /// + [Display(Name = "ERP料号")] + public string ItemCode { get; set; } + + /// + /// 物品名称 + /// + [Display(Name = "物品名称")] + public string ItemName { get; set; } + + /// + /// 物品描述1 + /// + [Display(Name = "物品描述1")] + public string ItemDesc1 { get; set; } + + /// + /// 物品描述2 + /// + [Display(Name = "物品描述2")] + public string ItemDesc2 { get; set; } + + /// + /// ERP储位 + /// + [Display(Name = "ERP储位")] + public string FromErpLocationCode { get; set; } + + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { get; set; } + + public bool IsHasPackingCode { 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 2c8ae9454..5b04e77c6 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 @@ -76,4 +76,51 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr public string OANumber { get; set; } + /// + /// ERP料号 + /// + [Display(Name = "ERP料号")] + public string ItemCode { get; set; } + + /// + /// 物品名称 + /// + [Display(Name = "物品名称")] + public string ItemName { get; set; } + + /// + /// 物品描述1 + /// + [Display(Name = "物品描述1")] + public string ItemDesc1 { get; set; } + + /// + /// 物品描述2 + /// + [Display(Name = "物品描述2")] + public string ItemDesc2 { get; set; } + + /// + /// ERP储位 + /// + [Display(Name = "ERP储位")] + public string FromErpLocationCode { get; set; } + + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { get; set; } + + public bool IsHasPackingCode { get; set; } + + + + + + + + + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs index 8c555e4ee..73d43692d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs @@ -6,6 +6,8 @@ using Win_in.Sfs.Wms.Store.Domain; namespace Win_in.Sfs.Wms.Store.Event; +using DocumentFormat.OpenXml.Wordprocessing; +using System.ComponentModel.DataAnnotations; using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Wms.Inventory.Application.Contracts; @@ -33,6 +35,27 @@ public partial class StoreEventAutoMapperProfile : Profile .Ignore(x => x.CompleteTime) .Ignore(x => x.UpStreamJobNumber) + + +.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.CompleteUserId) + .Ignore(x => x.CompleteUserName) + .Ignore(x => x.CompleteTime) + .Ignore(x => x.UpStreamJobNumber) + + + .BeforeMap((notice, input) => input.JobType = EnumJobType.UnplannedIssueJob) .BeforeMap((notice, input) => input.JobStatus = EnumJobStatus.Open) .BeforeMap((notice, input) => input.IsAutoComplete = false) @@ -61,7 +84,7 @@ 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.ItemName); CreateMap() .Ignore(x => x.ReasonCode)