From 73c0fee1b240bc505b31ef09619d3f5ae76c158d Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Mon, 29 Jul 2024 17:02:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20kep=E6=96=AD=E8=BF=9E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conveyor/belt_conveyor/BeltConveyorDeviceDriver.java | 3 ++- .../device_driver/conveyor/belt_conveyor/ItemProtocol.java | 3 +-- .../BoxStorageOutConveyorDeviceDriver.java | 2 +- .../one_conveyor/box_storage_out_conveyor/ItemProtocol.java | 2 +- .../BoxSubvolumesConveyorDeviceDriver.java | 2 +- .../one_conveyor/box_subvolumes_conveyor/ItemProtocol.java | 2 +- .../FinishedProductOutBindLableDeviceDriver.java | 2 +- .../ItemProtocol.java | 2 +- .../one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java | 2 +- .../one_conveyor/fold_disc_site/ItemProtocol.java | 2 +- .../ConveyorWithScannerWeightDeviceDriver.java | 2 +- .../one_conveyor/scanner_weight_conveyor/ItemProtocol.java | 2 +- .../one_conveyor/un_box_lable_conveyor/ItemProtocol.java | 2 +- .../un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java | 2 +- .../BoxPackageManipulatorDeviceDriver.java | 4 ++-- .../one_manipulator/box_package_manipulator/ItemProtocol.java | 2 +- .../BoxStorageManipulatorDeviceDriver.java | 2 +- .../one_manipulator/box_storage_manipulator/ItemProtocol.java | 2 +- .../one_manipulator/return_good_manipulator/ItemProtocol.java | 2 +- .../ReturnGoodManipulatorDeviceDriver.java | 2 +- .../one_manipulator/trapped_manipulator/ItemProtocol.java | 2 +- .../TrappedManipulatorManipulatorDeviceDriver.java | 2 +- .../one_manipulator/volume_two_manipulator/ItemProtocol.java | 2 +- .../VolumeTwoManipulatorManipulatorDeviceDriver.java | 1 + .../device_driver/stacker/standard_stacker/ItemProtocol.java | 2 +- .../stacker/standard_stacker/StandardStackerDeviceDriver.java | 3 +-- .../resources/language/monitor/universal/universal.properties | 1 + .../language/monitor/universal/universal_en_US.properties | 1 + .../language/monitor/universal/universal_in_ID.properties | 1 + .../language/monitor/universal/universal_zh_CN.properties | 2 ++ 30 files changed, 33 insertions(+), 28 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index 45352630c..c8efa7ec1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -288,6 +288,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements case 2: //申请任务 if (move == 1 && !requireSucess) { + instruction_require(); } else { String remark = ""; @@ -335,7 +336,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; var17.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index 26622022e..6ade53379 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -139,8 +139,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; - + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java index 447d805a4..34387b0e2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java @@ -246,7 +246,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; var17.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/ItemProtocol.java index 00b127add..3b2280fa4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/ItemProtocol.java @@ -139,7 +139,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java index 0bbac9a6f..029854b35 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java @@ -269,7 +269,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; var17.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java index 7755f3bf1..e4a73a0df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java @@ -142,7 +142,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index 6b7c55273..df7be278f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -301,7 +301,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; var17.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java index 9c7b234ea..431b69ae0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java @@ -194,7 +194,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index 1d0c8837c..690f7df9d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -294,7 +294,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; var17.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/ItemProtocol.java index 79e29d781..9eb52f605 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/ItemProtocol.java @@ -112,7 +112,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } public String getOpcStringValue(String protocol) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 7428930ee..a81f7c358 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -380,7 +380,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; e.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java index 80be9bce6..44a44af4d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java @@ -178,7 +178,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/ItemProtocol.java index 32abccf20..afd79aab3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/ItemProtocol.java @@ -178,7 +178,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java index cef1b3ca3..42b12c165 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java @@ -219,7 +219,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "读取信号值时出现异常"; e.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java index 343524224..1b6f9e63a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java @@ -201,7 +201,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i //有报警 } else if (error != 0) { this.setIserror(true); - message = "有报警"; + message = "universal_message3"; //无报警 } else { this.setIsonline(true); @@ -249,7 +249,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "universal_remark8"; e.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java index 0ed37036a..72631610d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java @@ -211,7 +211,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index 338fd3362..91aafc638 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java @@ -220,7 +220,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "universal_remark8"; e.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java index 78d04d793..690c347a2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java @@ -199,7 +199,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } public String getOpcStringValue(String protocol) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ItemProtocol.java index fb5ca6ccd..056428b0e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ItemProtocol.java @@ -184,7 +184,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } public static List getReadableItemDtos() { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java index ea1ef6f8e..a4c5205b7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java @@ -234,7 +234,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); - + message = "universal_remark8"; e.printStackTrace(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/ItemProtocol.java index 95d2147f3..5c067254a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/ItemProtocol.java @@ -182,7 +182,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } public float getOpcFloatValue(String protocol) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java index 3af5f930c..022265f1c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java @@ -226,7 +226,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); var17.printStackTrace(); - + message = "universal_remark8"; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/ItemProtocol.java index ba1bafc0b..ee19a35a1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/ItemProtocol.java @@ -177,7 +177,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } public float getOpcFloatValue(String protocol) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java index 2db780f9b..510cee25a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java @@ -267,6 +267,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); var17.printStackTrace(); + message = "universal_remark8"; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java index 2ab327c17..76fce8b80 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java @@ -273,7 +273,7 @@ public class ItemProtocol { setIsonline(true); return value; } - return 0; + return value; } public String getOpcStringValue(String protocol) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 1b04826a9..c4ea274e3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -581,6 +581,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); + message = "universal_remark8"; var17.printStackTrace(); } @@ -749,7 +750,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme .build(); logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); - this.message = "申请更新点位,参数,接口返回:" + jo; String poinCode = jo.getString("point_code"); String vehicleCode = jo.getString("vehicle_code"); if (StrUtil.isNotEmpty(poinCode)) { @@ -793,7 +793,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme .build(); logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); - this.message = "申请更新点位,参数,接口返回:" + jo; } } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties index 1b7dfeda7..47884646c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties @@ -23,6 +23,7 @@ universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002 universal_remark6=\u524D\u5DE5\u4F4D\u6709\u8D27 universal_remark7=\u540E\u5DE5\u4F4D\u6709\u8D27 +universal_remark8=\u8BFB\u53D6\u4FE1\u53F7\u503C\u65F6\u51FA\u73B0\u5F02\u5E38 universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA universal_message1=\u653E\u8D27\u5B8C\u6210 universal_message2=\u653E\u8D27\u5931\u8D25 diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties index 1df6b3a7d..42f228407 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties @@ -24,6 +24,7 @@ universal_remark4=The current report task ID should be 0 universal_remark5=Right-click the icon and change the Request task reset flag (requireSucess) to No universal_remark6=The front station is in stock universal_remark7=The rear station is in stock +universal_remark8=An exception occurred while reading the signal value universal_message1=Release completed universal_message2=Delivery failure universal_message3=Have an alarm diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties index cbbd36815..306c5ded9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties @@ -22,6 +22,7 @@ universal_remark4=Kita tugaskan tugaskan task universal_remark5=Klik kanan pada ikon dan ubah not (requicess) untuk penugasan ulang universal_remark6=Stasiun depan tersedia universal_remark7=Stasiun belakang tersedia +universal_remark8=Sebuah anomali muncul ketika membaca nilai sinyal universal_message1=Pengiriman selesai universal_message2=Gagal memasukkan barang universal_message3=Alarm berbunyi diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties index 580362714..9eec832e4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties @@ -22,6 +22,8 @@ universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002 universal_remark6=\u524D\u5DE5\u4F4D\u6709\u8D27 universal_remark7=\u540E\u5DE5\u4F4D\u6709\u8D27 +universal_remark8=\u8BFB\u53D6\u4FE1\u53F7\u503C\u65F6\u51FA\u73B0\u5F02\u5E38 + universal_message1=\u653E\u8D27\u5B8C\u6210 universal_message2=\u653E\u8D27\u5931\u8D25 universal_message3=\u6709\u62A5\u8B66