更新

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

@@ -1,9 +1,15 @@
+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>
     /// 单据类型

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);
@@ -48,6 +49,7 @@ public static class WmsoutmDbContextModelCreatingExtensions
 
             //Properties
             b.Property(e => e.Id).ValueGeneratedOnAdd().UseIdentityColumn().HasColumnName("wmsoutd_id").HasPrecision(20);
+            b.Property(q => q.wmsoutd_mid).HasPrecision(20, 0);
             b.Property(q => q.wmsoutd_nbr).HasColumnType("char").HasMaxLength(12);
             b.Property(q => q.wmsoutd_part).HasColumnType("char").HasMaxLength(20);
             b.Property(q => q.wmsoutd_loc).HasColumnType("char").HasMaxLength(10);

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Properties/launchSettings.json

@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "WSL": {
-      "commandName": "WSL2",
-      "distributionName": ""
-    }
-  }
-}

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

@@ -88,7 +88,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);
             }
@@ -111,7 +111,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",
@@ -139,11 +140,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,

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

@@ -98,7 +98,7 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
                     outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
                     var exchangeMterialDetail = _objectMapper.Map<ProductRecycleMaterialDetailDTO, ProductRecycleMaterialDetailExchangeDto>(materialDetail);
                     outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeMterialDetail);
-                    var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeMterialDetail);
+                    var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeMterialDetail,wmsReceipt.Number);
                     outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
                     outgoingToExternalList.Add(outgoingDetailToExternal);
                 }
@@ -122,7 +122,8 @@ public class ProductRecycleNoteConverter : 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",
@@ -150,11 +151,12 @@ public class ProductRecycleNoteConverter : IOutgoingConverter
     /// <param name="exchangeOrder"></param>
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
-    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, ProductRecycleMaterialDetailExchangeDto exchangeDetailOrder)
+    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, ProductRecycleMaterialDetailExchangeDto 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.LocationErpCode,
             wmsoutd_qty = exchangeDetailOrder.Qty,

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

@@ -50,7 +50,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
             var exchangeReceipt = _objectMapper.Map<RecycledMaterialReceiptNoteDTO, RecycledMaterialReceiptNoteExchangeDto>(wmsReceipt);
             //var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false);
             //var departmentCode = department == null ? "" : department.Code;
-            var purchaseOrder = BuildDataInterface(tyrpNumber);
+            var purchaseOrder = BuildDataInterface(tyrpNumber, wmsReceipt.Number);
             var outgoingToExternal = new OutgoingToExternal()
             {
                 DataType = EnumOutgoingDataType.RecycledMaterialReceipt.ToString(),
@@ -91,7 +91,7 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
                 outgoingDetailToExternal.SetEffectiveDate(outgoingFromWms.EffectiveDate);
                 var exchangeReceiptDetail = _objectMapper.Map<RecycledMaterialReceiptNoteDetailDTO, RecycledMaterialReceiptNoteDetailExchangeDto>(detail);
                 outgoingDetailToExternal.SourceDataContent = JsonSerializer.Serialize(exchangeReceiptDetail);
-                var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail);
+                var purchaseOrderDetail = BuildDataInterfaceDetail(tyrpNumber, exchangeReceiptDetail,wmsReceipt.Number);
                 outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(purchaseOrderDetail);
                 outgoingToExternalList.Add(outgoingDetailToExternal);
             }
@@ -109,12 +109,13 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
     /// </summary>
     /// <param name="exchangeOrder"></param>
     /// <returns></returns>
