root/sanShiJi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
gengby
2022-10-27 20:19:39 +08:00
parent 5afce45114
commit ccbd60dafa
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hd/nladmin-system/src/main/java/org/nl/hand/assj/service/impl/SSJHandServiceImpl.java
View File

@@ -926,18 +926,15 @@ public class SSJHandServiceImpl implements SSJHandService {
3 强制完成*/ 3 强制完成*/
if (type.equals("1")) { if (type.equals("1")) {
//调用agv删除任务的接口 //调用agv删除任务的接口
agvService = SpringContextHolder.getBean("agvServiceImpl");
instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class);
try { try {
//agvService.deleteAgvInst(instwo.getString("instruction_code")); agvService.deleteAgvInst(instwo.getString("instruction_code"));
if (StrUtil.isEmpty(instdto.getAgv_jobno())) { instructionService.cancel(inst_uuid);
instructionService.cancelNOSendAgv(inst_uuid);
} else {
agvService.deleteAgvInst(instdto.getInstruction_code());
}
} catch (Exception e) { } catch (Exception e) {
jo.put("code", "2"); jo.put("code", "2");
jo.put("desc", "下发agv失败"); jo.put("desc", e.getMessage());
jo.put("result", ""); jo.put("result", "");
return jo; return jo;
} }