From 13aefe58b00c9c1424c0b0ecc2eb3dc1d6aeb7ec Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Mon, 8 Jan 2024 16:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=20OA=E5=8D=95=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs | 7 +++++++ .../Inputs/UnplannedIssueJobEditInput.cs | 7 +++++++ .../UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs | 7 +++++++ .../Inputs/UnplannedReceiptJobEditInput.cs | 5 +++++ .../UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs | 6 ++++++ .../Inputs/UnplannedIssueNoteEditInput.cs | 6 ++++++ .../UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs | 6 ++++++ .../Inputs/UnplannedReceiptNoteEditInput.cs | 5 +++++ .../DTOs/UnplannedIssueRequestDTO.cs | 6 ++++++ .../Inputs/UnplannedIssueRequestEditInput.cs | 7 +++++++ .../DTOs/UnplannedReceiptRequestDTO.cs | 5 +++++ .../Inputs/UnplannedReceiptRequestEditInput.cs | 5 +++++ .../Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs | 5 +++++ .../Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs | 6 +++++- .../Notes/UnplannedIssueNotes/UnplannedIssueNote.cs | 6 ++++++ .../Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs | 5 +++++ .../UnplannedIssueRequests/UnplannedIssueRequest.cs | 6 ++++++ .../UnplannedReceiptRequests/UnplannedReceiptRequest.cs | 5 +++++ 18 files changed, 104 insertions(+), 1 deletion(-) 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 cdd1ab6d1..5eaedb099 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 @@ -41,4 +41,11 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string OANumber { 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 bedfcd59d..2c8ae9454 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 @@ -69,4 +69,11 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } + + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs index 90dd1aa68..ae7d5bcd4 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs @@ -20,4 +20,11 @@ public class UnplannedReceiptJobDTO : SfsJobDTOBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string OANumber { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs index 84efb5a48..bed75f30f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs @@ -69,4 +69,9 @@ public class UnplannedReceiptJobEditInput : SfsJobCreateUpdateInputBase, ISfsJob [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs index 2282ed6b8..523a3e3c0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs @@ -39,5 +39,11 @@ public class UnplannedIssueNoteDTO : SfsStoreDTOBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string OANumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs index b07d84487..a30f1c684 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs @@ -61,4 +61,10 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs index 0bcd85dec..89aec1ca7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs @@ -38,4 +38,10 @@ public class UnplannedReceiptNoteDTO : SfsStoreDTOBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")] + public string OANumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs index f5d150cba..58f8fb00d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs @@ -61,4 +61,9 @@ public class UnplannedReceiptNoteEditInput : SfsStoreCreateOrUpdateInputBase [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs index 093d7f25f..6abc9919d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs @@ -32,4 +32,10 @@ public class UnplannedIssueRequestDTO : SfsStoreRequestDTOBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs index ece29f4db..b4b108ba5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs @@ -47,4 +47,11 @@ public class UnplannedIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInput public EnumUnplannedIssueType UnplannedIssueType { get; set; } #endregion + + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs index dff2acbb0..789393fcc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs @@ -34,4 +34,9 @@ public class UnplannedReceiptRequestDTO : SfsStoreRequestDTOBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs index 40d406bd4..67248ea22 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs @@ -47,4 +47,9 @@ public class UnplannedReceiptRequestEditInput : SfsStoreRequestCreateOrUpdateInp [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + /// + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } } 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 c02cff434..7090ef78a 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 @@ -41,6 +41,11 @@ public class UnplannedIssueJob : SfsJobAggregateRootBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } /// /// 任务明细 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs index f98769499..1f0ca641d 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs @@ -41,7 +41,11 @@ public class UnplannedReceiptJob : SfsJobAggregateRootBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } /// /// 任务明细 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs index 2a1214fa3..f0e663527 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs @@ -49,4 +49,10 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs index ddabb31c6..d7761e1f3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs @@ -49,4 +49,9 @@ public class UnplannedReceiptNote : SfsStoreAggregateRootBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs index 5eea5540b..34ff08816 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs @@ -38,4 +38,10 @@ public class UnplannedIssueRequest : SfsStoreRequestAggregateRootBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs index 5e84c25f0..bf4165e32 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs @@ -38,4 +38,9 @@ public class UnplannedReceiptRequest : SfsStoreRequestAggregateRootBase + /// OA单据号 + /// + [Display(Name = "OA单据号")] + public string OANumber { get; set; } }