From 292f385ff503ee35dbd9c95661dbeea218776e5d Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Mon, 16 Dec 2024 17:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E5=BA=93=20?= =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E4=BB=93=E9=A2=86=E6=96=99=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/TransferNoteConverter.cs | 59 ++++++++++--------- .../PublishProfiles/FolderProfile1.pubxml | 13 ++++ 2 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Properties/PublishProfiles/FolderProfile1.pubxml 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 67de0c2e0..041ae080e 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 @@ -81,43 +81,44 @@ public class TransferNoteConverter : IOutgoingConverter outgoingToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceipt); string dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"); var stat = "1"; - if (exchangeReceipt.Type == EnumTransSubType.Depot_Issue_WIP.ToString())//立库生成的线边仓领料单 + //立库没有线边仓领料单 + //if (exchangeReceipt.Type == EnumTransSubType.Depot_Issue_WIP.ToString())//立库生成的线边仓领料单 + //{ + // outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString(); + // var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w, billtype_issue); + // 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(); + + //} + //else + //{ + if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString()) { outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString(); - var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w, billtype_issue); + var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w, billtype_s); 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(); } else { - if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString()) - { - outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString(); - var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w, billtype_s); - 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(); - - } - else + var toLocationErpcode = details[0].ToLocationErpCode; + var erplocation = await _erpLocationAppService.GetByCodeAsync(toLocationErpcode).ConfigureAwait(false); + if (erplocation?.Type != "2") { - - var toLocationErpcode = details[0].ToLocationErpCode; - var erplocation = await _erpLocationAppService.GetByCodeAsync(toLocationErpcode).ConfigureAwait(false); - if (erplocation?.Type != "2") - { - stat = "2"; - } - var location = stat == "1" ? details[0].ToLocationErpCode : details[0].FromLocationErpCode; - outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString(); - var putawayNoteWmsoutm = BuildWmsoutmDataInterface(departmentCode, dt_w, tyrpNumber, location, stat, wmsReceipt.Number); - outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteWmsoutm); + stat = "2"; + } + var location = stat == "1" ? details[0].ToLocationErpCode : details[0].FromLocationErpCode; + outgoingToExternal.DataType = EnumOutgoingDataType.TransferForCustom.ToString(); + var putawayNoteWmsoutm = BuildWmsoutmDataInterface(departmentCode, dt_w, tyrpNumber, location, stat, wmsReceipt.Number); + outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteWmsoutm); - 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(); + 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(); - } } + //} outgoingToExternalList.Add(outgoingToExternal); #endregion @@ -224,11 +225,11 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutm BuildWmsoutmDataInterface(string departmentCode, string dt_w, string tyrpNumber,string locationcode,string stat,string number) + private Wmsoutm BuildWmsoutmDataInterface(string departmentCode, string dt_w, string tyrpNumber, string locationcode, string stat, string number) { var ret = new Wmsoutm() { - wmsoutm_mid=Convert.ToDecimal(tyrpNumber), + wmsoutm_mid = Convert.ToDecimal(tyrpNumber), wmsoutm_nbr = number, wmsoutm_type = billtype_w, wmsoutm_dt_w = dt_w, @@ -256,14 +257,14 @@ public class TransferNoteConverter : IOutgoingConverter /// /// /// - private Wmsoutd BuildWmsoutdDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder,string stat, string number) + private Wmsoutd BuildWmsoutdDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder, string stat, string number) { var ret = new Wmsoutd() { - wmsoutd_mid=Convert.ToDecimal(tyrpNumber), + wmsoutd_mid = Convert.ToDecimal(tyrpNumber), wmsoutd_nbr = number, wmsoutd_part = exchangeDetailOrder.ItemCode, - wmsoutd_loc = stat=="1"? exchangeDetailOrder.FromLocationErpCode: exchangeDetailOrder.ToLocationErpCode, + wmsoutd_loc = stat == "1" ? exchangeDetailOrder.FromLocationErpCode : exchangeDetailOrder.ToLocationErpCode, wmsoutd_qty = exchangeDetailOrder.Qty, wmsoutd_bcm_code = "",//有问题 wmsoutd_projt_id = "",//有问题 diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Properties/PublishProfiles/FolderProfile1.pubxml b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Properties/PublishProfiles/FolderProfile1.pubxml new file mode 100644 index 000000000..154e03532 --- /dev/null +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Properties/PublishProfiles/FolderProfile1.pubxml @@ -0,0 +1,13 @@ + + + + + Release + Any CPU + bin\Release\net6.0\publish\ + FileSystem + <_TargetId>Folder + + \ No newline at end of file