From e4c25d5ca1bf32fb18252cf6b6767290b31fb0e6 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Wed, 26 Apr 2023 10:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=8C=85=E6=95=B0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FawtygAutoMapperProfile.cs                                 | 2 +-
 .../Incoming/ProductReader.cs                                  | 2 +-
 .../Incoming/MesIncomingBackgroundWorker.cs                    | 3 +++
 .../WMS/ItemPack/ItemPackExchangeDto.cs                        | 2 +-
 .../Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml      | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs
index 10b785717..a4d163e2a 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/FawtygAutoMapperProfile.cs
@@ -105,7 +105,7 @@ public class FawtygAutoMapperProfile : Profile
             .ForMember(x => x.SupplierItemCode, y => y.MapFrom(d => d.PackCode))
             .ForMember(x => x.ItemName, y => y.MapFrom(d => d.PackName))
             .ForMember(x => x.Version, y => y.MapFrom(d => d.Remark))
-            .ForMember(x => x.SupplierPackQty, y => y.MapFrom(d => d.PackQty))
+            .ForMember(x => x.SupplierPackQty, y => y.MapFrom(d => d.Qty))
             .ForMember(x => x.SupplierPackUom, y => y.MapFrom(d => d.PackUom));
 
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs
index aea4041b4..a0762cda9 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Incoming/ProductReader.cs
@@ -102,7 +102,7 @@ public class ProductReader : IReader
             PackName = product.Name,
             Remark = product.Model,
             PackUom = product.UnitCode,
-            PackQty = Convert.ToDecimal(product.PackageCount),
+            Qty = Convert.ToDecimal(product.PackageCount),
             SupplierCode = product.SupplierCode,
         };
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
index a4ba1f8e1..2d0fb7efe 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs
@@ -42,6 +42,7 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换MesOut
         await mesOutConverter.ConvertAsync(mesOutsFromExternalList).ConfigureAwait(false);
 
+        //上海和安徽无此接口
         //Logger.LogInformation($"Read PullTask");//拉动任务
         //var pullTaskReader = workerContext.ServiceProvider.GetRequiredService<PullTaskReader>();
         //var pullTaskConverter = workerContext.ServiceProvider.GetRequiredService<PullTaskConverter>();
@@ -58,6 +59,8 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //转换Scrap
         await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
 
+
+        //上海和安徽无此接口
         //Logger.LogInformation($"Read Issue");
         //var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();
         //var pckConverter = workerContext.ServiceProvider.GetRequiredService<IssueConverter>();
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs
index 310f1eeb6..3cd336fec 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/WMS/ItemPack/ItemPackExchangeDto.cs
@@ -43,5 +43,5 @@ public class ItemPackExchangeDto
     /// 包装数量
     /// </summary>
     [Display(Name = "包装数量")]
-    public decimal PackQty { get; set; }
+    public decimal Qty { get; set; }
 }
diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
index 38ca0c85c..3ef624cd8 100644
--- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Application.Contracts/Win_in.Sfs.Wms.DataExchange.Application.Contracts.xml
@@ -696,7 +696,7 @@
             包装计量单位
             </summary>
         </member>
-        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.PackQty">
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.Qty">
             <summary>
             包装数量
             </summary>