fix :国际化修改

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java

@@ -272,21 +272,21 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
-                        remark = remark + LangProcess.msg("universal_remark2");
+                        remark = remark + "universal_remark2";
                     }
                     if (move != 0) {
-                        remark = remark +  LangProcess.msg("universal_remark3");
+                        remark = remark +  "universal_remark3";
                     }
                     if (task != 0) {
-                        remark = remark + "当前上报任务号(task)应该为0,";
+                        remark = remark + "universal_remark4";
                         if (ObjectUtil.isNotEmpty(this.inst)) {
                             this.inst = null;
                         }
                     }
                     if (requireSucess) {
-                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                        remark = remark + "universal_remark5";
                     }
                     this.setNotCreateTaskMessage(remark);
                     //}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/manipulator/standard_manipulator/BlankManipulatorDeviceDriver.java

@@ -268,13 +268,13 @@
 //                        remark = remark + "光电信号(move)为有货状态,";
 //                    }
 //                    if (task != 0) {
-//                        remark = remark + "当前上报任务号(task)应该为0,";
+//                        remark = remark + "universal_remark4";
 //                        if (ObjectUtil.isNotEmpty(this.inst)) {
 //                            this.inst = null;
 //                        }
 //                    }
 //                    if (requireSucess) {
-//                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+//                        remark = remark + "universal_remark5";
 //                    }
 //                    this.setNotCreateTaskMessage(remark);
 //                    //}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/manipulator/standard_manipulator/DryManipulatorDeviceDriver.java

@@ -267,13 +267,13 @@
 //                        remark = remark + "光电信号(move)为有货状态,";
 //                    }
 //                    if (task != 0) {
-//                        remark = remark + "当前上报任务号(task)应该为0,";
+//                        remark = remark + "universal_remark4";
 //                        if (ObjectUtil.isNotEmpty(this.inst)) {
 //                            this.inst = null;
 //                        }
 //                    }
 //                    if (requireSucess) {
-//                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+//                        remark = remark + "universal_remark5";
 //                    }
 //                    this.setNotCreateTaskMessage(remark);
 //                    //}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/manipulator/standard_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -273,13 +273,13 @@
 //                        remark = remark + "光电信号(move)为有货状态,";
 //                    }
 //                    if (task != 0) {
-//                        remark = remark + "当前上报任务号(task)应该为0,";
+//                        remark = remark + "universal_remark4";
 //                        if (ObjectUtil.isNotEmpty(this.inst)) {
 //                            this.inst = null;
 //                        }
 //                    }
 //                    if (requireSucess) {
-//                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+//                        remark = remark + "universal_remark5";
 //                    }
 //                    this.setNotCreateTaskMessage(remark);
 //                    //}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java

@@ -185,7 +185,6 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
             }
 
             if (move != 0 && task > 0) {
-
                 update_instruction_status();
             }
         } catch (Exception var17) {

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

@@ -240,12 +240,12 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
-                        remark = remark + LangProcess.msg("universal_remark2");
+                        remark = remark + "universal_remark2";
                     }
                     if (move != 0) {
-                        remark = remark +  LangProcess.msg("universal_remark3");
+                        remark = remark +  "universal_remark3";
                     }
                     if (task != 0) {
                         remark = remark + LangProcess.msg("universal_remark4");

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -261,12 +261,12 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
-                        remark = remark + LangProcess.msg("universal_remark2");
+                        remark = remark + "universal_remark2";
                     }
                     if (move != 0) {
-                        remark = remark +  LangProcess.msg("universal_remark3");
+                        remark = remark +  "universal_remark3";
                     }
                     if (task != 0) {
                         remark = remark + LangProcess.msg("universal_remark4");

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -214,21 +214,21 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     feedMessage = "";
                 }
             } else {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
-                        remark = remark + LangProcess.msg("universal_remark2");
+                        remark = remark + "universal_remark2";
                     }
                     if (move != 0) {
-                        remark = remark +  LangProcess.msg("universal_remark3");
+                        remark = remark +  "universal_remark3";
                     }
                     if (task != 0) {
-                        remark = remark + "当前上报任务号(task)应该为0,";
+                        remark = remark + "universal_remark4";
                         if (ObjectUtil.isNotEmpty(this.inst)) {
                             this.inst = null;
                         }
                     }
                     if (requireSucess) {
-                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                        remark = remark + "universal_remark5";
                     }
                     this.setNotCreateTaskMessage(remark);
             }
