diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java index 0e150e443..e21ad7fe9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java @@ -243,7 +243,7 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 ed73df2df..de8270517 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 @@ -355,7 +355,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements } catch (Exception var17) { this.iserror = true; - message = "逻辑异常, 详情查看设备日志"; + message = "universal_message14"; this.message = "逻辑异常:" + Arrays.toString(var17.getStackTrace()); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java index 012c7db35..409298cc6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java @@ -229,7 +229,7 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java index c131558f5..283330964 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java @@ -238,7 +238,7 @@ public class DoubleBeltConveyorDeviceDriver extends AbstractOpcDeviceDriver impl } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 7af699b68..4e1c3d582 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 @@ -242,7 +242,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i } } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 9ca98d95b..6d2a88b93 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 @@ -266,7 +266,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i } } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 c9df8f391..6b39fbfc5 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 @@ -297,7 +297,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 914a2247e..7ea03410d 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 @@ -287,7 +287,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 c1a0711c4..e7a3cb59e 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 @@ -402,7 +402,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } } catch (Exception e) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) 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 d84654b3f..1dedbb0ca 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 @@ -217,7 +217,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl } } catch (Exception e) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) 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 26cf88768..9a89864a8 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 @@ -243,7 +243,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } catch (Exception e) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) 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 5d2906a73..141c1fb8b 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 @@ -214,7 +214,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } catch (Exception e) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) 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 3f2218402..b063ab6c2 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 @@ -231,7 +231,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } catch (Exception e) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java index 58b15b846..e320281c7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java @@ -177,7 +177,7 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java index 191ed2f21..b712da92f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java @@ -181,7 +181,7 @@ public class StandardManipulatoDeviceDriver extends AbstractOpcDeviceDriver impl } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 50b04ccc0..1b927ee88 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 @@ -219,7 +219,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 a59e6c967..403028207 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 @@ -270,8 +270,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi } catch (Exception var17) { this.iserror = true; - this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java index b1f7345ed..05c1c91e1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java @@ -308,7 +308,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java index aee43a66d..fd4dda638 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java @@ -277,7 +277,7 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple } } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java index 84abd82d7..b139e9f1d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java @@ -200,7 +200,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 b1f8a1eb0..2335c9ab6 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 @@ -573,7 +573,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } catch (Exception var17) { this.iserror = true; - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java index 1676035ee..742211cd0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java @@ -311,7 +311,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java index 527f5be48..28c3a00f8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java @@ -145,7 +145,7 @@ public class DieManipulatorDriver extends AbstractOpcDeviceDriver implements Dev y_position = this.itemProtocol.getY_position(); } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java index 6f1a47152..fe3a2ad84 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java @@ -123,7 +123,7 @@ public class ManipulatorAgvStationDeviceDriver extends AbstractOpcDeviceDriver i this.setRequireSucess(false); } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 3f7da1c0c..eec6122fe 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -219,7 +219,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 5f7b40563..0aeb945f5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -223,7 +223,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl toSize3 = this.itemProtocol.getTo_size3(); toSize4 = this.itemProtocol.getTo_size4(); } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index dcab81d16..e9d63e3e6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -392,7 +392,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index f6d9fe1ef..b949d087f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -306,7 +306,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java index 8b3b352c8..11ed8e840 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java @@ -173,7 +173,7 @@ public class RangingStationsDeviceDriver extends AbstractOpcDeviceDriver impleme } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(devicecode) .content(this.devicecode + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java index f45df1bce..e365de80a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java @@ -116,7 +116,7 @@ public class RasterDeviceDriver extends AbstractOpcDeviceDriver implements Devic this.setRequireSucess(false); } } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index c3c12582d..93e1ef3a2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -190,7 +190,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl } catch (Exception var17) { - this.message = "逻辑异常, 详情查看设备日志"; + this.message = "universal_message14"; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) 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 392bddae2..ad0fc3c71 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 @@ -70,6 +70,7 @@ universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D universal_actionMessage6=\u5141\u8BB8\u53D6 universal_actionMessage7=\u5141\u8BB8\u653E universal_directives=\u6307\u4EE4 +universal_message14=\u903B\u8F91\u5F02\u5E38, \u8BE6\u60C5\u67E5\u770B\u8BBE\u5907\u65E5\u5FD7 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 0cdab732c..54d58cf32 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 @@ -69,5 +69,6 @@ universal_actionMessage7=\u5141\u8BB8\u653E universal_notCreateInstMessage7=ray type is empty! universal_notCreateInstMessage8=The barcode is blank\uFF01 universal_directives=Directives +universal_message14=Logic exception, see device logs for details 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 e7b7df0ab..ccf8295d1 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 @@ -69,3 +69,4 @@ universal_actionMessage7=\u5141\u8BB8\u653E universal_notCreateInstMessage7=ponypianmereka yang kosong! universal_notCreateInstMessage8=Kode batang kosong! universal_directives=Arahan +universal_message14=Kesalahan logis, lihat catatan perangkat untuk detail. 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 8684130db..fe01492e4 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 @@ -70,5 +70,6 @@ universal_notCreateInstMessage12=\u63D2\u62D4\u8F74\u5DE5\u4F4Daction!=1\uFF0C\u universal_notCreateInstMessage7=\u6258\u76D8\u7C7B\u578B\u4E3A\u7A7A! universal_notCreateInstMessage8=\u6761\u7801\u4E3A\u7A7A! universal_directives=\u6307\u4EE4 +universal_message14=\u903B\u8F91\u5F02\u5E38, \u8BE6\u60C5\u67E5\u770B\u8BBE\u5907\u65E5\u5FD7