-    private Wmsoutm BuildDataInterface(string tyrpNumber)
+    private Wmsoutm BuildDataInterface(string tyrpNumber,string number)
     {
 
         var ret = new Wmsoutm()
         {
-            wmsoutm_nbr = tyrpNumber,
+            wmsoutm_mid= Convert.ToDecimal(tyrpNumber),
+            wmsoutm_nbr = number,
             wmsoutm_type = billtype,
             wmsoutm_dt_w = DateTime.Now.ToString("yyyyMMdd HH:mm:ss"),
             wmsoutm_stat = "Y",
@@ -142,11 +143,12 @@ public class RecycledMaterialReceiptNoteConverter : IOutgoingConverter
     /// <param name="exchangeOrder"></param>
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
-    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, RecycledMaterialReceiptNoteDetailExchangeDto exchangeDetailOrder)
+    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, RecycledMaterialReceiptNoteDetailExchangeDto 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.LocationErpCode,
             wmsoutd_qty = exchangeDetailOrder.Qty,

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

@@ -141,7 +141,7 @@ public class TransferNoteConverter : IOutgoingConverter
                     }
                     else
                     {
-                        var putawayNoteDetailWmsoutd = BuildWmsoutdDataInterfaceDetail(tyrpNumber, detail);
+                        var putawayNoteDetailWmsoutd = BuildWmsoutdDataInterfaceDetail(tyrpNumber, detail, wmsReceipt.Number);
                         outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailWmsoutd);
                     }
                     outgoingToExternalList.Add(outgoingDetailToExternal);
@@ -208,11 +208,12 @@ public class TransferNoteConverter : IOutgoingConverter
     /// </summary>
     /// <param name="exchangeOrder"></param>
     /// <returns></returns>
-    private Wmsoutm BuildWmsoutmDataInterface(TransferNoteExchangeDto exchangeOrder, string departmentCode, string dt_w,string tyrpNumber,string location)
+    private Wmsoutm BuildWmsoutmDataInterface(TransferNoteExchangeDto exchangeOrder, string departmentCode, string dt_w,string tyrpNumber)
     {
         var ret = new Wmsoutm()
         {
-            wmsoutm_nbr = tyrpNumber,
+            wmsoutm_mid = Convert.ToDecimal(tyrpNumber),
+            wmsoutm_nbr = number,
             wmsoutm_type = billtype_w,
             wmsoutm_dt_w = dt_w,
             wmsoutm_stat = "Y",
@@ -239,11 +240,12 @@ public class TransferNoteConverter : IOutgoingConverter
     /// <param name="exchangeOrder"></param>
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
-    private Wmsoutd BuildWmsoutdDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto exchangeDetailOrder)
+    private Wmsoutd BuildWmsoutdDataInterfaceDetail(string tyrpNumber, TransferNoteDetailExchangeDto 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,

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

@@ -157,7 +157,7 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         #endregion
 
         #region --接口以关闭-- 退货单 UnplannedReceipt wmsoutm
-        //暂无此接口
+        //暂无此接口(启用时要修改后使用)
         //Logger.LogInformation($"Write CustomerReturnNote");//退货单
         //var customerReturnNoteConvert = workerContext.ServiceProvider.GetRequiredService<CustomerReturnNoteConverter>();
         //var customerReturnNoteList = await customerReturnNoteConvert.ConvertAsync().ConfigureAwait(false);

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

@@ -115,7 +115,7 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService)
                 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);
             }
@@ -142,7 +142,8 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService)
         }
         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",
@@ -170,11 +171,12 @@ IUnplannedIssueRequestAppService unplannedIssueRequestAppService)
     /// <param name="exchangeOrder"></param>
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
-    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedIssueNoteDetailExchangeDto exchangeDetailOrder)
+    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedIssueNoteDetailExchangeDto 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.LocationErpCode ?? "",
             wmsoutd_qty = exchangeDetailOrder.Qty,

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

@@ -114,7 +114,7 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService    )
                 };
                 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);
             }
@@ -141,7 +141,8 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService    )
         }
         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",
@@ -169,11 +170,12 @@ IUnplannedReceiptRequestAppService unplannedReceiptRequestAppService    )
     /// <param name="exchangeOrder"></param>
     /// <param name="exchangeDetailOrder"></param>
     /// <returns></returns>
-    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedReceiptNoteDetailExchangeDto exchangeDetailOrder)
+    private Wmsoutd BuildDataInterfaceDetail(string tyrpNumber, UnplannedReceiptNoteDetailExchangeDto 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.LocationErpCode ?? "",
             wmsoutd_qty = exchangeDetailOrder.Qty,