From d03b38e07367f0c1d110654bc77e41d42cb9d713 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Mon, 23 Sep 2024 15:58:48 +0800 Subject: [PATCH] =?UTF-8?q?=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 --- .../WmsOutExchange/Wmsoutd.cs | 5 +++++ .../WmsOutExchange/Wmsoutm.cs | 9 +++++++-- .../WmsoutmDbContextModelCreatingExtensions.cs | 2 ++ .../Outgoing/DeliverNoteConverter.cs | 10 ++++++---- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutd.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutd.cs index b4ca5df6a..e7f527847 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutd.cs +++ b/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 { + /// + /// 流水号 + /// + public decimal wmsoutd_mid { get; set; } /// /// 单据号码 /// diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs index 034aef00e..45fc24c8a 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp/WmsOutExchange/Wmsoutm.cs +++ b/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 { /// - /// 单号 + /// 流水号 /// [Key] + public decimal wmsoutm_mid { get; set; } + + /// + /// 单号 + /// public string wmsoutm_nbr { get; set; } /// /// 单据类型 @@ -57,6 +62,6 @@ public class Wmsoutm : Entity public override object[] GetKeys() { - return new object[] { wmsoutm_nbr }; + return new object[] { wmsoutm_mid }; } } diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs index 4eb31fae0..06920e9ff 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.EntityFrameworkCore.Fawtyg.Tyrp/WmsOutExchange/WmsoutmDbContextModelCreatingExtensions.cs +++ b/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); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs index 7c71a5729..665623563 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/DeliverNoteConverter.cs +++ b/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 /// /// /// - 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,