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

fix: 添加堆垛机,下发信号日志

Browse Source
This commit is contained in:
yanps
2025-02-05 16:13:31 +08:00
parent bd646840ea
commit ae085f825a
7 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
View File

@@ -184,22 +184,24 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到指令号{}对应的指令", ikey);
} else {
String agvcar = inst.getCarno();
Device agvDevice = deviceAppService.findDeviceByCode(agvcar);
if (agvDevice != null) {
if (agvDevice.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) {
agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) agvDevice.getDeviceDriver();
agvNdcTwoDeviceDriver.setInstruction(null);
if("1".equals(inst.getInstruction_type()) || "2".equals(inst.getInstruction_type()) || "3".equals(inst.getInstruction_type())) {
String agvcar = inst.getCarno();
Device agvDevice = deviceAppService.findDeviceByCode(agvcar);
if (agvDevice != null) {
if (agvDevice.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) {
agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) agvDevice.getDeviceDriver();
agvNdcTwoDeviceDriver.setInstruction(null);
}
}
inst.setInstruction_status("2");
try {
instructionService.finish(inst);
} catch (Exception e) {
e.printStackTrace();
}
// ndc会向A1和A2都上报反馈任务完成
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
}
inst.setInstruction_status("2");
try {
instructionService.finish(inst);
} catch (Exception e) {
e.printStackTrace();
}
// ndc会向A1和A2都上报反馈任务完成
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
}
}
//请求删除任务

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2Defination.java
View File

@@ -11,7 +11,7 @@ import java.util.LinkedList;
import java.util.List;
/**
* 油漆线
* 纸管库
*/
@Service
public class PaperTubeConveyor2Defination implements OpcDeviceDriverDefination {