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

fix: 大屏监控显示修复

Browse Source
This commit is contained in:
LENOVO
2024-04-23 16:30:37 +08:00
parent f1687753ad
commit 513d16a8f6
7 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
View File

@@ -603,18 +603,21 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
} else {
next_point_code = next_device_code;
}
//判断ddj对接位是否有光电信号
//判断是否存在终点到达ddj对接位的指令
Instruction byNextDeviceCodeDDJ = instructionService.findByNextDeviceCodeFromCache(next_device_code);
if (ObjectUtil.isNotEmpty(byNextDeviceCodeDDJ)) {
this.setNotCreateInstMessage("存在终点到达ddj对接位的指令");
}
//判断下一个输送线点位是否有货
BeltConveyorDeviceDriver beltConveyorDeviceDriver;
if (nextdevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextdevice.getDeviceDriver();
if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) {
log.error("输送机,{}未联机或执行中", next_device_code);
this.setNotCreateInstMessage("universal_notCreateInstMessage4");
return false;
}
}
Instruction instdto = new Instruction();
packageData(instdto, route_plan_code, taskdto, taskid, taskcode, start_device_code, next_device_code, start_point_code, next_point_code, priority, containerType);
log.error("=================================,{}", instdto.getCreate_by());

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java
View File

@@ -260,13 +260,13 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
remark = "universal_remark3";
}
if (task != 0) {
remark = remark + LangProcess.msg("universal_remark4");
remark = LangProcess.msg("universal_remark4");
if (ObjectUtil.isNotEmpty(this.inst)) {
this.inst = null;
}
}
if (requireSucess) {
remark = remark + LangProcess.msg("universal_remark5");
remark = LangProcess.msg("universal_remark5");
}
this.setNotCreateTaskMessage(remark);
//}

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java
View File

@@ -218,13 +218,13 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
remark = "universal_remark3";
}
if (task != 0) {
remark = remark + LangProcess.msg("universal_remark4");
remark = LangProcess.msg("universal_remark4");
if (ObjectUtil.isNotEmpty(this.inst)) {
this.inst = null;
}
}
if (requireSucess) {
remark = remark + LangProcess.msg("universal_remark5");
remark = LangProcess.msg("universal_remark5");
}
this.setNotCreateTaskMessage(remark);
//}