src/main/java/com/zy/asrs/service/AgvWrkMastService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/AgvWrkMastService.java
@@ -26,4 +26,6 @@ public AgvWrkMast selectByContainerCode(String containerCode); public int callCancelTask(int wrkNo); } src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -592,6 +592,7 @@ } } if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){ //订单回滚 //List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); List<AgvWrkDetl> agvWrkDetlList1 = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); @@ -615,6 +616,7 @@ } } }); } //保存工作档以及明细 agvWrkMastLogService.save(wrkMast); @@ -625,9 +627,8 @@ throw new CoolException("删除失败,请联系管理员"); } if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10){ return; } //调用agv取消任务接口 agvWrkMastService.callCancelTask(wrkMast.getWrkNo()); } src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -31,6 +31,9 @@ @Value("${agv.taskCreatePath}") private String taskCreatePath; @Value("${agv.taskCancelPath}") private String taskCancelPath; @Value("${agv.containerMoveInPath}") private String containerMoveInPath; @@ -143,6 +146,17 @@ return this.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)); } @Override public int callCancelTask(int wrkNo) { AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam(); agvTaskCreateParam.setTaskCode(wrkNo + ""); return doHttpRequest(agvTaskCreateParam,"取消任务下发",url, taskCancelPath,null,"127.0.0.1"); } private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){ //往容器入场参数中放入源站点位置 for(AgvWrkMast agvWrkMast : agvWrkMastList){ src/main/resources/application.yml
@@ -80,6 +80,7 @@ # containerArrivedPath: /agv/containerArrived url: 192.168.103.32:8181 taskCreatePath: /rcms/services/rest/hikRpcService/genAgvSchedulingTask taskCancelPath: /rcms/services/rest/hikRpcService/cancelTask containerMoveInPath: /expand/api/moveIn/container containerMoveOutPath: /expand/api/moveOut/container containerArrivedPath: /conveyor/containerArrived