@@ -341,9 +341,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         Map<String, Object> map1 = new HashMap<>();
@@ -377,9 +379,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
@@ -421,7 +425,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         this.setRequireSucess(true);
                         return true;
                     } else {
-                        notCreateInstMessage = "未找到关联设备的任务，指令无法创建";
+                        notCreateInstMessage = "universal_notCreateInstMessage";
                     }
                 }
             }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java

@@ -188,21 +188,21 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     feedMessage = "";
                 }
             } else {
-                String remark =  LangProcess.msg("universal_remark1");
+                String remark =  "";;
                 if (mode != 2) {
-                    remark = remark + LangProcess.msg("universal_remark2");
+                    remark = remark + "universal_remark2";
                 }
                 if (move != 0) {
-                    remark = remark + LangProcess.msg("universal_remark3");
+                    remark = remark + "universal_remark3";
                 }
                 if (task != 0) {
-                    remark = remark + "当前上报任务号(task)应该为0,";
+                    remark = remark + "universal_remark4";
                     if (ObjectUtil.isNotEmpty(this.inst)) {
                         this.inst = null;
                     }
                 }
                 if (requireSucess) {
-                    remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                    remark = remark + "universal_remark5";
                 }
                 this.setNotCreateTaskMessage(remark);
             }
@@ -303,9 +303,11 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         Map<String, Object> map1 = new HashMap<>();
@@ -339,9 +341,11 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
@@ -384,7 +388,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         this.setRequireSucess(true);
                         return true;
                     } else {
-                        notCreateInstMessage = LangProcess.msg("universal_notCreateInstMessage");
+                        notCreateInstMessage = "universal_notCreateInstMessage";
                     }
                 }
             }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java

@@ -198,21 +198,21 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     feedMessage = "";
                 }
             } else {
-                String remark = LangProcess.msg("universal_remark1");
+                String remark = "";;
                 if (mode != 2) {
-                    remark = remark + LangProcess.msg("universal_remark2");
+                    remark = remark + "universal_remark2";
                 }
                 if (move != 0) {
-                    remark = remark +  LangProcess.msg("universal_remark3");
+                    remark = remark +  "universal_remark3";
                 }
                 if (task != 0) {
-                    remark = remark + "当前上报任务号(task)应该为0,";
+                    remark = remark + "universal_remark4";
                     if (ObjectUtil.isNotEmpty(this.inst)) {
                         this.inst = null;
                     }
                 }
                 if (requireSucess) {
-                    remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                    remark = remark + "universal_remark5";
                 }
                 this.setNotCreateTaskMessage(remark);
             }
@@ -323,9 +323,13 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
+
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
+
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         Map<String, Object> map1 = new HashMap<>();
@@ -359,9 +363,11 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
@@ -404,7 +410,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         this.setRequireSucess(true);
                         return true;
                     } else {
-                        notCreateInstMessage = "未找到关联设备的任务，指令无法创建";
+                        notCreateInstMessage = "universal_notCreateInstMessage";
                     }
                 }
             }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java

@@ -196,7 +196,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
                     feedMessage = "";
                 }
             } else {
-                String remark = LangProcess.msg("universal_remark1");
+                String remark = "";;
                 if (mode != 2) {
                     remark = remark + "工作模式(mode)不是待机状态,";
                 }
@@ -204,13 +204,13 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
                     remark = remark + "光电信号(move)为有货状态,";
                 }
                 if (task != 0) {
-                    remark = remark + "当前上报任务号(task)应该为0,";
+                    remark = remark + "universal_remark4";
                     if (ObjectUtil.isNotEmpty(this.inst)) {
                         this.inst = null;
                     }
                 }
                 if (requireSucess) {
-                    remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                    remark = remark + "universal_remark5";
                 }
                 this.setNotCreateTaskMessage(remark);
             }
@@ -319,9 +319,11 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         Map<String, Object> map1 = new HashMap<>();
@@ -356,9 +358,11 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
@@ -402,7 +406,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
                         this.setRequireSucess(true);
                         return true;
                     } else {
-                        notCreateInstMessage = "未找到关联设备的任务，指令无法创建";
+                        notCreateInstMessage = "universal_notCreateInstMessage";
                     }
                 }
             }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java

