From accc00bfa270a511cd880a7876d0e4d6adb02c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=B8=A4=E6=97=AD=5BIrelia=5D?= <366601522@qq.com> Date: Fri, 21 Apr 2023 00:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=EF=BC=8E=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A=201.=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99?= =?UTF-8?q?=E2=80=94=E5=8F=91=E6=96=99=EF=BC=8C=E7=89=A9=E6=96=99=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=B0=8F=E4=BA=8E=E7=AD=89=E4=BA=8E=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=8D=B3=E5=8F=AF=E3=80=82=EF=BC=88=E5=B7=B2=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=89=202.=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=EF=BC=8C=E5=BE=85=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E8=A1=A5=E5=85=85=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E4=B8=8D=E7=94=9F=E6=88=90=E5=8F=91?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=EF=BC=9A=E7=8E=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=A0=94=E5=8F=91=E6=AD=A3=E5=9C=A8?= =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E4=BA=8C=EF=BC=9A=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9A=201.=E5=82=A8=E4=BD=8D=E5=86=85?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E3=80=81=E5=82=A8=E4=BD=8D=E9=97=B4=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=92=8C=E5=AE=A2=E6=88=B7=E5=82=A8=E4=BD=8D=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=9C=A8=E7=B3=BB=E7=BB=9F=E9=83=A8=E7=BD=B2=E5=90=8E?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=BC=BA=E5=A4=B1=EF=BC=8C=E7=AD=89?= =?UTF-8?q?=E5=BE=85=E5=87=A0=E5=88=86=E9=92=9F=E5=90=8E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=AD=A3=E5=B8=B8=EF=BC=8C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E4=B8=AD=EF=BC=88=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BC=93=E5=AD=98=EF=BC=89=202.=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BC=96=E8=BE=91=EF=BC=8C=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=88=E5=B7=B2=E8=A7=A3=E5=86=B3=EF=BC=89=203.=E9=9D=9E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E3=80=81=E9=9D=9E=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=80=80=E6=96=99=E3=80=81=E4=B8=93=E6=A1=88=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B8=A6=E5=87=BA=20(=E5=B7=B2=E8=A7=A3=E5=86=B3)=204?= =?UTF-8?q?.=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E8=A1=A8=E6=97=A0=E6=95=B0=E6=8D=AE(=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3)=205.=E7=9B=98=E7=82=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=EF=BC=8C=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=8F=AA=E5=AF=BC=E5=87=BA=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=98=8E=E7=BB=86=20?= =?UTF-8?q?=EF=BC=88=E5=8E=9F=E6=89=80=E6=9C=89=E5=AF=BC=E5=87=BA=E9=83=BD?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=20=E6=98=8E=E7=BB=86=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=89=206.=E5=9B=9E=E6=94=B6=E6=96=99?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=8A=A5=E9=94=99=20=EF=BC=88=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SfsCrudWithDetailsAppServiceBase.cs | 8 +++-- .../DTOs/UnplannedIssueJobDetailDTO.cs | 18 +++++++++++ .../Inputs/UnplannedIssueJobDetailInput.cs | 18 +++++++++++ .../DTOs/UnplannedReceiptJobDetailDTO.cs | 32 +++++++++++++++++++ .../Inputs/UnplannedReceiptJobDetailInput.cs | 18 +++++++++++ .../DTOs/UnplannedIssueNoteDetailDTO.cs | 18 +++++++++++ .../Inputs/UnplannedIssueNoteDetailInput.cs | 18 +++++++++++ .../DTOs/UnplannedReceiptNoteDetailDTO.cs | 18 +++++++++++ .../Inputs/UnplannedReceiptNoteDetailInput.cs | 18 +++++++++++ .../DTOs/UnplannedIssueRequestDetailDTO.cs | 18 +++++++++++ .../UnplannedIssueRequestDetailInput.cs | 18 +++++++++++ .../DTOs/UnplannedReceiptRequestDetailDTO.cs | 24 ++++++++++++++ .../UnplannedReceiptRequestDetailInput.cs | 18 +++++++++++ .../UnplannedIssueJobDetail.cs | 19 +++++++++++ .../UnplannedReceiptJobDetail.cs | 19 +++++++++++ .../UnplannedIssueNoteDetail.cs | 19 +++++++++++ .../UnplannedReceiptNoteDetail.cs | 19 +++++++++++ .../UnplannedIssueRequestDetail.cs | 19 +++++++++++ .../UnplannedReceiptRequestDetail.cs | 24 ++++++++++++++ .../Jobs/ProductionReturnJobEventHandler.cs | 2 ++ 20 files changed, 363 insertions(+), 2 deletions(-) diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs index 600523dce..fd6654cd6 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs @@ -159,8 +159,12 @@ public abstract class SfsCrudWithDetailsAppServiceBase, List>(entities); - var hasDetails = typeof(TEntity) is SfsMasterAggregateRootBase detailEntity; - return ExportImportService.Export(list, detailsProptyName: hasDetails ? nameof(detailEntity.Details) : null); + + //var hasDetails = typeof(TEntity) is SfsMasterAggregateRootBase detailEntity; + var tt = typeof(TEntity).GetBaseClasses(typeof(SfsMasterAggregateRootBase)); + var hasDetails = tt.Length > 0 ? true : false; + + return ExportImportService.Export(list,detailsProptyName: hasDetails ? nameof(TDetail) : null); } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs index 1d656fd2c..b42d6f039 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs @@ -10,4 +10,22 @@ public class UnplannedIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase [Display(Name = "原因代码")] public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs index 9aa5b26de..a0523ab5c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs @@ -11,6 +11,24 @@ public class UnplannedIssueJobDetailInput : SfsJobRecommendFromDetailInputBase, [Display(Name = "原因代码")] public string ReasonCode { get; set; } + //// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs index 8e729e1a6..916479a0f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs @@ -1,6 +1,38 @@ +using DocumentFormat.OpenXml.Wordprocessing; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.Data; + namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class UnplannedReceiptJobDetailDTO : SfsJobRecommendToDetailDTOBase { + /// + /// 原因代码 + /// + [Display(Name = "原因代码")] + public string ReasonCode { get; set; } + + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// + /// 扩展属性 + /// + [Display(Name = "扩展属性")] + public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs index b42869a3f..a3ea7b3e3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs @@ -11,6 +11,24 @@ public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase, [Display(Name = "原因代码")] public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs index f93ca2d14..efa949974 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs @@ -17,4 +17,22 @@ public class UnplannedIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithLotPac [Display(Name = "原因代码")] public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs index 8f3179cb4..923365b36 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs @@ -13,6 +13,24 @@ public class UnplannedIssueNoteDetailInput : SfsStoreRecommendFromDetailWithLotP [Display(Name = "原因代码")] public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs index ea74d4e34..dbedb405b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs @@ -16,4 +16,22 @@ public class UnplannedReceiptNoteDetailDTO : SfsStoreRecommendToDetailWithLotPac /// [Display(Name = "原因代码")] public string ReasonCode { get; set; } + + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs index c03b2db03..327e6af54 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs @@ -11,6 +11,24 @@ public class UnplannedReceiptNoteDetailInput : SfsStoreRecommendToDetailWithLotP [Display(Name = "原因代码")] public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs index 129aef93c..d5ecf445f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs @@ -12,4 +12,22 @@ public class UnplannedIssueRequestDetailDTO /// [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { set; get; } = new ExtraPropertyDictionary(); + + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs index c5f9138bf..d052b41b3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs @@ -10,4 +10,22 @@ public class UnplannedIssueRequestDetailInput : SfsStoreDetailWithLotPackingQtyL /// [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); + + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs index aa67eb319..3bedef9ee 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs @@ -7,6 +7,30 @@ public class UnplannedReceiptRequestDetailDTO : SfsStoreDetailWithLotPackingQtyLocationStatusDTOBase , IHasExtraProperties { + /// + /// 原因代码 + /// + [Display(Name = "原因代码")] + public string ReasonCode { get; set; } + + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs index 4d527adfd..bf59628f8 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs @@ -5,6 +5,24 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class UnplannedReceiptRequestDetailInput : SfsStoreDetailWithLotPackingQtyLocationInputBase, IHasExtraProperties { + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs index 5b1623f9d..bb548a9b7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs @@ -1,3 +1,4 @@ +using System.ComponentModel.DataAnnotations; using Volo.Abp.Data; namespace Win_in.Sfs.Wms.Store.Domain; @@ -9,6 +10,24 @@ public class UnplannedIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHas /// public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs index a2ba8a699..9d1b62089 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs @@ -1,3 +1,4 @@ +using System.ComponentModel.DataAnnotations; using Volo.Abp.Data; namespace Win_in.Sfs.Wms.Store.Domain; @@ -10,6 +11,24 @@ public class UnplannedReceiptJobDetail : SfsJobRecommendToDetailEntityBase, IHas /// public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs index 8f575b250..ef461133a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs @@ -1,3 +1,4 @@ +using System.ComponentModel.DataAnnotations; using Volo.Abp.Data; namespace Win_in.Sfs.Wms.Store.Domain; @@ -9,6 +10,24 @@ public class UnplannedIssueNoteDetail : SfsStoreRecommendFromDetailWithLotPackin /// public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs index 138e792de..eb0c1b067 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs @@ -1,3 +1,4 @@ +using System.ComponentModel.DataAnnotations; using Volo.Abp.Data; namespace Win_in.Sfs.Wms.Store.Domain; @@ -9,6 +10,24 @@ public class UnplannedReceiptNoteDetail : SfsStoreRecommendToDetailWithLotPackin /// public string ReasonCode { get; set; } + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs index 2d597734a..a98da6f81 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs @@ -1,3 +1,4 @@ +using System.ComponentModel.DataAnnotations; using Volo.Abp.Data; namespace Win_in.Sfs.Wms.Store.Domain; @@ -8,6 +9,24 @@ namespace Win_in.Sfs.Wms.Store.Domain; public class UnplannedIssueRequestDetail : SfsStoreDetailWithLotPackingQtyLocationStatusEntityBase , IHasExtraProperties { + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs index ec68fc967..1ac70ec54 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs @@ -1,3 +1,4 @@ +using System.ComponentModel.DataAnnotations; using Volo.Abp.Data; namespace Win_in.Sfs.Wms.Store.Domain; @@ -7,6 +8,29 @@ namespace Win_in.Sfs.Wms.Store.Domain; /// public class UnplannedReceiptRequestDetail : SfsStoreDetailWithLotPackingQtyLocationStatusEntityBase, IHasExtraProperties { + /// + /// 原因代码 + /// + public string ReasonCode { get; set; } + + /// + /// 专案 + /// + [Display(Name = "专案")] + public string CaseCode { get; set; } + + /// + /// 项目分类 + /// + [Display(Name = "项目分类")] + public string ProjCapacityCode { get; set; } + + /// + /// 次交易码 + /// + [Display(Name = "次交易码")] + public string OnceBusiCode { get; set; } + /// /// 扩展属性 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ProductionReturnJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ProductionReturnJobEventHandler.cs index b8ac3da2a..4690c9f2d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ProductionReturnJobEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ProductionReturnJobEventHandler.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -59,6 +60,7 @@ public class ProductionReturnJobEventHandler : { var input = ObjectMapper.Map(entity); + input.ReturnTime=DateTime.Now; input.Details = new List(); foreach (var detail in entity.Details.Where(detail => detail.HandledQty != 0))