From 5f615f412edd7218a145231f74f69597c3fc9c5b Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Fri, 6 Dec 2024 16:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=204036=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E4=B8=BA=E8=B4=9F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/UnplannedReceiptNoteConverter.cs | 7 +++++++ .../UnplannedReceiptNoteEventHandler.cs | 13 +++---------- 2 files changed, 10 insertions(+), 10 deletions(-) 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 fd286e5dd..123e75cfd 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 @@ -96,6 +96,7 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService DestinationSystem = EnumSystemType.ERP.ToString(), DestinationDataId = "", }; + outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceipt); outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrder); @@ -121,6 +122,12 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService DestinationSystem = EnumSystemType.ERP.ToString(), DestinationDataId = "", }; + + if (purchaseOrder.wmsoutm_type == "4036") + { + detail.Qty = detail.Qty * -1; + } + outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail); var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail, wmsReceipt.Number); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs index b07618a38..48eabfb7f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/UnplannedReceiptNoteEventHandler.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Volo.Abp.Domain.Entities; using Volo.Abp.EventBus; using Volo.Abp.Uow; using Win_in.Sfs.Shared.Event; @@ -20,30 +21,23 @@ public class UnplannedReceiptNoteEventHandler public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData) { var entity = eventData.Entity; - if(entity.Details!=null && entity.Details.Count>0) + if (entity.Details!= null && entity.Details.Count > 0) { await AddExchangeDataAsync(entity).ConfigureAwait(false); } - - } [UnitOfWork] public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData) { var entities = eventData.Entity; - - List notelist = new List(); foreach (var entity in entities) { if (entity.Details != null && entity.Details.Count > 0) { - notelist.Add(entity); + await AddExchangeDataAsync(entity).ConfigureAwait(false); } } - - - await AddExchangeDataAsync(notelist).ConfigureAwait(false); } protected override async Task AddExchangeDataAsync(List entities) @@ -56,5 +50,4 @@ public class UnplannedReceiptNoteEventHandler var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false); await AddManyAsync(exchangeData).ConfigureAwait(false); } - }