From 678b569be2a0d44b80f2d760f477c033865925d3 Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Fri, 24 May 2024 10:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=86=E8=A7=89=E5=8F=AB?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Incoming/InjectionMoldingRequestReader.cs | 25 +++++++++++++++----
 ...tionMoldingTaskIncomingBackgroundWorker.cs | 10 ++++++++
 .../appsettings.json                          |  3 ---
 .../InjectionIssueRequestAppService.cs        |  2 +-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
index 6a4ff413a..83e26df0c 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingRequestReader.cs
@@ -64,12 +64,17 @@ public class InjectionMoldingRequestReader : IReader
     {  
         try
         {
-            var sleepTime = (_options.Value.AutoRemote.TimeCycle*60/ _options.Value.AutoRemote.Interval)-10;
+#if DEBUG
+            _options.Value.AutoRemote.TimeCycle = 1;
+            _options.Value.AutoRemote.Interval = 2;
+
+#endif
+                       // var sleepTime = (_options.Value.AutoRemote.TimeCycle*60/ _options.Value.AutoRemote.Interval)-10;
             var invterval = _options.Value.AutoRemote.Interval;
 
             var successTime = 0;
 
-
+            var guid = DateTime.Now.ToString("yyyyMMddHHmmssfff");
 
 
             for (int i = 0; i <invterval; i++)
@@ -98,9 +103,17 @@ public class InjectionMoldingRequestReader : IReader
                     camralist.AddRange(idsList);
                 }
                 successTime++;
+                sw.Stop();
+                _logger.LogInformation($"读取标识{guid}读取成功次数{successTime},耗时 {sw.ElapsedMilliseconds}毫秒");
+                Thread.Sleep(1000);
+               
+
+
                 if (successTime == invterval)
                 {
+                     sw = Stopwatch.StartNew();
 
+                    _logger.LogInformation($"开始标识{guid}同步WMS开始");
                     List<UnCompletedRequestDto> inputdetail = new List<UnCompletedRequestDto>();
                     foreach (var item in camralist)
                     {
@@ -166,14 +179,16 @@ public class InjectionMoldingRequestReader : IReader
                         }
                         // 创建新的注塑请求并将数据写入数据库
                         await _injectionRequest.CreateAsync(input).ConfigureAwait(false);
+
                     }
+                    _logger.LogInformation($"标识{guid}同步WMS结束,耗时{sw.ElapsedMilliseconds  }毫秒");
                 }
                 else
                 {
-                    Thread.Sleep(sleepTime * 1000);
+                    Thread.Sleep(1000);
                 }
-                sw.Stop();
-                _logger.LogInformation($"读取成功次数{successTime},耗时 ${sw.ElapsedMilliseconds / 1000 / 60}分钟");
+              
+            
             }
 
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs
index 146a50cca..6f9e10808 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs
@@ -23,7 +23,17 @@ public class InjectionMoldingTaskIncomingBackgroundWorker : AsyncPeriodicBackgro
         IServiceScopeFactory serviceScopeFactory
     ) : base(timer, serviceScopeFactory)
     {
+
+
+
         _options = options;
+#if DEBUG
+        _options.Value.AutoRemote.TimeCycle = 1;
+        _options.Value.AutoRemote.Interval = 2;
+
+#endif
+
+
         Timer.Period = options.Value.AutoRemote.TimeCycle * 60 * 1000; //default 10 minutes
     }
 
diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json
index 6924783cf..dfe3dc659 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/appsettings.json
@@ -72,10 +72,7 @@
       "Password": "",
       "Token": "",
       "AreaIDs": "1",
-
-   
       "Interval" : "3", // interval
-
       "TimeCycle" :"5"
     },
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs
index 545cc625b..84b15b9be 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs
@@ -398,7 +398,7 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
     #region 视觉使用
 
     /// <summary>
-    ///     获取已完成的叫料单数量
+    /// 获取已完成的叫料单数量
     /// </summary>
     /// <returns></returns>
     [HttpPost("get-uncompleted-request")]