diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs index 669b5fe60..ae78b9886 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedIssueNoteConverter.cs @@ -50,16 +50,16 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); - var departmentCode = department == null ? "" : department.Code; - if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) - { - var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); - if (!string.IsNullOrEmpty(username)) - { - exchangeReceipt.Worker = username; - } - } + //var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); + //var departmentCode = department == null ? "" : department.Code; + //if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) + //{ + // var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); + // if (!string.IsNullOrEmpty(username)) + // { + // exchangeReceipt.Worker = username; + // } + //} var purchaseOrder = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs index dd16aed33..5b15bd310 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/UnplannedReceiptNoteConverter.cs @@ -51,17 +51,17 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); - var departmentCode = department == null ? "" : department.Code; - if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) - { - var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); - if (!string.IsNullOrEmpty(username)) - { - exchangeReceipt.Worker = username; - } - } - var purchaseOrder = BuildDataInterface(exchangeReceipt, departmentCode); + //var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); + //var departmentCode = department == null ? "" : department.Code; + //if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) + //{ + // var username = await _sfsUserAppService.GetUserNameById(guid).ConfigureAwait(false); + // if (!string.IsNullOrEmpty(username)) + // { + // exchangeReceipt.Worker = username; + // } + //} + var purchaseOrder = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(), @@ -118,7 +118,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string departmentCode) + private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder) { var ret = new Wmsoutm() diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs index 506fbad1a..81c317550 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/BackFlushNotes/BackFlushNoteAppService.cs @@ -54,12 +54,17 @@ public class BackFlushNoteAppService : /// 处理数据 /// /// - private async Task> ProcessingBackFlushNoteDataAsync(List backFlushNotes) + private async Task> ProcessingBackFlushNoteData(List backFlushNotes) { if (backFlushNotes != null && backFlushNotes.Count > 0) { + // 主零件号 var itemCodes = backFlushNotes.Select(t => t.ItemCode); - var itemBasicDtos = await _itemBasicAppService.GetByCodesAsync(itemCodes).ConfigureAwait(false); + // 从零件号 + var detailsItemCodes = backFlushNotes.SelectMany(t => t.Details).Select(t => t.ItemCode); + itemCodes = itemCodes.Concat(detailsItemCodes).Distinct(); + + List itemBasicDtos = await _itemBasicAppService.GetByCodesAsync(itemCodes).ConfigureAwait(false); backFlushNotes.ForEach(t => { @@ -70,8 +75,12 @@ public class BackFlushNoteAppService : t.ItemDesc2 = itemBasicDto.Desc2; t.Details.ForEach(tDetail => { - tDetail.ItemDesc1 = itemBasicDto.Desc1; - tDetail.ItemDesc2 = itemBasicDto.Desc2; + var detailsItemBasicDto = itemBasicDtos.FirstOrDefault(w => w.Code == tDetail.ItemCode); + if (detailsItemBasicDto != null) + { + tDetail.ItemDesc1 = detailsItemBasicDto.Desc1; + tDetail.ItemDesc2 = detailsItemBasicDto.Desc2; + } }); } });