Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

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));
 
 

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,
         };
 

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>();

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; }
 }

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>