From c7985c163fded14a1c7c88d46d2fcd4c3c63f5d4 Mon Sep 17 00:00:00 2001
From: "mingliang.tang" <mingliang.tang@ccwin-in.com>
Date: Tue, 25 Apr 2023 16:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/BackFluConverter.cs              |  2 +-
 .../Incoming/MesIncomingBackgroundWorker.cs   | 30 +++++++++----------
 ...Wms.DataExchange.Application.Contracts.xml |  5 ++++
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
index e7102b08a..602b3f018 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
@@ -50,7 +50,7 @@ public class BackFluConverter : IIncomingConverter
         var incomingToWmsDataList = await BuildIncomingToWmsOfPurchaseOrderAsync(incomingFromExternalList).ConfigureAwait(false);
         await _incomingToWmsManager.CreateManyAsync(incomingToWmsDataList).ConfigureAwait(false);
         //归档
-        await _incomingFromExternalManager.ArchiveBulkAsync(incomingFromExternalList).ConfigureAwait(false);
+        await _incomingFromExternalManager.ArchiveManyAsync(incomingFromExternalList).ConfigureAwait(false);
 
     }
 
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 ea848c915..a4ba1f8e1 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
@@ -49,14 +49,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false);
         ////转换PullTask
         //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false);
-        //Logger.LogInformation($"Read Scrap");
+        Logger.LogInformation($"Read Scrap");
 
-        //var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
-        //var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
-        ////读取并保存Scrap
-        //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
-        ////转换Scrap
-        //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
+        var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
+        var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
+        //读取并保存Scrap
+        var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
+        //转换Scrap
+        await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
 
         //Logger.LogInformation($"Read Issue");
         //var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();
@@ -66,14 +66,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
         ////转换Pck
         //await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false);
 
-        //Logger.LogInformation($"Read BackFlush");//耗用单
-        //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
-        //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
-        ////读取并保存BackFlush
-        //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
-        ////转换BackFlush
-        //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
-        //Logger.LogInformation($"Completed: Handling {Incoming}");
+        Logger.LogInformation($"Read BackFlush");//耗用单
+        var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
+        var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
+        //读取并保存BackFlush
+        var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
+        //转换BackFlush
+        await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
+        Logger.LogInformation($"Completed: Handling {Incoming}");
     }
 
 }
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 e4bc696cb..38ca0c85c 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
@@ -661,6 +661,11 @@
             回收件
             </summary>
         </member>
+        <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemBasic.ItemBasicExchangeDto.ManageType">
+            <summary>
+            管理类型
+            </summary>
+        </member>
         <member name="P:Win_in.Sfs.Wms.DataExchange.WMS.ItemPack.ItemPackExchangeDto.SupplierCode">
             <summary>
             供应商编号