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, 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..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; } /// @@ -40,6 +39,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..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; } /// @@ -40,6 +39,7 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase /// 专案 /// [Display(Name = "专案")] + [Required(ErrorMessage = "专案不能为空")] public string CaseCode { 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); + } }