Commit 04c17349 by jiawei.su

fixedbug RepeatTasklist

parent 6ee6b282
...@@ -514,6 +514,11 @@ namespace Siger.ApiACC.Controllers ...@@ -514,6 +514,11 @@ namespace Siger.ApiACC.Controllers
var lastTask = _automationTaskList.GetList(f => f.sectionid == cleanMachine.section, "id", true).FirstOrDefault(); var lastTask = _automationTaskList.GetList(f => f.sectionid == cleanMachine.section, "id", true).FirstOrDefault();
if (lastTask != null) if (lastTask != null)
{ {
if(lastTask.action== TaskAction.Step_QXJ_LK)
{
Logger.WriteLineError($"AutoProcess 清洗机完成,上一个任务与本次任务指令重复");
return; //任务重复
}
if (lastTask.status == (int)TaskResultStatus.Complated) if (lastTask.status == (int)TaskResultStatus.Complated)
{ {
Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{cleanMachine.section} task:{TaskAction.Step_QXJ_LK.ToStr()} sn {lastTask.sn}"); Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{cleanMachine.section} task:{TaskAction.Step_QXJ_LK.ToStr()} sn {lastTask.sn}");
...@@ -531,7 +536,7 @@ namespace Siger.ApiACC.Controllers ...@@ -531,7 +536,7 @@ namespace Siger.ApiACC.Controllers
var location = SelectLocation(freeMachine.Select(s => s.machineid).ToList()); var location = SelectLocation(freeMachine.Select(s => s.machineid).ToList());
if (location != null) if (location != null)
{ {
if(RepeatTaskCheck(location.section, TaskAction.Step_LK_JGZX)) if(!RepeatTaskCheck(location.section, TaskAction.Step_LK_JGZX))
{ {
Logger.WriteLineError($"AutoProcess CNC加工中心空闲,上一个任务与本次任务指令重复"); Logger.WriteLineError($"AutoProcess CNC加工中心空闲,上一个任务与本次任务指令重复");
return; //任务已经创建 return; //任务已经创建
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment