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);
//}

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties
View File

@@ -44,6 +44,7 @@ universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25
universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7!
universal_notCreateInstMessage2=\u5149\u7535\u65E0\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
universal_notCreateInstMessage3=\u8BBE\u5907\u5F85\u673A\u6216\u4E0D\u5141\u8BB8\u8FDB\u5165
universal_notCreateInstMessage4=ddj\u5BF9\u63A5\u4F4D\u6709\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties
View File

@@ -43,3 +43,4 @@ universal_notCreateInstMessage=Instructions cannot be created because the task f
universal_notCreateInstMessage1=The electrical dispatch number is not set!
universal_notCreateInstMessage2=Photoelectric no goods, can not generate commands!
universal_notCreateInstMessage3=The device is in standby mode or is not allowed to enter
universal_notCreateInstMessage4=ddj interface bit is in stock, cannot generate command!

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties
View File

@@ -43,3 +43,4 @@ universal_notCreateInstMessage=Misi untuk divais yang diasosiasikan tidak ditemu
universal_notCreateInstMessage1=Nomor pengiriman listrik tidak diatur!
universal_notCreateInstMessage2=Photo-electric tidak tersedia dan tidak dapat menghasilkan perintah!
universal_notCreateInstMessage3=Siaga perangkat atau tidak diizinkan masuk
universal_notCreateInstMessage4=DDJ mendarat di dok, tidak ada perintah yang diberikan!

1
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties
View File

@@ -43,4 +43,5 @@ universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\
universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7!
universal_notCreateInstMessage2=\u5149\u7535\u65E0\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
universal_notCreateInstMessage3=\u8BBE\u5907\u5F85\u673A\u6216\u4E0D\u5141\u8BB8\u8FDB\u5165
universal_notCreateInstMessage4=ddj\u5BF9\u63A5\u4F4D\u6709\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!