Browse Source

更新

master
gengby 2 years ago
parent
commit
64277c28f7
  1. 12
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
  2. 8
      acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

12
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java

@ -185,6 +185,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} else {
log.warn("指令号:{},acs请求wms取货申请失败,连接被拒绝,未反馈agv允许取货", inst.getInstruction_code());
}
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
log.info("指令号:{},无需反馈wms申请取货状态,已反馈agv允许取货", inst.getInstruction_code());
}
//取货完毕
@ -240,6 +243,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} else {
log.warn("指令号:{},acs反馈wms取货完成失败,连接被拒绝,未反馈agv取货完成", inst.getInstruction_code());
}
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
log.info("指令号:{},无需反馈wms取货完成状态,已反馈agv取货完成", inst.getInstruction_code());
}
//到达放货点
@ -291,6 +297,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} else {
log.warn("指令号:{},acs请求wms放货申请失败,连接被拒绝,未反馈agv允许放货", inst.getInstruction_code());
}
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
log.info("指令号:{},无需反馈wms申请放货状态,已反馈agv允许放货", inst.getInstruction_code());
}
//放货完毕
//(需要WCS反馈)
@ -342,6 +351,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} else {
log.warn("指令号:{},acs请求wms放货完成失败", inst.getInstruction_code());
}
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
log.info("指令号:{},无需反馈wms放货完成,已反馈agv放货完成", inst.getInstruction_code());
}
}

8
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@ -368,14 +368,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
&& ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
} else {
// Boolean result = createLkInst(task.getStorage_task_type(),dto);
Resp resp = acsToLiKuService.sendInst(task.getStorage_task_type(), dto);
if (StrUtil.equals(resp.result, "true")) {
dto.setSend_status("1");
} else {
dto.setSend_status("2");
}
}
}
} catch (Exception e) {

Loading…
Cancel
Save