From 9784270756d810ec992187765556a2c0ab072c09 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 14 Mar 2024 16:03:38 +0800
Subject: [PATCH] =?UTF-8?q?change-=E7=81=8C=E6=B3=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucam.Core.PerfusionService/Startup.cs           | 7 ++++---
 Aucma.Core.Tasks/Business/PerfusionCollection.cs | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Aucam.Core.PerfusionService/Startup.cs b/Aucam.Core.PerfusionService/Startup.cs
index e1427155..80e30841 100644
--- a/Aucam.Core.PerfusionService/Startup.cs
+++ b/Aucam.Core.PerfusionService/Startup.cs
@@ -62,6 +62,7 @@ namespace Aucam.Core.PerfusionService
             //PLC
             services.AddPlcSetup();
 
+            services.AddAucmaTaskSetup();
             //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312")  System.Text.Encoding.GetEncoding("GB18030") 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
@@ -82,15 +83,15 @@ namespace Aucam.Core.PerfusionService
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, 
-            ISchedulerCenter schedulerCenter, IRunPlcService runPlcService)
+        public void Configure(IApplicationBuilder app, IAucamTaskService aucamTaskService, IRunPlcService runPlcService)  // ISysTasksQzService tasksQzService,ISchedulerCenter schedulerCenter, IRunPlcService runPlcService
         {
             // 使用静态文件
             app.UseStaticFiles();
             // 然后是授权中间件
             //app.UseAuthorization();
             // 开启QuartzNetJob调度服务
-            app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
+            //  app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
+            app.AucmaTaskMildds(aucamTaskService);
             //PLC
             app.UsePlcMildd(runPlcService);
         }
diff --git a/Aucma.Core.Tasks/Business/PerfusionCollection.cs b/Aucma.Core.Tasks/Business/PerfusionCollection.cs
index b7e5aa65..0e56c570 100644
--- a/Aucma.Core.Tasks/Business/PerfusionCollection.cs
+++ b/Aucma.Core.Tasks/Business/PerfusionCollection.cs
@@ -85,8 +85,8 @@ namespace Aucma.Core.Tasks.Business
                          
 
                             //鍏呮敞缁撴潫
-                            if (record.PerfusionFinishStatus == "1")
-                            {
+                        //    if (record.PerfusionFinishStatus == "1")
+                         //   {
                                 // 绠变綋鐮佸拰涓婃涓嶄竴鏍凤紝鎴栬�呯浣撶爜涓�鏍蜂絾鏄厖閾哥粨鏋滀笉涓�鏍�
                                  if (temprRecord == null || temprRecord.PerfusionBoxCode != record.PerfusionBoxCode || (temprRecord.PerfusionBoxCode == record.PerfusionBoxCode && temprRecord.PerfusionResult != record.PerfusionResult))
                                 {
@@ -98,7 +98,7 @@ namespace Aucma.Core.Tasks.Business
                                        
                                     }
                                 }
-                            }
+                         //  }
 
 
                         }