|
@ -879,8 +879,10 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu |
|
|
|
|
|
|
|
|
} else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) { |
|
|
} else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) { |
|
|
// NDC agv指令不当场取消指令,需要等agv上报
|
|
|
// NDC agv指令不当场取消指令,需要等agv上报
|
|
|
|
|
|
if (!StrUtil.isEmpty(entity.getAgv_jobno())) { |
|
|
ndcAgvService.deleteAgvInstToNDC(entity); |
|
|
ndcAgvService.deleteAgvInstToNDC(entity); |
|
|
flag = true; |
|
|
} |
|
|
|
|
|
flag = true; |
|
|
} else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3") |
|
|
} else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3") |
|
|
&& !StrUtil.equals(entity.getSend_status(), "2")) { |
|
|
&& !StrUtil.equals(entity.getSend_status(), "2")) { |
|
|
XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class); |
|
|
XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class); |
|
|