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 5f2ad6811..8817630e3 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 @@ -41,13 +41,13 @@ public class IssueNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var putawayNote = BuildDataInterface(tyrpNumber); + var putawayNote = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.Issue.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, - SerialNumber= tyrpNumber, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -82,7 +82,7 @@ public class IssueNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceiptDetail, putawayNote.scontrol_dt_w, tyrpNumber); + var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -100,11 +100,11 @@ public class IssueNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(string tyrpNumber) + private Scontrol BuildDataInterface(IssueNoteExchangeDto exchangeOrder) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -119,13 +119,13 @@ public class IssueNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail( IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) + private Scmsend BuildDataInterfaceDetail(IssueNoteExchangeDto exchangeOrder, IssueNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, scmsend_stat1 = "1", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", @@ -135,7 +135,7 @@ public class IssueNoteConverter : IOutgoingConverter scmsend_date = DateTime.Now.ToString("yyyyMMdd"), scmsend_qty = exchangeDetailOrder.Qty, scmsend_wipd_loc = exchangeDetailOrder.ToLocationErpCode, - scmsend_userid ="WMS" + scmsend_userid = "WMS" }; return ret; } 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 bc9e7b9b7..1aaa970a7 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 @@ -39,13 +39,13 @@ public class ProductionReturnNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var putawayNote = BuildDataInterface(tyrpNumber); + var putawayNote = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.ProductionReturn.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, - SerialNumber=tyrpNumber, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -80,7 +80,7 @@ public class ProductionReturnNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var putawayNoteDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail, putawayNote.scontrol_dt_w); + var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -98,11 +98,11 @@ public class ProductionReturnNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(string tyrpNumber) + private Scontrol BuildDataInterface(ProductionReturnNoteExchangeDto exchangeOrder) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -117,13 +117,13 @@ public class ProductionReturnNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(string tyrpNumber, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(ProductionReturnNoteExchangeDto exchangeOrder, ProductionReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, 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 8d718b586..6435ac6f0 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 @@ -47,7 +47,7 @@ public class PurchaseOrderConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var purchaseOrder = BuildDataInterface(tyrpNumber); + var purchaseOrder = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.PurchaseOrder.ToString(), @@ -88,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,tyrpNumber); + var purchaseOrderDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, purchaseOrder.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -104,13 +104,13 @@ public class PurchaseOrderConverter : IOutgoingConverter /// /// 构建主表 /// - /// tyepNumber每次生成新number + /// /// - private Scontrol BuildDataInterface(string tyrpNumber) + private Scontrol BuildDataInterface(PurchaseOrderExchangeDto exchangeOrder) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -124,19 +124,17 @@ public class PurchaseOrderConverter : IOutgoingConverter /// /// /// - /// - /// tyepNumber每次生成新number /// - private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) + private Scmsend BuildDataInterfaceDetail(PurchaseOrderExchangeDto exchangeOrder, PurchaseOrderDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, scmsend_stat1 = "3", scmsend_part = exchangeDetailOrder.ItemCode, - scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"), + scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"), scmsend_orderno = exchangeOrder.SupplierCode, scmsend_loc = "", // scmsend_date = exchangeOrder.OrderDate.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 cbcff5319..d2d3c044b 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 @@ -42,16 +42,16 @@ public class PurchaseReturnConverter : IOutgoingConverter foreach (var outgoingFromWms in outgoingFromWmsList) { string tyrpNumber = outgoingFromWms.TyrpNumber; - #region 主表 + #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var purchaseReturn = BuildDataInterface(tyrpNumber); + var purchaseReturn = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.PurchaseReturn.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, - SerialNumber=tyrpNumber, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -84,9 +84,9 @@ public class PurchaseReturnConverter : IOutgoingConverter DestinationSystem = EnumSystemType.ERP.ToString(), DestinationDataId = "", }; - outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); + outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail); - var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w, tyrpNumber); + var purchaseReturnDetail = BuildDataInterfaceDetail(exchangeReceipt, detail, purchaseReturn.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseReturnDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -104,11 +104,11 @@ public class PurchaseReturnConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(string tyrpNumber) + private Scontrol BuildDataInterface(PurchaseReturnNoteExchangeDto exchangeOrder) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -123,13 +123,13 @@ public class PurchaseReturnConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) + private Scmsend BuildDataInterfaceDetail(PurchaseReturnNoteExchangeDto exchangeOrder, PurchaseReturnNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, 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 9fce907ee..250884fd7 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 @@ -24,7 +24,7 @@ public class PutawayNoteConverter : IOutgoingConverter IOutgoingFromWmsManager outgoingFromWmsManager , IOutgoingToExternalManager outgoingToExternalManager , IObjectMapper objectMapper - ,IPurchaseOrderAppService purchaseOrderAppService + , IPurchaseOrderAppService purchaseOrderAppService ) { _outgoingFromWmsManager = outgoingFromWmsManager; @@ -43,13 +43,13 @@ public class PutawayNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var putawayNote = BuildDataInterface(tyrpNumber); + var putawayNote = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.Putaway.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, - SerialNumber=tyrpNumber, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -64,7 +64,7 @@ public class PutawayNoteConverter : IOutgoingConverter outgoingToExternalList.Add(outgoingToExternal); #endregion - var sumDetails= wmsReceipt.Details.GroupBy(r => new { r.ItemCode, r.PoNumber, r.ToLocationErpCode }).Select(p => new PutawayNoteDetailDTO { ItemCode = p.Key.ItemCode, PoNumber = p.Key.PoNumber, ToLocationErpCode = p.Key.ToLocationErpCode ,Qty=p.Sum(x=>x.Qty)}).ToList(); + var sumDetails = wmsReceipt.Details.GroupBy(r => new { r.ItemCode, r.PoNumber, r.ToLocationErpCode }).Select(p => new PutawayNoteDetailDTO { ItemCode = p.Key.ItemCode, PoNumber = p.Key.PoNumber, ToLocationErpCode = p.Key.ToLocationErpCode, Qty = p.Sum(x => x.Qty) }).ToList(); #region 明细 foreach (var detail in sumDetails) @@ -86,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, tyrpNumber); + var putawayNoteDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, putawayNote.scontrol_dt_w); try { //通过采购订单号查询采购订单要求到货日期 @@ -98,7 +98,7 @@ public class PutawayNoteConverter : IOutgoingConverter } catch (Exception ex) { - outgoingDetailToExternal.SetError(EnumExchangeDataErrorCode.Exception, ex.InnerException==null?ex.Message: ex.InnerException.Message, ex.ToString()); + outgoingDetailToExternal.SetError(EnumExchangeDataErrorCode.Exception, ex.InnerException == null ? ex.Message : ex.InnerException.Message, ex.ToString()); } outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetail); @@ -118,11 +118,11 @@ public class PutawayNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(string tyrpNumber) + private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -137,20 +137,20 @@ public class PutawayNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string tyrpNumber) - { + private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, scmsend_stat1 = "0", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = exchangeOrder.DueDate.ToString("yyyyMMdd"), scmsend_orderno = exchangeDetailOrder.PoNumber, scmsend_loc = exchangeDetailOrder.ToLocationErpCode, //scmsend_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), - scmsend_date= DateTime.Now.ToString("yyyyMMdd"), + scmsend_date = DateTime.Now.ToString("yyyyMMdd"), scmsend_qty = exchangeDetailOrder.Qty, scmsend_wipd_loc = "", scmsend_userid = "WMS" 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 30401f64c..4bc1d1244 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 @@ -42,13 +42,13 @@ public class SemiPutawayNoteConverter : IOutgoingConverter #region 主表 var wmsReceipt = JsonSerializer.Deserialize(outgoingFromWms.DataContent); var exchangeReceipt = _objectMapper.Map(wmsReceipt); - var semiPutaway = BuildDataInterface(tyrpNumber); + var semiPutaway = BuildDataInterface(exchangeReceipt); var outgoingToExternal = new OutgoingToExternal() { DataType = EnumOutgoingDataType.SemiPutaway.ToString(), TableType = EnumExchangeTableType.MainTable, DataAction = outgoingFromWms.DataAction, - SerialNumber=tyrpNumber, + SerialNumber = tyrpNumber, SourceSystem = EnumSystemType.WMS.ToString(), SourceDataId = wmsReceipt.Id.ToString(), SourceDataGroupCode = wmsReceipt.Number, @@ -83,7 +83,7 @@ public class SemiPutawayNoteConverter : IOutgoingConverter outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate); var exchangeReceiptDetail = _objectMapper.Map(detail); outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail); - var SemiPutawayDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail, semiPutaway.scontrol_dt_w); + var SemiPutawayDetail = BuildDataInterfaceDetail(exchangeReceipt, exchangeReceiptDetail, semiPutaway.scontrol_dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(SemiPutawayDetail); outgoingToExternalList.Add(outgoingDetailToExternal); } @@ -101,11 +101,11 @@ public class SemiPutawayNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildDataInterface(string tyrpNumber) + private Scontrol BuildDataInterface(PutawayNoteExchangeDto exchangeOrder) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"), scontrol_stat = "Y", scontrol_dt_k = "", @@ -120,13 +120,13 @@ public class SemiPutawayNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildDataInterfaceDetail(string tyrpNumber, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildDataInterfaceDetail(PutawayNoteExchangeDto exchangeOrder, PutawayNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, 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 ec6e80e5c..ea522406e 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 @@ -77,7 +77,7 @@ public class TransferNoteConverter : IOutgoingConverter if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString()) { outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString(); - var putawayNoteScontrol = BuildScontrolDataInterface(tyrpNumber, dt_w); + var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, 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(); @@ -119,7 +119,7 @@ public class TransferNoteConverter : IOutgoingConverter if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString()) { - var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(tyrpNumber, detail, dt_w); + var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w); outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailScmsend); } else @@ -146,11 +146,11 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Scontrol BuildScontrolDataInterface(string tyrpNumber, string dt_w) + private Scontrol BuildScontrolDataInterface(TransferNoteExchangeDto exchangeOrder, string dt_w) { var ret = new Scontrol() { - scontrol_nbr = tyrpNumber, + scontrol_nbr = exchangeOrder.Number, scontrol_dt_w = dt_w, scontrol_stat = "Y", scontrol_dt_k = "", @@ -165,23 +165,23 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Scmsend BuildScmsendDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w) + private Scmsend BuildScmsendDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w) { var ret = new Scmsend() { scmsend_type = billtype_s, scmsend_dt_w = dt_w, - scmsend_nbr = tyrpNumber, + scmsend_nbr = exchangeOrder.Number, scmsend_stat1 = "0", scmsend_part = exchangeDetailOrder.ItemCode, scmsend_delv_date = "", scmsend_orderno = "", scmsend_loc = exchangeDetailOrder.FromLocationErpCode, - // scmsend_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), + // scmsend_date = exchangeOrder.ActiveDate.ToString("yyyyMMdd"), scmsend_date = DateTime.Now.ToString("yyyyMMdd"), scmsend_qty = exchangeDetailOrder.Qty, scmsend_wipd_loc = exchangeDetailOrder.ToLocationErpCode, - scmsend_userid ="WMS" + scmsend_userid = "WMS" }; return ret; }