mes缴库接口修改

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutConverter.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Org.BouncyCastle.Asn1.Pkcs;
+using Volo.Abp.Data;
 using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -80,12 +81,19 @@ public class MesOutConverter : IIncomingConverter
             wmsProductReceiptNote.Worker = "MES";//操作人
             wmsProductReceiptNote.ReceiptType = EnumReceiptType.MesScanReceipt;//完工收货方式
             wmsProductReceiptNote.Details = new List<ProductReceiptNoteDetailInput>();
-
+            List<ProductReceiptNoteSumDetailExchangeDto> sumDetails = new List<ProductReceiptNoteSumDetailExchangeDto>();
             foreach (var incomingFromExternal in group.ToList())
             {
+                ProductReceiptNoteSumDetailExchangeDto sumdetail = new ProductReceiptNoteSumDetailExchangeDto();
                 var productReceiptNote = JsonSerializer.Deserialize<ProductReceiptNoteExchangeDto>(incomingFromExternal.DestinationDataContent);
                 var wmsProductReceiptNoteDetail = _objectMapper.Map<ProductReceiptNoteDetailExchangeDto, ProductReceiptNoteDetailInput>(productReceiptNote.Detail);
-               var oldNoteDetail=  wmsProductReceiptNote.Details.FirstOrDefault(r => r.ItemCode == wmsProductReceiptNoteDetail.ItemCode && r.LocationErpCode == wmsProductReceiptNoteDetail.LocationErpCode);
+                var oldNoteDetail=  wmsProductReceiptNote.Details.FirstOrDefault(r => r.ItemCode == wmsProductReceiptNoteDetail.ItemCode && r.LocationErpCode == wmsProductReceiptNoteDetail.LocationErpCode);
+                sumdetail.itemCode = wmsProductReceiptNoteDetail.ItemCode;
+                sumdetail.locationCode = wmsProductReceiptNoteDetail.LocationErpCode;
+                sumdetail.Qty = wmsProductReceiptNoteDetail.Qty;
+                sumdetail.Memo = wmsProductReceiptNoteDetail.Remark;
+                sumdetail.MesGuid = incomingFromExternal.SourceDataId;
+                sumDetails.Add(sumdetail);
                 if (oldNoteDetail != null)
                 {
                     oldNoteDetail.Qty = oldNoteDetail.Qty+wmsProductReceiptNoteDetail.Qty;
@@ -141,6 +149,8 @@ public class MesOutConverter : IIncomingConverter
                     wmsProductReceiptNote.Details.Add(wmsProductReceiptNoteDetail);
                 }
             }
+            wmsProductReceiptNote.ExtraProperties = new ExtraPropertyDictionary();
+            wmsProductReceiptNote.ExtraProperties.Add(first.SourceDataGroupCode, JsonSerializer.Serialize(sumDetails));
             incomingToWms.DataContent = JsonSerializer.Serialize(wmsProductReceiptNote);
             incomingToWmsList.Add(incomingToWms);
         }

be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/appsettings.json

@@ -1,8 +1,8 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "Default": "Server=10.164.113.32,1818\\SHDB;Database=Wms_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True;Encrypt=false",
-    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True",
+    "DataExchange": "Server=10.164.113.32,1818\\SHDB;Database=Wms_DataExchange_Main_Dy_ShangHai;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True;Encrypt=false",
-    "MES": "Server=10.164.113.32,1818\\SHDB;Database=MES_SH;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True"
+    "MES": "Server=10.164.113.32,1818\\SHDB;Database=MES_SH;uid=ShWmsUser;pwd=Faty@Wms_20230413#SH;TrustServerCertificate=True;Encrypt=false"
   },
 
   "AuthServer": {

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ProductReceiptNote/ProductReceiptNoteSumDetailExchangeDto.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote;
+public class ProductReceiptNoteSumDetailExchangeDto
+{
+    /// <summary>
+    /// 零件编号
+    /// </summary>
+    [Display(Name = "零件编号")]
+    public string itemCode { get; set; }
+    /// <summary>
+    /// 库位编码
+    /// </summary>
+    [Display(Name = "零件编号")]
+    public string locationCode { get; set; }
+
+    /// <summary>
+    /// MesGuid
+    /// </summary>
+    [Display(Name = "MesGuid")]
+    public string MesGuid { get; set; }
+
+    /// <summary>
+    /// id
+    /// </summary>
+    [Display(Name = "id")]
+    public string Memo { get; set; }
+
+    /// <summary>
+    /// 生效日期
+    /// </summary>
+    [Display(Name = "生效日期")]
+    public DateTime CreatDate { get; set; } = DateTime.Now.Date;
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    [Display(Name = "数量")]
+    public decimal Qty { get; set; }
+
+}

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

@@ -841,6 +841,36 @@
             明细列表
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.itemCode">
+            <summary>
+            零件编号
+            </summary>
+        </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.locationCode">
+            <summary>
+            库位编码
+            </summary>
+        </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.MesGuid">
+            <summary>
+            MesGuid
+            </summary>
+        </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.Memo">
+            <summary>
+            id
+            </summary>
+        </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.CreatDate">
+            <summary>
+            生效日期
+            </summary>
+        </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductReceiptNote.ProductReceiptNoteSumDetailExchangeDto.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ProductRecycleNote.ProductRecycleMaterialDetailExchangeDto.ProductItemCode">
             <summary>
             产成品物料号