From 7ad0171a4036d76fd2d4cc969095762c33b1e78d Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Wed, 20 Dec 2023 16:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=94=9F=E4=BA=A7=E9=A2=86=E9=80=80?= =?UTF-8?q?=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Outgoing/UnplannedIssueNoteConverter.cs | 7 ++++++- .../Outgoing/UnplannedReceiptNoteConverter.cs | 9 +++++++-- .../UnplannedIssueNoteExchangeDto.cs | 5 +++++ .../UnplannedReceiptNoteExchangeDto.cs | 5 +++++ ...n_in.Sfs.Wms.DataExchange.Application.Contracts.xml | 10 ++++++++++ 5 files changed, 33 insertions(+), 3 deletions(-) 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 300ff4ba4..05a75e3d7 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 @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Volo.Abp.ObjectMapping; using Win_in.Sfs.Auth.Application.Contracts; using Win_in.Sfs.Auth.Users; +using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; using Win_in.Sfs.Wms.DataExchange.Domain.Shared; @@ -16,7 +17,6 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing; public class UnplannedIssueNoteConverter : IOutgoingConverter { - private readonly string billtype = "4013"; private readonly IOutgoingFromWmsManager _outgoingFromWmsManager; private readonly IOutgoingToExternalManager _outgoingToExternalManager; private readonly IDepartmentAppService _departmentAppService; @@ -125,6 +125,11 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter /// private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder,string tyrpNumber,string departmentCode) { + string billtype = "4013"; + if (exchangeOrder.UnplannedIssueType== EnumUnplannedIssueType.Wip) + { + billtype = "4036"; + } var ret = new Wmsoutm() { wmsoutm_nbr = tyrpNumber, 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 3b6d8b68e..1a5cb0d4d 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 @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Volo.Abp.ObjectMapping; using Win_in.Sfs.Auth.Application.Contracts; using Win_in.Sfs.Auth.Users; +using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; using Win_in.Sfs.Wms.DataExchange.Domain.Shared; @@ -16,7 +17,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing; public class UnplannedReceiptNoteConverter : IOutgoingConverter { - private readonly string billtype = "4014"; + //private readonly string billtype = "4014"; private readonly IOutgoingFromWmsManager _outgoingFromWmsManager; private readonly IOutgoingToExternalManager _outgoingToExternalManager; private readonly IDepartmentAppService _departmentAppService; @@ -125,7 +126,11 @@ public class UnplannedReceiptNoteConverter : IOutgoingConverter /// private Wmsoutm BuildDataInterface(UnplannedReceiptNoteExchangeDto exchangeOrder, string tyrpNumber,string departmentCode) { - + string billtype = "4014"; + if (exchangeOrder.UnplannedReceiptType == EnumUnplannedReceiptType.Wip) + { + billtype = "4036"; + } var ret = new Wmsoutm() { wmsoutm_nbr = tyrpNumber, diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs index d13480533..b27945058 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedIssueNote/UnplannedIssueNoteExchangeDto.cs @@ -1,4 +1,5 @@ using System; +using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; namespace Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote; @@ -22,4 +23,8 @@ public class UnplannedIssueNoteExchangeDto /// 生效日期 /// public DateTime ActiveDate { get; set; } = DateTime.Now.Date; + /// + /// 领料类别 + /// + public EnumUnplannedIssueType UnplannedIssueType { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs index c13fec26a..abae086af 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/UnplannedReceiptNote/UnplannedReceiptNoteExchangeDto.cs @@ -1,4 +1,5 @@ using System; +using Win_in.Sfs.Shared.Domain.Shared.Enums.Store; namespace Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote; @@ -23,5 +24,9 @@ public class UnplannedReceiptNoteExchangeDto /// 生效日期 /// public DateTime ActiveDate { get; set; } = DateTime.Now.Date; + /// + /// 退料类别 + /// + public EnumUnplannedReceiptType UnplannedReceiptType { get; set; } } diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml index db237fa5f..01d68a873 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml @@ -1671,6 +1671,11 @@ 生效日期 + + + 领料类别 + + 单据号 @@ -1726,6 +1731,11 @@ 生效日期 + + + 退料类别 + + 用户号码