From cd3478418ba32636fa946aa3d07b660d626ad2ca Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Mon, 18 Dec 2023 17:37:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E9=A2=86=E6=96=99?= =?UTF-8?q?=E3=80=81=E9=80=80=E6=96=99=E5=AF=BC=E5=85=A5=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Balances/BalanceAppService.cs | 2 +- .../DTOs/UnplannedIssueJobDetailDTO.cs | 8 +++++++- .../Inputs/UnplannedIssueJobDetailInput.cs | 8 +++++++- .../Inputs/UnplannedReceiptJobDetailInput.cs | 8 +++++++- .../DTOs/UnplannedIssueNoteDetailDTO.cs | 8 +++++++- .../Inputs/UnplannedIssueNoteDetailInput.cs | 8 +++++++- .../DTOs/UnplannedReceiptNoteDetailDTO.cs | 8 +++++++- .../Inputs/UnplannedReceiptNoteDetailInput.cs | 8 +++++++- .../Inputs/UnplannedReceiptNoteImportInput.cs | 8 +++++++- .../DTOs/UnplannedIssueRequestDetailDTO.cs | 8 +++++++- .../UnplannedIssueRequestDetailInput.cs | 8 +++++++- .../UnplannedIssueRequestImportInput.cs | 14 +++++++++---- .../DTOs/UnplannedReceiptRequestDetailDTO.cs | 8 +++++++- .../UnplannedReceiptRequestDetailInput.cs | 8 +++++++- .../UnplannedReceiptRequestImportInput.cs | 14 +++++++++---- ...nnedReceiptRequestForDongyangAppService.cs | 20 ++++++++++--------- .../UnplannedIssueJobDetail.cs | 8 +++++++- .../UnplannedReceiptJobDetail.cs | 9 ++++++++- .../UnplannedIssueNoteDetail.cs | 8 +++++++- .../UnplannedReceiptNoteDetail.cs | 8 +++++++- .../UnplannedIssueRequestDetail.cs | 8 +++++++- .../UnplannedReceiptRequestDetail.cs | 8 +++++++- 22 files changed, 159 insertions(+), 36 deletions(-) diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs index 71c7135e0..f8fe788b8 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs @@ -471,7 +471,7 @@ public class BalanceAppService /// /// [HttpGet("recommend-list-location")] - public virtual async Task> GetRecommendBalancesAsync(RecommendBalanceRequestInput input) + public virtual async Task> GetRecommendBalances2Async(RecommendBalanceRequestInput input) { var traceId = GuidGenerator.Create(); var itemCode = input.ItemCode; 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 d9db8f043..19f85514a 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 @@ -29,6 +29,12 @@ public class UnplannedIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase [Display(Name = "次交易码")] public string OnceBusiCode { get; set; } - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order =0)] public EnumUnplannedIssueType UnplannedIssueType { 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/UnplannedIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs index b54cfbf08..c19b71d85 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 @@ -36,6 +36,12 @@ public class UnplannedIssueJobDetailInput : SfsJobRecommendFromDetailInputBase, [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } } 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 29cbdfa2f..100cd4ffc 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 @@ -36,6 +36,12 @@ public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase, [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 415e97d28..710f86a6c 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 @@ -36,6 +36,12 @@ public class UnplannedIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithLotPac [Display(Name = "次交易码")] public string OnceBusiCode { get; set; } - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 b147e9be1..d5eaa7a20 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 @@ -38,6 +38,12 @@ public class UnplannedIssueNoteDetailInput : SfsStoreRecommendFromDetailWithLotP [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 1ea09b4c1..8ab8655aa 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 @@ -36,6 +36,12 @@ public class UnplannedReceiptNoteDetailDTO : SfsStoreRecommendToDetailWithLotPac [Display(Name = "次交易码")] public string OnceBusiCode { get; set; } - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 c196ccd4a..d843a0e27 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 @@ -36,6 +36,12 @@ public class UnplannedReceiptNoteDetailInput : SfsStoreRecommendToDetailWithLotP [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs index 538b1128d..9e58e0306 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs @@ -11,6 +11,12 @@ public class UnplannedReceiptNoteImportInput : SfsStoreImportInputBase [Display(Name = "计划外入库请求单号")] public string UnplannedReceiptRequestNumber { get; set; } - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 09d92493a..d73836987 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 @@ -32,6 +32,12 @@ public class UnplannedIssueRequestDetailDTO [Display(Name = "次交易码")] public string OnceBusiCode { get; set; } - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 40886da0a..4cc8014f1 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 @@ -30,6 +30,12 @@ public class UnplannedIssueRequestDetailInput : SfsStoreDetailWithLotPackingQtyL [Display(Name = "次交易码")] public string OnceBusiCode { get; set; } - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs index 7f25f9ece..4bab771e3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs @@ -9,6 +9,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase , IHasQty { + [Display(Name = "领料类别", Order = 0)] + public EnumUnplannedIssueType UnplannedIssueType { get; set; } + /// /// 物品代码 /// @@ -75,9 +78,12 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase /// /// 说明 /// - [Display(Name = "说明")] - public string Remark { get; set; } + //[Display(Name = "说明2")] + //public string Remark { get; set; } - [Display(Name = "领料类别")] - public EnumUnplannedIssueType UnplannedIssueType { get; set; } + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 a5d50e3bc..d9478de1a 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 @@ -38,6 +38,12 @@ public class UnplannedReceiptRequestDetailDTO [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { set; get; } - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 24218f835..355b86ba7 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 @@ -30,6 +30,12 @@ public class UnplannedReceiptRequestDetailInput : SfsStoreDetailWithLotPackingQt [Display(Name = "扩展属性")] public ExtraPropertyDictionary ExtraProperties { set; get; } = new ExtraPropertyDictionary(); - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs index d3f264eb0..8e30d0c69 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs @@ -9,6 +9,9 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase , IHasQty { + [Display(Name = "退料类别", Order = 0)] + public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + /// /// 物料号 /// @@ -75,9 +78,12 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase /// /// 说明 /// - [Display(Name = "说明")] - public string Remark { get; set; } + //[Display(Name = "说明2")] + //public string Remark { get; set; } - [Display(Name = "退料类别")] - public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs index c3306faa3..04f60d71a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs @@ -30,13 +30,13 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ public UnplannedReceiptRequestForDongyangAppService(IUnplannedReceiptRequestRepository repository, IUnplannedReceiptRequestManager unplannedReceiptRequestManager, IDepartmentAppService departmentApp, - LocationManager locationManager, + //LocationManager locationManager, ILocationAppService locationAppService ) : base(repository, unplannedReceiptRequestManager) { _unplannedReceiptRequestManager = unplannedReceiptRequestManager; _departmentApp = departmentApp; - _locationManager = locationManager; + //_locationManager = locationManager; _locationAppService = locationAppService; } @@ -191,17 +191,19 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ private async Task SetEntityPropertiesAsync(UnplannedReceiptRequest entity) { var userName = CurrentUser.GetUserName(); + if (userName != null) + { + var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false); - var department = await _departmentApp.GetByUsernameAsync(userName).ConfigureAwait(false); + if (department != null) + { + entity.DeptCode = department.Code; + entity.DeptName = department.Name; + } - if (department != null) - { - entity.DeptCode = department.Code; - entity.DeptName = department.Name; + entity.Worker = userName; } - entity.Worker = userName; - entity.BuildDate = DateTime.Now; await SetRequestAutoPropertiesAsync(entity).ConfigureAwait(false); 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 526a5e86b..a44f36655 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 @@ -34,6 +34,12 @@ public class UnplannedIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHas /// public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 cb069b37d..e056ad333 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 @@ -35,6 +35,13 @@ public class UnplannedReceiptJobDetail : SfsJobRecommendToDetailEntityBase, IHas /// public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order =0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 3b10285f9..b467cb413 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 @@ -34,6 +34,12 @@ public class UnplannedIssueNoteDetail : SfsStoreRecommendFromDetailWithLotPackin /// public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order = 0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 e3b560d80..8d9b1564b 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 @@ -34,6 +34,12 @@ public class UnplannedReceiptNoteDetail : SfsStoreRecommendToDetailWithLotPackin /// public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order = 0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 5eec8c01f..967c41d98 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 @@ -33,7 +33,13 @@ public class UnplannedIssueRequestDetail : SfsStoreDetailWithLotPackingQtyLocati /// public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "领料类别")] + [Display(Name = "领料类别", Order =0)] public EnumUnplannedIssueType UnplannedIssueType { get; set; } + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { 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 6bd03b175..79f460529 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 @@ -37,7 +37,13 @@ public class UnplannedReceiptRequestDetail : SfsStoreDetailWithLotPackingQtyLoca /// public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary(); - [Display(Name = "退料类别")] + [Display(Name = "退料类别", Order =0)] public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } + /// + /// 说明 + /// + [Display(Name = "说明")] + public string Explain { get; set; } + } From 0cd7e24c34554c01f2bc478417ba62af9bd42d9d Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Tue, 19 Dec 2023 09:08:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=99=E7=BC=B4=E5=BA=93=20=E5=81=9A?= =?UTF-8?q?=E6=8B=86=E5=88=86=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Balances/BalanceAppService.cs | 46 +++++++++---------- .../ProductReceiptNoteEventHandler.cs | 21 +++++++-- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs index 71c7135e0..2c3675cc8 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs @@ -464,29 +464,29 @@ public class BalanceAppService return dtos; } - /// - /// 根据发料任务需求，算出推荐的库存 (在获取时 已经添加预占用) - /// - /// - /// - /// - [HttpGet("recommend-list-location")] - public virtual async Task> GetRecommendBalancesAsync(RecommendBalanceRequestInput input) - { - var traceId = GuidGenerator.Create(); - var itemCode = input.ItemCode; - var qty = input.Qty; - var locationTypes = input.LocationTypes; - var locationAreas = input.LocationAreas; - var statuses = input.Statuses; - Logger.LogDebug(traceId + "|Input:" + input); - - var balances = await _balanceManager.GetRecommendBalancesAsync(traceId, itemCode, qty, locationTypes, locationAreas, statuses).ConfigureAwait(false); - - var dtos = ObjectMapper.Map, List>(balances); - - return dtos; - } + ///// + ///// 根据发料任务需求，算出推荐的库存 (在获取时 已经添加预占用) + ///// + ///// + ///// + ///// + //[HttpGet("recommend-list-location")] + //public virtual async Task> GetRecommendBalancesListAsync(RecommendBalanceRequestInput input) + //{ + // var traceId = GuidGenerator.Create(); + // var itemCode = input.ItemCode; + // var qty = input.Qty; + // var locationTypes = input.LocationTypes; + // var locationAreas = input.LocationAreas; + // var statuses = input.Statuses; + // Logger.LogDebug(traceId + "|Input:" + input); + + // var balances = await _balanceManager.GetRecommendBalancesAsync(traceId, itemCode, qty, locationTypes, locationAreas, statuses).ConfigureAwait(false); + + // var dtos = ObjectMapper.Map, List>(balances); + + // return dtos; + //} /// /// pda发料执行查询使用 diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs index c20a43160..42f9e65fe 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs @@ -1,7 +1,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Castle.Components.DictionaryAdapter; using Volo.Abp.EventBus; +using Volo.Abp.ObjectMapping; using Volo.Abp.Uow; using Win_in.Sfs.Shared.Event; using Win_in.Sfs.Wms.Store.Application.Contracts; @@ -32,12 +34,25 @@ public class ProductReceiptNoteEventHandler protected override async Task AddExchangeDataAsync(List entities) { - var dtos = ObjectMapper.Map, List>(entities); - foreach (var detail in dtos.SelectMany(dto => dto.Details)) + var result = new List(); + + foreach (var entity in entities) + { + foreach (var detail in entity.Details) + { + var dto = ObjectMapper.Map(entity); + var detailDto = ObjectMapper.Map(detail); + dto.Details = new EditableList{ detailDto }; + result.Add(dto); + } + } + + foreach (var detail in result.SelectMany(dto => dto.Details)) { await detail.TrySetLocationAsync(LocationAclService, detail.LocationCode).ConfigureAwait(false); } - var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false); + + var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, result).ConfigureAwait(false); await AddManyAsync(exchangeData).ConfigureAwait(false); }