非生产领退料接口修改

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
     /// <returns></returns>
     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,

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
     /// <returns></returns>
     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,

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
     /// 生效日期
     /// </summary>
     public DateTime ActiveDate { get; set; } = DateTime.Now.Date;
+    /// <summary>
+    /// 领料类别
+    /// </summary>
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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
     /// 生效日期
     /// </summary>
     public DateTime ActiveDate { get; set; } = DateTime.Now.Date;
+    /// <summary>
+    /// 退料类别
+    /// </summary>
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
 }

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml

@@ -1671,6 +1671,11 @@
             生效日期
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedIssueNote.UnplannedIssueNoteExchangeDto.UnplannedIssueType">
+            <summary>
+            领料类别
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteDetailExchangeDto.Number">
             <summary>
             单据号
@@ -1726,6 +1731,11 @@
             生效日期
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.UnplannedReceiptNote.UnplannedReceiptNoteExchangeDto.UnplannedReceiptType">
+            <summary>
+            退料类别
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.User.IdentityUserExchangerDto.UserName">
             <summary>
             用户号码