接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutd.cs

@@ -1,9 +1,14 @@
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Domain.Entities;
 
 namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp;
 
 public class Wmsoutd : Entity<long>
 {
+    /// <summary>
+    /// 流水号
+    /// </summary>
+    public decimal wmsoutd_mid { get; set; }
     /// <summary>
     /// 单据号码
     /// </summary>

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs

@@ -6,9 +6,14 @@ namespace Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp;
 public class Wmsoutm : Entity
 {
     /// <summary>
-    /// 单号
+    /// 流水号
     /// </summary>
     [Key]
+    public decimal wmsoutm_mid { get; set; }
+
+    /// <summary>
+    /// 单号
+    /// </summary>
     public string wmsoutm_nbr { get; set; }
     /// <summary>
     /// 单据类型
@@ -57,6 +62,6 @@ public class Wmsoutm : Entity
 
     public override object[] GetKeys()
     {
-        return new object[] { wmsoutm_nbr };
+        return new object[] { wmsoutm_mid };
     }
 }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs

@@ -16,6 +16,7 @@ public static class WmsoutmDbContextModelCreatingExtensions
             b.ConfigureByConvention();
 
             //Properties
+            b.Property(q => q.wmsoutm_mid).HasPrecision(20,0);
             b.Property(q => q.wmsoutm_nbr).HasColumnType("char").HasMaxLength(12);
             b.Property(q => q.wmsoutm_type).HasColumnType("char").HasMaxLength(6);
             b.Property(q => q.wmsoutm_dt_w).HasColumnType("char").HasMaxLength(20);
@@ -47,6 +48,7 @@ public static class WmsoutmDbContextModelCreatingExtensions
             b.ConfigureByConvention();
 
             //Properties
+            b.Property(q => q.wmsoutd_mid).HasPrecision(20, 0);
             b.Property(e => e.Id).ValueGeneratedOnAdd().UseIdentityColumn().HasColumnName("wmsoutd_id").HasPrecision(20);
             b.Property(q => q.wmsoutd_nbr).HasColumnType("char").HasMaxLength(12);
             b.Property(q => q.wmsoutd_part).HasColumnType("char").HasMaxLength(20);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs

@@ -76,7 +76,7 @@ public class DeliverNoteConverter : IOutgoingConverter
                 };
                 outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
                 outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(detail);
-                var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail);
+                var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, detail, wmsReceipt.Number);
                 outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
                 outgoingToExternalList.Add(outgoingDetailToExternal);
             }
@@ -130,7 +130,8 @@ public class DeliverNoteConverter : IOutgoingConverter
 
         var ret = new Wmsoutm()
         {
-            wmsoutm_nbr = tyrpNumber,
+            wmsoutm_mid = Convert.ToDecimal(tyrpNumber),
+            wmsoutm_nbr = exchangeOrder.Number,
             wmsoutm_type = billtype,
             wmsoutm_dt_w =  DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
             wmsoutm_stat = "Y",
@@ -158,11 +159,12 @@ public class DeliverNoteConverter : IOutgoingConverter
     /// <param name="exchangeOrder"></param>
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
-    private static Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, DeliverNoteDetailExchangeDto exchangeDetailOrder)
+    private static Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, DeliverNoteDetailExchangeDto exchangeDetailOrder,string number)
     {
         var ret = new Wmsoutd()
         {
-            wmsoutd_nbr = tyrpNumber,
+            wmsoutd_mid = Convert.ToDecimal(tyrpNumber),
+            wmsoutd_nbr = number,
             wmsoutd_part = exchangeDetailOrder.ItemCode,
             wmsoutd_loc = exchangeDetailOrder.FromLocationErpCode ?? "",
             wmsoutd_qty = exchangeDetailOrder.Qty,