@@ -216,21 +216,21 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
                     feedMessage = "";
                 }
             } else {
-                String remark = LangProcess.msg("universal_remark1");
+                String remark = "";
                 if (mode != 2) {
-                    remark = remark + LangProcess.msg("universal_remark2");
+                    remark = remark + "universal_remark2";
                 }
                 if (move != 0) {
-                    remark = remark +  LangProcess.msg("universal_remark3");
+                    remark = remark +  "universal_remark3";
                 }
                 if (task != 0) {
-                    remark = remark + "当前上报任务号(task)应该为0,";
+                    remark = remark + "universal_remark4";
                     if (ObjectUtil.isNotEmpty(this.inst)) {
                         this.inst = null;
                     }
                 }
                 if (requireSucess) {
-                    remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                    remark = remark + "universal_remark5";
                 }
                 this.setNotCreateTaskMessage(remark);
             }
@@ -343,9 +343,11 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
                         String start_addr = startDevice.getExtraValue().get("address").toString();
                         String next_addr = nextDevice.getExtraValue().get("address").toString();
                         if (ObjectUtil.isEmpty(start_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         if (ObjectUtil.isEmpty(next_addr)) {
+                            notCreateInstMessage = "universal_notCreateInstMessage1";
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
                         Map<String, Object> map1 = new HashMap<>();
@@ -415,7 +417,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
                         }
                         return true;
                     } else {
-                        notCreateInstMessage = "未找到关联设备的任务，指令无法创建";
+                        notCreateInstMessage = "universal_notCreateInstMessage";
                     }
                 }
             }
@@ -465,9 +467,11 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
             String start_addr2 = startDevice2.getExtraValue().get("address").toString();
             String next_addr2 = nextDevice2.getExtraValue().get("address").toString();
             if (ObjectUtil.isEmpty(start_addr2)) {
+                notCreateInstMessage = "universal_notCreateInstMessage1";
                 throw new BadRequestException("设备：" + startDevice2.getDevice_code() + "未设置电气调度号！");
             }
             if (ObjectUtil.isEmpty(next_addr2)) {
+                notCreateInstMessage = "universal_notCreateInstMessage1";
                 throw new BadRequestException("设备：" + nextDevice2.getDevice_code() + "未设置电气调度号！");
             }
             map5.put("code", "to_target2");

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

@@ -245,12 +245,12 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
-                        remark = remark + LangProcess.msg("universal_remark2");
+                        remark = remark + "universal_remark2";
                     }
                     if (move != 0) {
-                        remark = remark +  LangProcess.msg("universal_remark3");
+                        remark = remark +  "universal_remark3";
                     }
                     if (task != 0) {
                         remark = remark + LangProcess.msg("universal_remark4");

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -371,7 +371,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     //取货
                     applyUpdatePointCode(StandarStirageErroEnum.BLOCK_IN.getType());
                 }
-
             }
         } else {
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java

@@ -330,12 +330,12 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
-                        remark = remark + LangProcess.msg("universal_remark2");
+                        remark = remark + "universal_remark2";
                     }
                     if (move != 0) {
-                        remark = remark + LangProcess.msg("universal_remark3");
+                        remark = remark + "universal_remark3";
                     }
                     if (task != 0) {
                         remark = remark + LangProcess.msg("universal_remark4");
@@ -509,7 +509,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
                 notCreateInstMessage = "";
                 notCreateTaskMessage = "";
             } else {
-                notCreateInstMessage = LangProcess.msg("universal_notCreateInstMessage");
+                notCreateInstMessage = "universal_notCreateInstMessage";
             }
             return true;
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -217,7 +217,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
                         remark = remark + "工作模式(mode)不是待机状态,";
                     }
@@ -225,13 +225,13 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         remark = remark + "光电信号(move)为有货状态,";
                     }
                     if (task != 0) {
-                        remark = remark + "当前上报任务号(task)应该为0,";
+                        remark = remark + "universal_remark4";
                         if (ObjectUtil.isNotEmpty(this.inst)) {
                             this.inst = null;
                         }
                     }
                     if (requireSucess) {
-                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                        remark = remark + "universal_remark5";
                     }
                     this.setNotCreateTaskMessage(remark);
                     //}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java

@@ -338,7 +338,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
                         remark = remark + "工作模式(mode)不是待机状态,";
                     }
@@ -346,13 +346,13 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                         remark = remark + "光电信号(move)为有货状态,";
                     }
                     if (task != 0) {
-                        remark = remark + "当前上报任务号(task)应该为0,";
+                        remark = remark + "universal_remark4";
                         if (ObjectUtil.isNotEmpty(this.inst)) {
                             this.inst = null;
                         }
                     }
                     if (requireSucess) {
-                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                        remark = remark + "universal_remark5";
                     }
                     this.setNotCreateTaskMessage(remark);
                     //}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java

