From b6ad10118d699c9c9a49e840bbfa849e284c829b Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Mon, 13 Nov 2023 11:26:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E9=9D=9E=E7=94=9F=E4=BA=A7=20=E9=A2=86?= =?UTF-8?q?=E9=80=80=E6=96=99=20=E4=B8=93=E6=A1=88=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inputs/UnplannedIssueRequestImportInput.cs | 1 + .../Inputs/UnplannedReceiptRequestImportInput.cs | 1 + 2 files changed, 2 insertions(+) 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 e67f0815d..191244e7f 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 @@ -40,6 +40,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase /// 专案 /// [Display(Name = "专案")] + [Required(ErrorMessage = "专案不能为空")] public string CaseCode { 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 a43fc3327..0606a3fab 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 @@ -40,6 +40,7 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase /// 专案 /// [Display(Name = "专案")] + [Required(ErrorMessage = "专案不能为空")] public string CaseCode { get; set; } /// From 2b890b9e04237e4dc2f190f8d4da104de8cba1dd Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Mon, 13 Nov 2023 14:05:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=A4=96=E5=87=BA=E5=85=A5=E5=BA=93=20=E7=9A=84=20=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnplannedIssueRequestImportInput.cs | 1 - .../UnplannedReceiptRequestImportInput.cs | 1 - .../UnplannedIssueRequestManager.cs | 34 +++++++++++++++++-- .../UnplannedReceiptRequestManager.cs | 33 ++++++++++++++++-- 4 files changed, 61 insertions(+), 8 deletions(-) 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 191244e7f..deac6ee7e 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 @@ -26,7 +26,6 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase /// 单位 /// [Display(Name = "单位")] - [Required(ErrorMessage = "单位不能为空")] public string Uom { 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 0606a3fab..9e3a51eb0 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 @@ -26,7 +26,6 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase /// 单位 /// [Display(Name = "单位")] - [Required(ErrorMessage = "单位不能为空")] public string Uom { get; set; } /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs index a79624a1d..a789ae41a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestManager.cs @@ -1,20 +1,26 @@ using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; +using Volo.Abp; +using Win_in.Sfs.Basedata.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Domain; public class UnplannedIssueRequestManager : SfsStoreRequestManagerBase, IUnplannedIssueRequestManager { - public readonly IUnplannedIssueRequestRepository _repository; + private readonly IUnplannedIssueRequestRepository _repository; + private readonly IDictAppService _dictAppService; + private readonly IItemBasicAppService _itemBasicAppService; //public readonly _repository; //public readonly IUnplannedIssueRequestRepository _repository; public UnplannedIssueRequestManager( - IUnplannedIssueRequestRepository repository - ) : base(repository) + IUnplannedIssueRequestRepository repository, IDictAppService dictAppService, IItemBasicAppService itemBasicAppService) : base(repository) { _repository = repository; + _dictAppService = dictAppService; + _itemBasicAppService = itemBasicAppService; } /// @@ -29,4 +35,26 @@ public class UnplannedIssueRequestManager : SfsStoreRequestManagerBase> CreateManyAsync(List entities) + { + var dictDto = await _dictAppService.GetByCodeAsync("CaseCode").ConfigureAwait(false); + + foreach (var entity in entities) + { + foreach (var unplannedIssueRequestDetail in entity.Details) + { + var flag = dictDto.Items.ToList().FirstOrDefault(p => p.Value == unplannedIssueRequestDetail.CaseCode); + if (flag == null) + { + throw new UserFriendlyException($"【{unplannedIssueRequestDetail.CaseCode}】专案不存在"); + } + + var itemBasicDto= await _itemBasicAppService.GetByCodeAsync(unplannedIssueRequestDetail.ItemCode).ConfigureAwait(false); + unplannedIssueRequestDetail.Uom = itemBasicDto.BasicUom; + } + } + + return await base.CreateManyAsync(entities).ConfigureAwait(false); + } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs index 83d8b2fe3..3904b6435 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestManager.cs @@ -1,20 +1,26 @@ using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; +using Volo.Abp; +using Win_in.Sfs.Basedata.Application.Contracts; namespace Win_in.Sfs.Wms.Store.Domain; public class UnplannedReceiptRequestManager : SfsStoreRequestManagerBase, IUnplannedReceiptRequestManager { - public readonly IUnplannedReceiptRequestRepository _repository; + private readonly IUnplannedReceiptRequestRepository _repository; + private readonly IDictAppService _dictAppService; + private readonly IItemBasicAppService _itemBasicAppService; //public readonly _repository; //public readonly IUnplannedReceiptRequestRepository _repository; public UnplannedReceiptRequestManager( - IUnplannedReceiptRequestRepository repository - ) : base(repository) + IUnplannedReceiptRequestRepository repository, IDictAppService dictAppService, IItemBasicAppService itemBasicAppService) : base(repository) { _repository = repository; + _dictAppService = dictAppService; + _itemBasicAppService = itemBasicAppService; } /// @@ -30,4 +36,25 @@ public class UnplannedReceiptRequestManager : SfsStoreRequestManagerBase> CreateManyAsync(List entities) + { + var dictDto= await _dictAppService.GetByCodeAsync("CaseCode").ConfigureAwait(false); + + foreach (var entity in entities) + { + foreach (var unplannedReceiptRequestDetail in entity.Details) + { + var flag= dictDto.Items.ToList().FirstOrDefault(p => p.Value == unplannedReceiptRequestDetail.CaseCode); + if (flag == null) + { + throw new UserFriendlyException($"【{unplannedReceiptRequestDetail.CaseCode}】专案不存在"); + } + + var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(unplannedReceiptRequestDetail.ItemCode).ConfigureAwait(false); + unplannedReceiptRequestDetail.Uom = itemBasicDto.BasicUom; + } + } + + return await base.CreateManyAsync(entities).ConfigureAwait(false); + } } From d9b2c56586874cba08da4e195211613331545575 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 13 Nov 2023 15:59:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?tyrp=20=E5=90=8C=E6=AD=A5=E4=B8=93=E6=A1=88?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/MesOutReader.cs | 2 +- .../Incoming/DictpjReader.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs index def88e103..fa48675c9 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs @@ -111,7 +111,7 @@ public class MesOutReader : IReader DataAction = EnumExchangeDataAction.Add, SourceSystem = EnumSystemType.MES.ToString(), SourceDataId = mesOut.Mesout_ref_nbr.ToString(), - SourceDataGroupCode = mesOut.Mesout_ref_nbr.ToString(), + SourceDataGroupCode = mesOut.Mesout_loc.ToString(), SourceDataDetailCode = mesOut.Mesout_part, SourceDataContent = JsonSerializer.Serialize(mesOut), WriteTime = DateTime.Now, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictpjReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictpjReader.cs index 9065f9ee2..517547bf0 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictpjReader.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/DictpjReader.cs @@ -83,8 +83,8 @@ public class DictpjReader : IReader DataType = EnumIncomingDataType.Dict.ToString(), DataAction = EnumExchangeDataAction.Add, SourceSystem = EnumSystemType.ERP.ToString(), - SourceDataId = dict.pjtmout_desc, - SourceDataGroupCode = dict.pjtmout_id, + SourceDataId = dict.pjtmout_id, + SourceDataGroupCode = EnumDictType.CaseCode.ToString(), SourceDataDetailCode = dict.pjtmout_desc, SourceDataContent = JsonSerializer.Serialize(dict), WriteTime = DateTime.Now,