From 0ae706284c9870e97b01a2664ee118f7e8375157 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 9 Oct 2023 08:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E9=87=8D?= =?UTF-8?q?=E4=BC=A0=E5=8A=9F=E8=83=BD=E5=92=8C=E6=B1=87=E6=80=BB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/DeliverNoteConverter.cs | 15 +- .../Outgoing/IssueNoteConverter.cs | 15 +- .../Outgoing/ItemTransformNoteConverter.cs | 194 +++++++++--------- .../Outgoing/ProductReceiptNoteConverter.cs | 4 +- .../Outgoing/ProductRecycleNoteConverter.cs | 16 +- .../Outgoing/ProductionReturnNoteConverter.cs | 15 +- .../Outgoing/PurchaseOrderConverter.cs | 19 +- .../Outgoing/PurchaseReturnConverter.cs | 15 +- .../Outgoing/PutawayNoteConverter.cs | 15 +- .../RecycledMaterialReceiptNoteConverter.cs | 19 +- .../Outgoing/ScrapNoteConVerter.cs | 2 + .../Outgoing/SemiPutawayNoteConverter.cs | 15 +- .../Outgoing/TransferNoteConverter.cs | 27 +-- .../Outgoing/UnplannedIssueNoteConverter.cs | 15 +- .../Outgoing/UnplannedReceiptNoteConverter.cs | 15 +- .../Outgoing/WIPAdjusNoteConverter.cs | 2 + .../ArchivedOutgoingFromWms.cs | 4 + .../ArchivedOutgoingToExternal.cs | 5 +- .../OutgoingFromWms/OutgoingFromWms.cs | 4 + .../OutgoingToExternal/OutgoingToExternal.cs | 5 +- 20 files changed, 240 insertions(+), 181 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs index 2dcc0c525..7cc307439 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs @@ -42,15 +42,17 @@ public class DeliverNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Deliver, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var purchaseOrder = BuildDataInterface(exchangeReceipt); + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.Deliver.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -75,6 +77,7 @@ public class DeliverNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.Deliver.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Number.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -85,7 +88,7 @@ public class DeliverNoteConverter : IOutgoingConverter }; outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail); - var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, detail); + var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -103,12 +106,12 @@ public class DeliverNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(DeliverNoteExchangeDto exchangeOrder) + private Wmsoutm BuildDataInterface(DeliverNoteExchangeDto exchangeOrder,string tyrpNumber) { var ret = new Wmsoutm() { - wmsoutm_nbr = exchangeOrder.Number, + wmsoutm_nbr = tyrpNumber, wmsoutm_type = billtype, wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", @@ -136,11 +139,11 @@ public class DeliverNoteConverter : IOutgoingConverter /// /// /// - private static Wmsoutd BuildDataInterfaceDetail(DeliverNoteExchangeDto exchangeOrder, DeliverNoteDetailExchangeDto exchangeDetailOrder) + private static Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, DeliverNoteDetailExchangeDto exchangeDetailOrder) { var ret = new Wmsoutd() { - wmsoutd_nbr = exchangeOrder.Number, + wmsoutd_nbr = tyrpNumber, wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode ?? "", wmsoutd_qty = exchangeDetailOrder.Qty, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs index fbbacdb40..5f2ad6811 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/IssueNoteConverter.cs @@ -37,15 +37,17 @@ public class IssueNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Issue, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var putawayNote = BuildDataInterface(exchangeReceipt); + var putawayNote = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.Issue.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber= tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -68,6 +70,7 @@ public class IssueNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.Issue.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -79,7 +82,7 @@ public class IssueNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w); + var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceiptDetail, putawayNote.scontrol_dt_w, tyrpNumber); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -97,11 +100,11 @@ public class IssueNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(IssueNoteExchangeDto exchangeOrder) + private Scontrol BuildDataInterface(string tyrpNumber) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -116,13 +119,13 @@ public class IssueNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(IssueNoteExchangeDto exchangeOrder, IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail( IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "1", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs index c10a9e4e1..c51ac8a27 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ItemTransformNoteConverter.cs @@ -14,122 +14,124 @@ using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing; - public class ItemTransformNoteConverter : IOutgoingConverter - { - private readonly IOutgoingFromWmsManager _outgoingFromWmsManager; - private readonly IOutgoingToExternalManager _outgoingToExternalManager; - private readonly ISupplierAsnAppService _supplierAsnAppService; - private readonly IDepartmentAppService _departmentAppService; - private readonly IObjectMapper _objectMapper; +public class ItemTransformNoteConverter : IOutgoingConverter +{ + private readonly IOutgoingFromWmsManager _outgoingFromWmsManager; + private readonly IOutgoingToExternalManager _outgoingToExternalManager; + private readonly ISupplierAsnAppService _supplierAsnAppService; + private readonly IDepartmentAppService _departmentAppService; + private readonly IObjectMapper _objectMapper; - public ItemTransformNoteConverter( - IOutgoingFromWmsManager outgoingFromWmsManager - , IOutgoingToExternalManager outgoingToExternalManager - , ISupplierAsnAppService supplierAsnAppService - , IDepartmentAppService departmentAppService - , IObjectMapper objectMapper - ) - { - _outgoingFromWmsManager = outgoingFromWmsManager; - _outgoingToExternalManager = outgoingToExternalManager; - _supplierAsnAppService = supplierAsnAppService; - _departmentAppService = departmentAppService; - _objectMapper = objectMapper; - } + public ItemTransformNoteConverter( + IOutgoingFromWmsManager outgoingFromWmsManager + , IOutgoingToExternalManager outgoingToExternalManager + , ISupplierAsnAppService supplierAsnAppService + , IDepartmentAppService departmentAppService + , IObjectMapper objectMapper + ) + { + _outgoingFromWmsManager = outgoingFromWmsManager; + _outgoingToExternalManager = outgoingToExternalManager; + _supplierAsnAppService = supplierAsnAppService; + _departmentAppService = departmentAppService; + _objectMapper = objectMapper; + } - public virtual async Task> ConvertAsync() + public virtual async Task> ConvertAsync() + { + var outgoingToExternalList = new List(); + var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Item_Transform, EnumSystemType.ERP).ConfigureAwait(false); + foreach (var outgoingFromWms in outgoingFromWmsList) { - var outgoingToExternalList = new List(); - var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Item_Transform, EnumSystemType.ERP).ConfigureAwait(false); - foreach (var outgoingFromWms in outgoingFromWmsList) + var wmsCountAdjust = JsonSerializer.Deserialize(outgoingFromWms.DataContent); + if (Enum.Parse(wmsCountAdjust.Type) == EnumTransSubType.Item_Transform) { - var wmsCountAdjust = JsonSerializer.Deserialize(outgoingFromWms.DataContent); - if (Enum.Parse(wmsCountAdjust.Type) == EnumTransSubType.Item_Transform) + string tyrpNumber = outgoingFromWms.TyrpNumber; + var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false); + var departmentCode = department == null ? "" : department.Code; + var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.ToItemCode, r.LocationErpCode, r.ToLocationCode }).Select(p => new ItemTransformNoteDetailExchangeDto { ToQty = p.Sum(itm => itm.ToQty), FromQty = p.Sum(itm => itm.FromQty), ItemCode = p.Key.ItemCode, ToItemCode = p.Key.ToItemCode, LocationErpCode = p.Key.LocationErpCode, ReasonCode = String.Join("、", p.Select(x => x.ReasonCode).ToArray()) }); + foreach (var detail in details) { - var department =await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false); - var departmentCode = department == null ? "" : department.Code; - var details = wmsCountAdjust.Details.GroupBy(r => new { r.ItemCode, r.ToItemCode, r.LocationErpCode, r.ToLocationCode }).Select(p => new ItemTransformNoteDetailExchangeDto { ToQty = p.Sum(itm => itm.ToQty), FromQty = p.Sum(itm => itm.FromQty), ItemCode = p.Key.ItemCode, ToItemCode = p.Key.ToItemCode, LocationErpCode = p.Key.LocationErpCode, ReasonCode = String.Join("、", p.Select(x => x.ReasonCode).ToArray()) }); - foreach (var detail in details) + List ItemTransform = new List(); + ItemTransformNoteDetailExchangeDto ItemTrans = new ItemTransformNoteDetailExchangeDto(); + ItemTrans.ItemCode = detail.ItemCode; + ItemTrans.LocationErpCode = detail.LocationErpCode; + ItemTrans.FromQty = detail.FromQty - detail.FromQty - detail.FromQty; + ItemTrans.ReasonCode = detail.ReasonCode; + ItemTransform.Add(ItemTrans); + ItemTransformNoteDetailExchangeDto ItemTranss = new ItemTransformNoteDetailExchangeDto(); + ItemTranss.ItemCode = detail.ToItemCode; + ItemTranss.LocationErpCode = detail.LocationErpCode; + ItemTranss.FromQty = detail.ToQty; + ItemTranss.ReasonCode = detail.ReasonCode; + ItemTransform.Add(ItemTranss); + foreach (var Item in ItemTransform) { - List ItemTransform = new List(); - ItemTransformNoteDetailExchangeDto ItemTrans = new ItemTransformNoteDetailExchangeDto(); - ItemTrans.ItemCode = detail.ItemCode; - ItemTrans.LocationErpCode = detail.LocationErpCode; - ItemTrans.FromQty = detail.FromQty - detail.FromQty - detail.FromQty; - ItemTrans.ReasonCode = detail.ReasonCode; - ItemTransform.Add(ItemTrans); - ItemTransformNoteDetailExchangeDto ItemTranss = new ItemTransformNoteDetailExchangeDto(); - ItemTranss.ItemCode = detail.ToItemCode; - ItemTranss.LocationErpCode = detail.LocationErpCode; - ItemTranss.FromQty = detail.ToQty; - ItemTranss.ReasonCode = detail.ReasonCode; - ItemTransform.Add(ItemTranss); - foreach (var Item in ItemTransform) + var outgoingToExternal = new OutgoingToExternal() { - var outgoingToExternal = new OutgoingToExternal() - { - DataType = outgoingFromWms.DataType, - DataAction = outgoingFromWms.DataAction, - SourceSystem = EnumSystemType.WMS.ToString(), - SourceDataId = wmsCountAdjust.Number, - SourceDataGroupCode = wmsCountAdjust.Number, - SourceDataDetailCode = Item.ItemCode, - Writer = nameof(TyrpOutgoingBackgroundWorker), - DestinationSystem = EnumSystemType.ERP.ToString(), - DestinationDataId = "", - }; - outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); - var exchangeIssue = await BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, Item).ConfigureAwait(false); - outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeIssue); - var arrive = BuildIssue(exchangeIssue, departmentCode); - outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive); - - outgoingToExternalList.Add(outgoingToExternal); - } + DataType = outgoingFromWms.DataType, + DataAction = outgoingFromWms.DataAction, + SerialNumber= tyrpNumber, + SourceSystem = EnumSystemType.WMS.ToString(), + SourceDataId = wmsCountAdjust.Number, + SourceDataGroupCode = wmsCountAdjust.Number, + SourceDataDetailCode = Item.ItemCode, + Writer = nameof(TyrpOutgoingBackgroundWorker), + DestinationSystem = EnumSystemType.ERP.ToString(), + DestinationDataId = "", + }; + outgoingToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); + var exchangeIssue = await BuildPurchaseReceiptExchangeDtoAsync(wmsCountAdjust, Item).ConfigureAwait(false); + outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeIssue); + var arrive = BuildIssue(exchangeIssue, departmentCode); + outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(arrive); + outgoingToExternalList.Add(outgoingToExternal); } + } } - await _outgoingToExternalManager.CreateManyAsync(outgoingToExternalList).ConfigureAwait(false); ; - //将outgoingFromWms数据归档 - await _outgoingFromWmsManager.ArchiveManyAsync(outgoingFromWmsList).ConfigureAwait(false); ; - return outgoingToExternalList; - //插入到中间表OutgoingToExternal } + await _outgoingToExternalManager.CreateManyAsync(outgoingToExternalList).ConfigureAwait(false); ; + //将outgoingFromWms数据归档 + await _outgoingFromWmsManager.ArchiveManyAsync(outgoingFromWmsList).ConfigureAwait(false); ; + return outgoingToExternalList; + //插入到中间表OutgoingToExternal + } - private CountAdjust BuildIssue(ItemTransformNoteExchangeDto exchangeCountAdjust, string departmentCode) + private CountAdjust BuildIssue(ItemTransformNoteExchangeDto exchangeCountAdjust, string departmentCode) + { + var detail = exchangeCountAdjust.Detail; + var counta = new CountAdjust() { - var detail = exchangeCountAdjust.Detail; - var counta = new CountAdjust() - { - mesout_asd_refc = "MES", - mesout_asd_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), - mesout_asd_type = "4003", - mesout_asd_part = detail.ItemCode, - //mesout_asd_date = exchangeCountAdjust.ActiveDate.ToString("yyyyMMdd"), - mesout_asd_date = DateTime.Now.ToString("yyyyMMdd"), - mesout_asd_loc = detail.LocationErpCode, - mesout_asd_code = detail.ReasonCode, - mesout_asd_qty = detail.FromQty, - mesout_asd_user = "WMS", - mesout_asd_k = string.Empty, - mesout_asd_stat = "Y" + mesout_asd_refc = "MES", + mesout_asd_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), + mesout_asd_type = "4003", + mesout_asd_part = detail.ItemCode, + //mesout_asd_date = exchangeCountAdjust.ActiveDate.ToString("yyyyMMdd"), + mesout_asd_date = DateTime.Now.ToString("yyyyMMdd"), + mesout_asd_loc = detail.LocationErpCode, + mesout_asd_code = detail.ReasonCode, + mesout_asd_qty = detail.FromQty, + mesout_asd_user = "WMS", + mesout_asd_k = string.Empty, + mesout_asd_stat = "Y" - }; + }; - return counta; + return counta; - } + } - private async Task BuildPurchaseReceiptExchangeDtoAsync( - ItemTransformNoteDTO wmsCountAdjust, ItemTransformNoteDetailExchangeDto wmsCountAdjustDetail) - { + private async Task BuildPurchaseReceiptExchangeDtoAsync( + ItemTransformNoteDTO wmsCountAdjust, ItemTransformNoteDetailExchangeDto wmsCountAdjustDetail) + { - var exchangeCountAdjust = _objectMapper.Map(wmsCountAdjust); + var exchangeCountAdjust = _objectMapper.Map(wmsCountAdjust); - exchangeCountAdjust.Detail = wmsCountAdjustDetail; - return exchangeCountAdjust; - } + exchangeCountAdjust.Detail = wmsCountAdjustDetail; + return exchangeCountAdjust; } +} diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs index 0e23ac114..5f225fa9e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductReceiptNoteConverter.cs @@ -38,11 +38,13 @@ public class ProductReceiptNoteConverter : IOutgoingConverter foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); int index=0;//为了处理相同number下存在相同零件号的问题。系统自动在number后添加index,如果只有一条明细就不添加。 foreach (var detail in wmsReceipt.Details) { - string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number; + // string number = index > 0 ? wmsReceipt.Number + index.ToString() : wmsReceipt.Number; + string number = index > 0 ? tyrpNumber + index.ToString() : tyrpNumber; var outgoingToExternal = new OutgoingToExternal() { DataType = outgoingFromWms.DataType, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs index 4b1113bc1..096a979b8 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductRecycleNoteConverter.cs @@ -52,15 +52,16 @@ public class ProductRecycleNoteConverter : IOutgoingConverter foreach (var detail in wmsReceipt.Details) { - + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var exchangeReceiptDetail = _objectMapper.Map(detail); - var purchaseOrder = BuildDataInterface(exchangeReceipt, exchangeReceiptDetail, departmentCode); + var purchaseOrder = BuildDataInterface(exchangeReceipt, exchangeReceiptDetail, departmentCode, tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.ProductRecycle.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -85,6 +86,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.ProductRecycle.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = materialDetail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -96,7 +98,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeMterialDetail = _objectMapper.Map(materialDetail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeMterialDetail); - var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeMterialDetail); + var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeMterialDetail); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -115,12 +117,12 @@ public class ProductRecycleNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(ProductRecycleNoteExchangeDto exchangeOrder, ProductRecycleNoteDetailExchangeDto exchangeOrderDetail, string departmentCode) + private Wmsoutm BuildDataInterface(ProductRecycleNoteExchangeDto exchangeOrder, ProductRecycleNoteDetailExchangeDto exchangeOrderDetail, string departmentCode, string tyrpNumber) { var ret = new Wmsoutm() { - wmsoutm_nbr = exchangeOrder.Number, + wmsoutm_nbr = tyrpNumber, wmsoutm_type = billtype, wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", @@ -148,11 +150,11 @@ public class ProductRecycleNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutd BuildDataInterfaceDetail(ProductRecycleNoteExchangeDto exchangeOrder, ProductRecycleMaterialDetailExchangeDto exchangeDetailOrder) + private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, ProductRecycleMaterialDetailExchangeDto exchangeDetailOrder) { var ret = new Wmsoutd() { - wmsoutd_nbr = exchangeOrder.Number, + wmsoutd_nbr = tyrpNumber, wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.LocationErpCode, wmsoutd_qty = exchangeDetailOrder.Qty, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs index c477a42df..bc9e7b9b7 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ProductionReturnNoteConverter.cs @@ -35,15 +35,17 @@ public class ProductionReturnNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.ProductionReturn, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var putawayNote = BuildDataInterface(exchangeReceipt); + var putawayNote = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.ProductionReturn.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -66,6 +68,7 @@ public class ProductionReturnNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.ProductionReturn.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -77,7 +80,7 @@ public class ProductionReturnNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w); + var putawayNoteDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail, putawayNote.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -95,11 +98,11 @@ public class ProductionReturnNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(ProductionReturnNoteExchangeDto exchangeOrder) + private Scontrol BuildDataInterface(string tyrpNumber) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -114,13 +117,13 @@ public class ProductionReturnNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(ProductionReturnNoteExchangeDto exchangeOrder, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(string tyrpNumber, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "2", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs index 7c7b57464..8d718b586 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseOrderConverter.cs @@ -43,15 +43,17 @@ public class PurchaseOrderConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseOrder, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var purchaseOrder = BuildDataInterface(exchangeReceipt); + var purchaseOrder = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.PurchaseOrder.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -74,6 +76,7 @@ public class PurchaseOrderConverter : IOutgoingConverter DataType = EnumOutgoingDataType.PurchaseOrder.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -85,7 +88,7 @@ public class PurchaseOrderConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, purchaseOrder.scontrol_dt_w); + var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, purchaseOrder.scontrol_dt_w,tyrpNumber); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -101,13 +104,13 @@ public class PurchaseOrderConverter : IOutgoingConverter /// /// 构建主表 /// - /// + /// tyepNumber每次生成新number /// - private Scontrol BuildDataInterface(PurchaseOrderExchangeDto exchangeOrder) + private Scontrol BuildDataInterface(string tyrpNumber) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -121,14 +124,16 @@ public class PurchaseOrderConverter : IOutgoingConverter /// /// /// + /// + /// tyepNumber每次生成新number /// - private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "3", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"), diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs index e5e05356f..cbcff5319 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PurchaseReturnConverter.cs @@ -41,15 +41,17 @@ public class PurchaseReturnConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.PurchaseReturn, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var purchaseReturn = BuildDataInterface(exchangeReceipt); + var purchaseReturn = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.PurchaseReturn.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -73,6 +75,7 @@ public class PurchaseReturnConverter : IOutgoingConverter DataType = EnumOutgoingDataType.PurchaseReturn.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Number.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -83,7 +86,7 @@ public class PurchaseReturnConverter : IOutgoingConverter }; outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail); - var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w); + var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w, tyrpNumber); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseReturnDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -101,11 +104,11 @@ public class PurchaseReturnConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(PurchaseReturnNoteExchangeDto exchangeOrder) + private Scontrol BuildDataInterface(string tyrpNumber) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -120,13 +123,13 @@ public class PurchaseReturnConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "4", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs index c55ee29c4..9fce907ee 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/PutawayNoteConverter.cs @@ -39,15 +39,17 @@ public class PutawayNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Putaway, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var putawayNote = BuildDataInterface(exchangeReceipt); + var putawayNote = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.Putaway.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -72,6 +74,7 @@ public class PutawayNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.Putaway.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -83,7 +86,7 @@ public class PutawayNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w); + var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w, tyrpNumber); try { //通过采购订单号查询采购订单要求到货日期 @@ -115,11 +118,11 @@ public class PutawayNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder) + private Scontrol BuildDataInterface(string tyrpNumber) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -134,13 +137,13 @@ public class PutawayNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "0", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"), diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs index b1ec7dfbf..7c3416941 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/RecycledMaterialReceiptNoteConverter.cs @@ -44,17 +44,19 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.RecycledMaterialReceipt, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #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; - var purchaseOrder = BuildDataInterface(exchangeReceipt, departmentCode); + //var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); + //var departmentCode = department == null ? "" : department.Code; + var purchaseOrder = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.RecycledMaterialReceipt.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber= tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -77,6 +79,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.RecycledMaterialReceipt.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -88,7 +91,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail); + var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -106,12 +109,12 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(RecycledMaterialReceiptNoteExchangeDto exchangeOrder, string departmentCode) + private Wmsoutm BuildDataInterface(string tyrpNumber) { var ret = new Wmsoutm() { - wmsoutm_nbr = exchangeOrder.Number, + wmsoutm_nbr = tyrpNumber, wmsoutm_type = billtype, wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", @@ -139,11 +142,11 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutd BuildDataInterfaceDetail(RecycledMaterialReceiptNoteExchangeDto exchangeOrder, RecycledMaterialReceiptNoteDetailExchangeDto exchangeDetailOrder) + private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, RecycledMaterialReceiptNoteDetailExchangeDto exchangeDetailOrder) { var ret = new Wmsoutd() { - wmsoutd_nbr = exchangeOrder.Number, + wmsoutd_nbr = tyrpNumber, wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.LocationErpCode, wmsoutd_qty = exchangeDetailOrder.Qty, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs index 506b69d06..e47c1fd74 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/ScrapNoteConVerter.cs @@ -41,6 +41,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.Scrap, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; var wmsCountAdjust = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false); var departmentCode = department == null ? "" : department.Code; @@ -50,6 +51,7 @@ IOutgoingFromWmsManager outgoingFromWmsManager { DataType = outgoingFromWms.DataType, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsCountAdjust.Number, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs index c42cc197d..30401f64c 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/SemiPutawayNoteConverter.cs @@ -38,15 +38,17 @@ public class SemiPutawayNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.SemiPutaway, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var semiPutaway = BuildDataInterface(exchangeReceipt); + var semiPutaway = BuildDataInterface(tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.SemiPutaway.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -69,6 +71,7 @@ public class SemiPutawayNoteConverter : IOutgoingConverter DataType = outgoingToExternal.DataType, TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -80,7 +83,7 @@ public class SemiPutawayNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var SemiPutawayDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, semiPutaway.scontrol_dt_w); + var SemiPutawayDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail, semiPutaway.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(SemiPutawayDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -98,11 +101,11 @@ public class SemiPutawayNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder) + private Scontrol BuildDataInterface(string tyrpNumber) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -117,13 +120,13 @@ public class SemiPutawayNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(string tyrpNumber, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "0", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs index 7c25b4994..ec6e80e5c 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs @@ -55,12 +55,14 @@ public class TransferNoteConverter : IOutgoingConverter List WipDetails = new List(); if (details.Count > 0 && (wmsReceipt.Type != EnumTransSubType.Transfer_Inside.ToString()||wmsReceipt.Type!=EnumTransSubType.Transfer_SplitPacking.ToString())) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var outgoingToExternal = new OutgoingToExternal() { // DataType = dataType, TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -75,7 +77,7 @@ public class TransferNoteConverter : IOutgoingConverter if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString()) { outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString(); - var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w); + var putawayNoteScontrol = BuildScontrolDataInterface(tyrpNumber, dt_w); outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteScontrol); WipDetails =details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode , r.ToLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode, ToLocationErpCode=p.Key.ToLocationErpCode }).ToList(); @@ -84,7 +86,7 @@ public class TransferNoteConverter : IOutgoingConverter else { outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString(); - var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w); + var putawayNoteWmsoutm = BuildWmsoutmDataInterface(exchangeReceipt, departmentCode, dt_w, tyrpNumber); outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteWmsoutm); WipDetails = details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode }).ToList(); @@ -102,6 +104,7 @@ public class TransferNoteConverter : IOutgoingConverter DataType = outgoingToExternal.DataType, TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Number.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -116,12 +119,12 @@ public class TransferNoteConverter : IOutgoingConverter if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString()) { - var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w); + var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(tyrpNumber, detail, dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailScmsend); } else { - var putawayNoteDetailWmsoutd = BuildWmsoutdDataInterfaceDetail(exchangeReceipt, detail); + var putawayNoteDetailWmsoutd = BuildWmsoutdDataInterfaceDetail(tyrpNumber, detail); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailWmsoutd); } outgoingToExternalList.Add(outgoingDetailToExternal); @@ -143,11 +146,11 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildScontrolDataInterface(TransferNoteExchangeDto exchangeOrder, string dt_w) + private Scontrol BuildScontrolDataInterface(string tyrpNumber, string dt_w) { var ret = new Scontrol() { - scontrol_nbr = exchangeOrder.Number, + scontrol_nbr = tyrpNumber, scontrol_dt_w = dt_w, scontrol_stat = "Y", scontrol_dt_k = "", @@ -162,13 +165,13 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildScmsendDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildScmsendDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype_s, scmsend_dt_w = dt_w, - scmsend_nbr = exchangeOrder.Number, + scmsend_nbr = tyrpNumber, scmsend_stat1 = "0", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", @@ -188,11 +191,11 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildWmsoutmDataInterface(TransferNoteExchangeDto exchangeOrder, string departmentCode, string dt_w) + private Wmsoutm BuildWmsoutmDataInterface(TransferNoteExchangeDto exchangeOrder, string departmentCode, string dt_w,string tyrpNumber) { var ret = new Wmsoutm() { - wmsoutm_nbr = exchangeOrder.Number, + wmsoutm_nbr = tyrpNumber, wmsoutm_type = billtype_w, wmsoutm_dt_w = dt_w, wmsoutm_stat = "Y", @@ -219,11 +222,11 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutd BuildWmsoutdDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder) + private Wmsoutd BuildWmsoutdDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder) { var ret = new Wmsoutd() { - wmsoutd_nbr = exchangeOrder.Number, + wmsoutd_nbr = tyrpNumber, wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode, wmsoutd_qty = exchangeDetailOrder.Qty, 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 edd6b82cb..38d444074 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 @@ -48,6 +48,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.UnplannedIssue, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); @@ -62,12 +63,13 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter } } - var purchaseOrder = BuildDataInterface(exchangeReceipt); + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedIssue.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -91,6 +93,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.UnplannedIssue.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Number.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -102,7 +105,7 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail); - var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, detail); + var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -120,11 +123,11 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder) + private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber) { var ret = new Wmsoutm() { - wmsoutm_nbr = exchangeOrder.Number, + wmsoutm_nbr = tyrpNumber, wmsoutm_type = billtype, wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", @@ -152,11 +155,11 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutd BuildDataInterfaceDetail(UnplannedIssueNoteExchangeDto exchangeOrder, UnplannedIssueNoteDetailExchangeDto exchangeDetailOrder) + private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedIssueNoteDetailExchangeDto exchangeDetailOrder) { var ret = new Wmsoutd() { - wmsoutd_nbr = exchangeOrder.Number, + wmsoutd_nbr = tyrpNumber, wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "", wmsoutd_qty = exchangeDetailOrder.Qty, 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 38e1ee5c5..5688104f2 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 @@ -49,6 +49,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.UnplannedReceipt, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); @@ -62,12 +63,13 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter exchangeReceipt.Worker = username; } } - var purchaseOrder = BuildDataInterface(exchangeReceipt); + var purchaseOrder = BuildDataInterface(exchangeReceipt, tyrpNumber); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, + SerialNumber=tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -92,6 +94,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter DataType = EnumOutgoingDataType.UnplannedReceipt.ToString(), TableType = EnumExchangeTableType.DetailTable, DataAction = outgoingFromWms.DataAction, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = detail.Number.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -102,7 +105,7 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter }; outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail); - var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, detail); + var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -120,12 +123,12 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder) + private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber) { var ret = new Wmsoutm() { - wmsoutm_nbr = exchangeOrder.Number, + wmsoutm_nbr = tyrpNumber, wmsoutm_type = billtype, wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), wmsoutm_stat = "Y", @@ -153,11 +156,11 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutd BuildDataInterfaceDetail(UnplannedReceiptNoteExchangeDto exchangeOrder, UnplannedReceiptNoteDetailExchangeDto exchangeDetailOrder) + private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedReceiptNoteDetailExchangeDto exchangeDetailOrder) { var ret = new Wmsoutd() { - wmsoutd_nbr = exchangeOrder.Number, + wmsoutd_nbr = tyrpNumber, wmsoutd_part = exchangeDetailOrder.ItemCode, wmsoutd_loc = exchangeDetailOrder.LocationErpCode ?? "", wmsoutd_qty = exchangeDetailOrder.Qty, diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs index d7d94de83..96c7b6b02 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/WIPAdjusNoteConverter.cs @@ -43,6 +43,7 @@ public class WIPAdjusNoteConverter : IOutgoingConverter var outgoingFromWmsList = await _outgoingFromWmsManager.GetToBeProcessedListAsync(EnumOutgoingDataType.WIPAdjust, EnumSystemType.ERP).ConfigureAwait(false); foreach (var outgoingFromWms in outgoingFromWmsList) { + string tyrpNumber = outgoingFromWms.TyrpNumber; var wmsCountAdjust = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var department = await _departmentAppService.GetByUsernameAsync(wmsCountAdjust.Worker).ConfigureAwait(false); var departmentCode = department == null ? "" : department.Code; @@ -57,6 +58,7 @@ public class WIPAdjusNoteConverter : IOutgoingConverter { DataType = outgoingFromWms.DataType, DataAction = outgoingFromWms.DataAction, + SerialNumber= tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsCountAdjust.Number, SourceDataGroupCode = wmsCountAdjust.Number, diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingFromWms/ArchivedOutgoingFromWms.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingFromWms/ArchivedOutgoingFromWms.cs index cca037444..f32455221 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingFromWms/ArchivedOutgoingFromWms.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingFromWms/ArchivedOutgoingFromWms.cs @@ -4,4 +4,8 @@ public class ArchivedOutgoingFromWms : WmsDataBase { public long Number { get; protected internal set; } + /// + /// Tyrp系统编号 + /// + public string TyrpNumber { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingToExternal/ArchivedOutgoingToExternal.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingToExternal/ArchivedOutgoingToExternal.cs index 47d394fb7..ad37d6ecc 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingToExternal/ArchivedOutgoingToExternal.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/ArchivedOutgoingToExternal/ArchivedOutgoingToExternal.cs @@ -3,5 +3,8 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain; public class ArchivedOutgoingToExternal : ExternalDataBase { public long Number { get; protected internal set; } - + /// + /// 流水号 + /// + public string SerialNumber { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingFromWms/OutgoingFromWms.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingFromWms/OutgoingFromWms.cs index 4e797b31f..705a09607 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingFromWms/OutgoingFromWms.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingFromWms/OutgoingFromWms.cs @@ -10,6 +10,10 @@ public class OutgoingFromWms : WmsDataBase /// [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Number { get; protected internal set; } + /// + /// Tyrp系统编号 + /// + public string TyrpNumber { get; set; } public string DestinationSystem { get; set; } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingToExternal/OutgoingToExternal.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingToExternal/OutgoingToExternal.cs index 776767037..8bafc6959 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingToExternal/OutgoingToExternal.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Domain/OutgoingToExternal/OutgoingToExternal.cs @@ -10,7 +10,10 @@ public class OutgoingToExternal : ExternalDataBase /// [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long Number { get; protected internal set; } - + /// + /// 流水号 + /// + public string SerialNumber { get;set; } public override void Reset(string remark = null) { base.Reset(remark);