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
///
///
///
- 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
}
}
- }
+ // }
}