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

opt:任务完成，取消逻辑优化；

Browse Source
This commit is contained in:
gongbaoxiong
2024-10-11 22:32:52 +08:00
parent e8c507fe11
commit 3df88a39bf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -1036,15 +1036,13 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
StrUtil.equals(entity.getInstruction_type(), "3")) { StrUtil.equals(entity.getInstruction_type(), "3")) {
ZheDaAgvService zheDaAgvService = SpringContextHolder.getBean(ZheDaAgvService.class); ZheDaAgvService zheDaAgvService = SpringContextHolder.getBean(ZheDaAgvService.class);
HttpResponse result = zheDaAgvService.deleteZDAgvInst(entity.getInstruction_code()); HttpResponse result = zheDaAgvService.deleteZDAgvInst(entity.getInstruction_code());
if (result.getStatus() == 200) { if (result.getStatus() != 200) {
flag = true; flag = false;
} else {
log.error("下发rgv取消指令动作失败,下发AGV/RGV任务失败！任务id为:{},指令号为:{}，失败原因{}", task.getTask_id(), entity.getInstruction_code(), "AGV/RGV未响应！"); log.error("下发rgv取消指令动作失败,下发AGV/RGV任务失败！任务id为:{},指令号为:{}，失败原因{}", task.getTask_id(), entity.getInstruction_code(), "AGV/RGV未响应！");
if (task != null) { if (task != null) {
task.setRemark("下发rgv取消指令动作失败！失败原因: 连接AGV/RGV未响应！"); task.setRemark("下发rgv取消指令动作失败！失败原因: 连接AGV/RGV未响应！");
taskService.update(task); taskService.update(task);
} }
flag = false;
} }
if (flag) { if (flag) {
String currentUsername = SecurityUtils.getCurrentUsername(); String currentUsername = SecurityUtils.getCurrentUsername();