change-灌注提交

dev
liuwf 11 months ago
parent bc67c93772
commit 9784270756

@ -62,6 +62,7 @@ namespace Aucam.Core.PerfusionService
//PLC //PLC
services.AddPlcSetup(); services.AddPlcSetup();
services.AddAucmaTaskSetup();
//支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030") //支持编码大全 例如:支持 System.Text.Encoding.GetEncoding("GB2312") System.Text.Encoding.GetEncoding("GB18030")
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
} }
@ -82,15 +83,15 @@ namespace Aucam.Core.PerfusionService
/// </summary> /// </summary>
/// <param name="app"></param> /// <param name="app"></param>
/// <param name="env"></param> /// <param name="env"></param>
public void Configure(IApplicationBuilder app, ISysTasksQzService tasksQzService, public void Configure(IApplicationBuilder app, IAucamTaskService aucamTaskService, IRunPlcService runPlcService) // ISysTasksQzService tasksQzService,ISchedulerCenter schedulerCenter, IRunPlcService runPlcService
ISchedulerCenter schedulerCenter, IRunPlcService runPlcService)
{ {
// 使用静态文件 // 使用静态文件
app.UseStaticFiles(); app.UseStaticFiles();
// 然后是授权中间件 // 然后是授权中间件
//app.UseAuthorization(); //app.UseAuthorization();
// 开启QuartzNetJob调度服务 // 开启QuartzNetJob调度服务
app.UseQuartzJobMildd(tasksQzService, schedulerCenter); // app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
app.AucmaTaskMildds(aucamTaskService);
//PLC //PLC
app.UsePlcMildd(runPlcService); app.UsePlcMildd(runPlcService);
} }

@ -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)) if (temprRecord == null || temprRecord.PerfusionBoxCode != record.PerfusionBoxCode || (temprRecord.PerfusionBoxCode == record.PerfusionBoxCode && temprRecord.PerfusionResult != record.PerfusionResult))
{ {
@ -98,7 +98,7 @@ namespace Aucma.Core.Tasks.Business
} }
} }
} // }
} }

Loading…
Cancel
Save