@@ -320,7 +320,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {
-                    String remark = LangProcess.msg("universal_remark1");
+                    String remark = "";;
                     if (mode != 2) {
                         remark = remark + "工作模式(mode)不是待机状态,";
                     }
@@ -328,13 +328,13 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                         remark = remark + "光电信号(move)为有货状态,";
                     }
                     if (task != 0) {
-                        remark = remark + "当前上报任务号(task)应该为0,";
+                        remark = remark + "universal_remark4";
                         if (ObjectUtil.isNotEmpty(this.inst)) {
                             this.inst = null;
                         }
                     }
                     if (requireSucess) {
-                        remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
+                        remark = remark + "universal_remark5";
                     }
                     this.setNotCreateTaskMessage(remark);
                     //}

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

@@ -15,7 +15,6 @@ universal_remark3=\u5149\u7535\u4FE1\u53F7(move)\u4E3A\u6709\u8D27\u72B6\u6001
 universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u4E3A0
 universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002
 universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
-universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7!
 universal_message1=\u653E\u8D27\u5B8C\u6210
 universal_message2=\u653E\u8D27\u5931\u8D25
 universal_message3=\u6709\u62A5\u8B66
@@ -35,6 +34,7 @@ universal_feedMessage6=\u89E6\u53D1\u65F6\u95F4\u56E0\u4E3A\u5C0F\u4E8E{}\u6BEB\
 universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001
 universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0
 universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25
+universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7!
 
 
 

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

@@ -16,8 +16,7 @@ universal_message4=No matching instructions were found
 universal_message5=Succeeded in delivering the electrical task number
 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_notCreateInstMessage=Instructions cannot be created because the task for the associated device is not found
+
-universal_notCreateInstMessage1=The electrical dispatch number is not set!
 universal_message1=Release completed
 universal_message2=Delivery failure
 universal_message3=Have an alarm
@@ -35,3 +34,5 @@ universal_feedMessage6=The trigger time is ignored because it is less than {} mi
 universal_feedMessage7=Move is not in stock
 universal_feedMessage8=The task number is 0
 universal_write_erro=Write signal failure
+universal_notCreateInstMessage=Instructions cannot be created because the task for the associated device is not found
+universal_notCreateInstMessage1=The electrical dispatch number is not set!

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

@@ -14,8 +14,7 @@ universal_remark2=Mode tidak dalam mode siaga
 universal_remark3=Sinyal fotolistrik untuk kondisi pengiriman
 universal_remark4=Kita tugaskan tugaskan task
 universal_remark5=Klik kanan pada ikon dan ubah not (requicess) untuk penugasan ulang
-universal_notCreateInstMessage=Misi untuk divais yang diasosiasikan tidak ditemukan, perintah tidak dapat dibuat
+
-universal_notCreateInstMessage1=Nomor pengiriman listrik tidak diatur!
 universal_message1=Pengiriman selesai
 universal_message2=Gagal memasukkan barang
 universal_message3=Alarm berbunyi
@@ -35,3 +34,5 @@ universal_feedMessage6=Waktu pemicu diabaikan karena kurang dari {} milidetik
 universal_feedMessage7=Pindah tidak tersedia
 universal_feedMessage8=Nomor tugasnya adalah 0
 universal_write_erro=Sinyal penulis gagal
+universal_notCreateInstMessage=Misi untuk divais yang diasosiasikan tidak ditemukan, perintah tidak dapat dibuat
+universal_notCreateInstMessage1=Nomor pengiriman listrik tidak diatur!

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

@@ -14,8 +14,7 @@ universal_remark2=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u662F\u5F85\u673A\u72B6\u
 universal_remark3=\u5149\u7535\u4FE1\u53F7(move)\u4E3A\u6709\u8D27\u72B6\u6001
 universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u4E3A0
 universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002
-universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
+
-universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7!
 universal_message1=\u653E\u8D27\u5B8C\u6210
 universal_message2=\u653E\u8D27\u5931\u8D25
 universal_message3=\u6709\u62A5\u8B66
@@ -35,3 +34,5 @@ universal_feedMessage6=\u89E6\u53D1\u65F6\u95F4\u56E0\u4E3A\u5C0F\u4E8E{}\u6BEB\
 universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001
 universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0
 universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25
+universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
+universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7!