Commit c4e2b425 authored by zhoumaotao's avatar zhoumaotao

2

parent 4b9df0e9
...@@ -514,12 +514,14 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe ...@@ -514,12 +514,14 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
agvtaskService.insert(agvtask); agvtaskService.insert(agvtask);
messageService.msgPush("SUPERUSER", "task", "工位【" + gw.getName() + "】开始叫料"); //messageService.msgPush("SUPERUSER", "task", "工位【" + gw.getName() + "】开始叫料");
if(allowedMap(gw)){ if(allowedMap(gw)){
voiceService.submit(new VoiceTask(gw.getName() + "正在叫料"), true); voiceService.submit(new VoiceTask(gw.getName() + "正在叫料"), true);
} }
logger.info("MES任务单号:"+workingTask.getTaskCode()+ "远程确认成功!");
}finally { }finally {
LockUtils.releaseLock(lockKey, uniqueKey); LockUtils.releaseLock(lockKey, uniqueKey);
} }
...@@ -572,7 +574,7 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe ...@@ -572,7 +574,7 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
agvtask.setTaskStatus("6"); //继续执行 agvtask.setTaskStatus("6"); //继续执行
agvtaskService.update(agvtask); agvtaskService.update(agvtask);
logger.info("MES任务单号:"+workingTask.getTaskCode()+ "确认成功!"); logger.info("MES任务单号:"+workingTask.getTaskCode()+ "远程确认成功!");
} }
...@@ -613,7 +615,8 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe ...@@ -613,7 +615,8 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
task.setCancelDate(Calendar.getInstance().getTime()); task.setCancelDate(Calendar.getInstance().getTime());
agvtaskService.update(task); agvtaskService.update(task);
messageService.msgPush("SUPERUSER", "task", "工位【" + gw.getName() + "】取消叫料"); logger.info("MES任务单号:"+workingTask.getTaskCode()+ "远程确认成功!");
//messageService.msgPush("SUPERUSER", "task", "工位【" + gw.getName() + "】取消叫料");
} }
@Override @Override
......
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