|
|
@ -71,8 +71,10 @@ public class QueryZDAgvTaskStatus { |
|
|
|
//执行中
|
|
|
|
if ("BEING_PROCESSED".equals(state) || "ACTIVE".equals(state)) { |
|
|
|
if (inst != null && StrUtil.equals("0",inst.getInstruction_status())) { |
|
|
|
log.info("更新指令状态执行中---"); |
|
|
|
inst.setInstruction_status("1"); |
|
|
|
instructionService.update(inst); |
|
|
|
log.info("更新指令状态执行中成功---"); |
|
|
|
// 判断是否为WMS下发的任务,如果是反馈任务状态给WMS
|
|
|
|
TaskDto entity = taskService.findByCode(inst.getTask_code()); |
|
|
|
String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); |
|
|
@ -118,8 +120,13 @@ public class QueryZDAgvTaskStatus { |
|
|
|
// }
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
if(ObjectUtil.isEmpty(inst)){ |
|
|
|
log.info("未更新指令状态执行中,inst为空,指令号:"+ inst_code); |
|
|
|
} |
|
|
|
if(!StrUtil.equals("0",inst.getInstruction_status())){ |
|
|
|
log.info("未更新指令状态执行中,inst状态:"+ inst.getInstruction_status()); |
|
|
|
} |
|
|
|
} |
|
|
|
} else if ("FINISHED".equals(state)) { |
|
|
|
if (inst != null) { |
|
|
|