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

add :设备国际化

Browse Source
This commit is contained in:
lishuai
2024-02-20 17:16:58 +08:00
parent 17c1843fea
commit 7c97cb116e
34 changed files with 444 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.route.service.impl.RouteLineServiceImpl;
import org.nl.acs.task.service.TaskService;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
@@ -270,12 +271,12 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -342,7 +343,7 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
} else if (this.getAction() == 3) {
action = "放货中";
} else if (this.getAction() == 4) {
action = "放货完成";
action = LangProcess.msg("universal_message1");
}
jo.put("device_name", this.getDevice().getDevice_name());

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

@@ -41,6 +41,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.system.service.param.ISysParamService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -248,10 +249,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
if (mode == 0) {
this.setIsonline(false);
message = "未联机";
message = LangProcess.msg("universal_off-line");
} else if (error != 0) {
this.setIserror(true);
message = "有报警";
message = LangProcess.msg("universal_message3");
} else {
this.setIsonline(true);
this.setIserror(false);
@@ -731,16 +733,15 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
String mode = "";
if (this.getMode() == 0) {
mode = "未联机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "联机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "入库中";
} else if (this.getMode() == 4) {
mode = "出库中";
mode = LangProcess.msg("universal_operation");
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
//jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));

17
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -23,6 +23,7 @@ import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.task.service.TaskService;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
@@ -223,25 +224,27 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
String action = "";
String move = "";
if (this.getMode() == 0) {
mode = "未联机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "联机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
} else if (this.getMove() == 2) {
move = "有托盘有货";
move = LangProcess.msg("universal_two_yes");
jo.put("hasGoods", true);
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);

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

@@ -34,6 +34,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.config.thread.ThreadPoolExecutorUtil;
import org.openscada.opc.lib.da.Server;

35
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java
View File

@@ -32,6 +32,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.config.thread.ThreadPoolExecutorUtil;
import org.openscada.opc.lib.da.Server;
@@ -184,15 +185,13 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
if (mode == 0) {
this.setIsonline(false);
message = "未联机";
//有报警
} else {
this.setIsonline(true);
this.setIserror(false);
if (error != 0) {
this.setIserror(true);
message = "有报警";
message = LangProcess.msg("universal_message3");
}
Instruction instruction = null;
@@ -267,41 +266,23 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
String move = "";
String carrier_direction = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
} else if (this.getMode() == 4) {
mode = "申请捆扎中";
} else if (this.getMode() == 5) {
mode = "申请贴标中";
} else if (this.getMode() == 6) {
mode = "申请空盘入库中";
} else if (this.getMode() == 7) {
mode = "申请空盘出库中";
} else if (this.getMode() == 8) {
mode = "申请AGV任务中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = "有货";
jo.put("hasGoods", true);
} else if (this.getMove() == 2) {
move = "有托盘有货";
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
}
if (this.carrier_direction == 1) {
carrier_direction = "正转";
} else if (this.carrier_direction == 2) {
carrier_direction = "反转";
}
String requireSucess = "0";
if (this.requireSucess) {
requireSucess = "1";

26
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java
View File

@@ -38,6 +38,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.config.thread.ThreadPoolExecutorUtil;
import org.openscada.opc.lib.da.Server;
@@ -409,36 +410,27 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
String move = "";
String carrier_direction = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
} else if (this.getMode() == 4) {
mode = "申请捆扎中";
} else if (this.getMode() == 5) {
mode = "申请贴标中";
} else if (this.getMode() == 6) {
mode = "申请空盘入库中";
} else if (this.getMode() == 7) {
mode = "申请空盘出库中";
} else if (this.getMode() == 8) {
mode = "申请AGV任务中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
} else if (this.getMove() == 2) {
move = "有托盘有货";
move = LangProcess.msg("universal_two_yes");
jo.put("hasGoods", true);
}
if (this.carrier_direction == 1) {
carrier_direction = "正转";
} else if (this.carrier_direction == 2) {

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

@@ -29,6 +29,7 @@ import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.route.service.impl.RouteLineServiceImpl;
import org.nl.acs.task.service.TaskService;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
@@ -203,12 +204,12 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -247,21 +248,28 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
} else if (this.getMove() == 2) {
move = LangProcess.msg("universal_two_yes");
jo.put("hasGoods", true);
}
String requireSucess = "0";
if (this.requireSucess) {
requireSucess = "1";

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

@@ -40,6 +40,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.*;
@@ -236,12 +237,12 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -509,21 +510,30 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}else if (this.getMode() == 6) {
mode = LangProcess.msg("one_mode1");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
} else if (this.getMove() == 2) {
move = LangProcess.msg("universal_two_yes");
jo.put("hasGoods", true);
}
String requireSucess = "0";
if (this.requireSucess) {
requireSucess = "1";

27
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
View File

@@ -35,6 +35,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.config.thread.ThreadPoolExecutorUtil;
import org.openscada.opc.lib.da.Server;
@@ -355,36 +356,28 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
String move = "";
String carrier_direction = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
} else if (this.getMode() == 4) {
mode = "申请捆扎中";
} else if (this.getMode() == 5) {
mode = "申请贴标中";
} else if (this.getMode() == 6) {
mode = "申请空盘入库中";
} else if (this.getMode() == 7) {
mode = "申请空盘出库中";
} else if (this.getMode() == 8) {
mode = "申请AGV任务中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
} else if (this.getMove() == 2) {
move = "有托盘有货";
move = LangProcess.msg("universal_two_yes");
jo.put("hasGoods", true);
}
if (this.carrier_direction == 1) {
carrier_direction = "正转";
} else if (this.carrier_direction == 2) {

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

@@ -37,6 +37,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.common.exception.BadRequestException;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import java.util.*;
@@ -209,12 +210,12 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
feedMessage = "";
}
} else {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -279,25 +280,24 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map1.put("value", 5);
list.add(map1);
this.writing(list);
message = "放货完成";
message = LangProcess.msg("universal_message1");
} catch (Exception e) {
message = "放货失败";
e.printStackTrace();
message = LangProcess.msg("universal_message2");
}
feedMessage = "";
}else {
feedMessage = "行架机械手:";
feedMessage = LangProcess.msg("universal_feedMessage5");
if (mode != 3) {
feedMessage = feedMessage + "工作模式(mode)不为运行中状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1");
}
if (action != 8) {
feedMessage = feedMessage + "动作信号(action)不为放货完成状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2");
}
if (move != 0) {
feedMessage = feedMessage + "光电信号(move)不为无货状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3");
}
if (task == 0) {
feedMessage = feedMessage + "当前上报任务号(task)不应该为0。";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4");
}
}
}
@@ -532,19 +532,19 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
}
String requireSucess = "0";
@@ -553,13 +553,13 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = "取货中";
action = LangProcess.msg("universal_delivery");
} else if (this.getAction() == 2) {
action = "取货完成";
action = LangProcess.msg("universal_completed");
} else if (this.getAction() == 3) {
action = "放货中";
action = LangProcess.msg("universal_releasing");
} else if (this.getAction() == 4) {
action = "放货完成";
action = LangProcess.msg("universal_releasing_completed");
}
jo.put("device_name", this.getDevice().getDevice_name());

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

@@ -38,6 +38,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.common.exception.BadRequestException;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.config.lucene.service.LuceneExecuteLogService;
import org.nl.config.lucene.service.dto.LuceneLogDto;
@@ -182,12 +183,12 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
feedMessage = "";
}
} else {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -235,25 +236,25 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map1.put("value", 5);
list.add(map1);
this.writing(list);
message = "放货完成";
message = LangProcess.msg("universal_message1");
} catch (Exception e) {
message = "放货失败";
message = LangProcess.msg("universal_message2");
e.printStackTrace();
}
feedMessage = "";
} else {
feedMessage = "行架机械手:";
feedMessage = LangProcess.msg("universal_feedMessage5");
if (mode != 3) {
feedMessage = feedMessage + "工作模式(mode)不为运行中状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1");
}
if (action != 5) {
feedMessage = feedMessage + "动作信号(action)不为放货完成状态,";
if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2");
}
if (move != 0) {
feedMessage = feedMessage + "光电信号(move)不为无货状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3");
}
if (task == 0) {
feedMessage = feedMessage + "当前上报任务号(task)不应该为0。";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4");
}
}
}
@@ -377,7 +378,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
this.setRequireSucess(true);
return true;
} else {
notCreateInstMessage = "未找到关联设备的任务，指令无法创建";
notCreateInstMessage = LangProcess.msg("universal_notCreateInstMessage");
}
}
}
@@ -495,19 +496,19 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
}
String requireSucess = "0";
@@ -516,13 +517,13 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = "取货中";
action = LangProcess.msg("universal_delivery");
} else if (this.getAction() == 2) {
action = "取货完成";
action = LangProcess.msg("universal_completed");
} else if (this.getAction() == 3) {
action = "放货中";
action = LangProcess.msg("universal_releasing");
} else if (this.getAction() == 4) {
action = "放货完成";
action = LangProcess.msg("universal_releasing_completed");
}
jo.put("device_name", this.getDevice().getDevice_name());

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

@@ -39,6 +39,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.common.exception.BadRequestException;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import java.util.*;
@@ -189,12 +190,12 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
feedMessage = "";
}
} else {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -253,25 +254,25 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map1.put("value", 5);
list.add(map1);
this.writing(list);
message = "放货完成";
message = LangProcess.msg("universal_message1");
} catch (Exception e) {
message = "放货失败";
message = LangProcess.msg("universal_message2");
e.printStackTrace();
}
feedMessage = "";
} else {
feedMessage = "行架机械手:";
feedMessage = LangProcess.msg("universal_feedMessage5");
if (mode != 3) {
feedMessage = feedMessage + "工作模式(mode)不为运行中状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1");
}
if (action != 5) {
feedMessage = feedMessage + "动作信号(action)不为放货完成状态,";
if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2");
}
if (move != 0) {
feedMessage = feedMessage + "光电信号(move)不为无货状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3");
}
if (task == 0) {
feedMessage = feedMessage + "当前上报任务号(task)不应该为0。";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4");
}
}
}
@@ -514,19 +515,19 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
}
String requireSucess = "0";
@@ -535,15 +536,16 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = "取货中";
action = LangProcess.msg("universal_delivery");
} else if (this.getAction() == 2) {
action = "取货完成";
action = LangProcess.msg("universal_completed");
} else if (this.getAction() == 3) {
action = "放货中";
action = LangProcess.msg("universal_releasing");
} else if (this.getAction() == 4) {
action = "放货完成";
action = LangProcess.msg("universal_releasing_completed");
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);

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

@@ -37,6 +37,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.common.exception.BadRequestException;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import java.util.*;
@@ -190,7 +191,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
feedMessage = "";
}
} else {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
}
@@ -255,25 +256,25 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
map1.put("value", 5);
list.add(map1);
this.writing(list);
message = "放货完成";
message = LangProcess.msg("universal_message1");
} catch (Exception e) {
message = "放货失败";
message = LangProcess.msg("universal_message2");
e.printStackTrace();
}
feedMessage = "";
}else {
feedMessage = "行架机械手:";
feedMessage = LangProcess.msg("universal_feedMessage5");
if (mode != 3) {
feedMessage = feedMessage + "工作模式(mode)不为运行中状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1");
}
if (action != 8) {
feedMessage = feedMessage + "动作信号(action)不为放货完成状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2");
}
if (move != 0) {
feedMessage = feedMessage + "光电信号(move)不为无货状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3");
}
if (task == 0) {
feedMessage = feedMessage + "当前上报任务号(task)不应该为0。";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4");
}
}
}
@@ -521,19 +522,19 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
}
String requireSucess = "0";
@@ -542,15 +543,16 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = "取货中";
action = LangProcess.msg("universal_delivery");
} else if (this.getAction() == 2) {
action = "取货完成";
action = LangProcess.msg("universal_completed");
} else if (this.getAction() == 3) {
action = "放货中";
action = LangProcess.msg("universal_releasing");
} else if (this.getAction() == 4) {
action = "放货完成";
action = LangProcess.msg("universal_releasing_completed");
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);

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

@@ -37,6 +37,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.common.exception.BadRequestException;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import java.util.*;
@@ -210,12 +211,12 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
feedMessage = "";
}
} else {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
@@ -279,25 +280,25 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
map1.put("value", 5);
list.add(map1);
this.writing(list);
message = "放货完成";
message = LangProcess.msg("universal_message1");
} catch (Exception e) {
message = "放货失败";
message = LangProcess.msg("universal_message2");
e.printStackTrace();
}
feedMessage = "";
} else {
feedMessage = "行架机械手:";
feedMessage = LangProcess.msg("universal_feedMessage5");
if (mode != 3) {
feedMessage = feedMessage + "工作模式(mode)不为运行中状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1");
}
if (action != 8) {
feedMessage = feedMessage + "动作信号(action)不为放货完成状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2");
}
if (move != 0) {
feedMessage = feedMessage + "光电信号(move)不为无货状态,";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3");
}
if (task == 0) {
feedMessage = feedMessage + "当前上报任务号(task)不应该为0。";
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4");
}
}
}
@@ -540,19 +541,19 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
String action = "";
String walk_y = "";
if (this.getMode() == 0) {
mode = "脱机";
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = "单机";
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = "待机";
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = "运行中";
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = "无货";
move = LangProcess.msg("universal_no");
} else if (this.getMove() == 1) {
move = "有货";
move = LangProcess.msg("universal_yes");
}
String requireSucess = "0";
@@ -561,13 +562,13 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
}
jo.put("requireSucess", requireSucess);
if (this.getAction() == 1) {
action = "取货中";
action = LangProcess.msg("universal_delivery");
} else if (this.getAction() == 2) {
action = "取货完成";
action = LangProcess.msg("universal_completed");
} else if (this.getAction() == 3) {
action = "放货中";
action = LangProcess.msg("universal_releasing");
} else if (this.getAction() == 4) {
action = "放货完成";
action = LangProcess.msg("universal_releasing_completed");
}
jo.put("device_name", this.getDevice().getDevice_name());

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

@@ -28,6 +28,7 @@ import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.route.service.impl.RouteLineServiceImpl;
import org.nl.acs.task.service.TaskService;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
@@ -259,21 +260,21 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
remark = remark + LangProcess.msg("universal_remark2");
}
if (move != 0) {
remark = remark + "光电信号(move)为有货状态,";
remark = remark + LangProcess.msg("universal_remark3");
}
if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0,";
remark = remark + LangProcess.msg("universal_remark4");
if (ObjectUtil.isNotEmpty(this.inst)) {
this.inst = null;
}
}
if (requireSucess) {
remark = remark + "请右击该图标,将请求任务复位标记(requireSucess)改为否。";
remark = remark + LangProcess.msg("universal_remark5");
}
this.setNotCreateTaskMessage(remark);
//}

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

@@ -38,6 +38,7 @@ import org.nl.acs.route.service.impl.RouteLineServiceImpl;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.*;
@@ -337,10 +338,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
if (mode != 3 || requireSucess) {
message = "未联机或已修改";
message = LangProcess.msg("one_message7");
} else if (error != 0) {
message = "有报警";
message = LangProcess.msg("universal_message3");
//指定库位满入
if (error == 5) {
@@ -371,10 +372,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
}
break;
case 1:
message = "取货中";
message = LangProcess.msg("universal_delivery");
break;
case 2:
message = "取货完成";
message = LangProcess.msg("universal_completed");
Instruction instruction = checkInst();
String next_device_code = instruction.getNext_device_code();
Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
@@ -429,10 +430,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true;
break;
case 3:
message = "放货中";
message = LangProcess.msg("universal_releasing");
break;
case 4:
message = "请求卸货(申请卸货)";
message = LangProcess.msg("one_message1");
Instruction instruction1 = checkInst();
String next_device_code1 = instruction1.getNext_device_code();
Device nextDevice1 = deviceAppService.findDeviceByCode(next_device_code1);
@@ -455,7 +456,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true;
break;
case 5:
message = "放货完成";
message = LangProcess.msg("universal_releasing_completed");
Map<String, Object> map = new HashMap<>();
map.put("code", "to_command");
map.put("value", 5);
@@ -469,7 +470,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true;
break;
case 6:
message = "取货准备(会库位台)";
message = LangProcess.msg("one_message2");
Map<String, Object> map1 = new HashMap<>();
map1.put("code", "to_command");
map1.put("value", 6);
@@ -477,7 +478,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true;
break;
case 7:
message = "召回";
message = LangProcess.msg("one_message3");
Map<String, Object> map2 = new HashMap<>();
map2.put("code", "to_command");
map2.put("value", 7);
@@ -485,7 +486,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true;
break;
case 8:
message = "急停";
message = LangProcess.msg("one_message4");
Map<String, Object> map3 = new HashMap<>();
map3.put("code", "to_command");
map3.put("value", 8);
@@ -493,7 +494,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true;
break;
default:
message = "不明";
message = LangProcess.msg("one_message5");
requireSucess = true;
break;
}
@@ -562,7 +563,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
for (Instruction instruction : instructions) {
List<RouteLineDto> routeLineDtos = routeLineService.selectDeviceCodeList(instruction.getStart_device_code());
if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) {
message = "没有输送线到堆垛机的路由";
message = LangProcess.msg("one_message6");
logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->"
+ this.device_code + "的路由");
continue;
@@ -571,7 +572,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
if (this.getDeviceCode().equals(routeLineDto.getNext_device_code())) {
List<RouteLineDto> routeLineDtoList = routeLineService.selectDeviceCodeList(this.getDeviceCode());
if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) {
message = "没有输送线到堆垛机的路由";
message = LangProcess.msg("one_message6");
logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->"
+ this.device_code + "的路由");
continue;
@@ -740,17 +741,43 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
@Override
public JSONObject getDeviceStatusName() throws Exception {
JSONObject jo = new JSONObject();
String mode = "";
String move = "";
if (this.getMode() == 0) {
mode = LangProcess.msg("universal_off-line");
} else if (this.getMode() == 1) {
mode = LangProcess.msg("universal_stand-alone");
} else if (this.getMode() == 2) {
mode = LangProcess.msg("universal_standby");
} else if (this.getMode() == 3) {
mode = LangProcess.msg("universal_operation");
}
if (this.getMove() == 0) {
move = LangProcess.msg("universal_no");
jo.put("hasGoods", false);
} else if (this.getMove() == 1) {
move = LangProcess.msg("universal_yes");
jo.put("hasGoods", true);
}
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("is_click", true);
String requireSucess = "0";
if (this.requireSucess) {
requireSucess = "1";
}
jo.put("mode", mode);
jo.put("move", move);
jo.put("action", action);
jo.put("task", task);
jo.put("error", this.getError());
jo.put("message", this.getMessage());
jo.put("prohibitInWarehouse", this.prohibitInWarehouse);
jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse);
jo.put("stopReceiveTask", this.stopReceiveTask);
jo.put("requireSucess", requireSucess);
jo.put("driver_type", "standard_stacker");
jo.put("notCreateInstMessage", notCreateInstMessage);
return jo;
}

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

@@ -312,7 +312,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
}

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

@@ -39,6 +39,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.common.exception.BadRequestException;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.*;
@@ -252,7 +253,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
}

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

@@ -339,7 +339,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
}

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

@@ -321,7 +321,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
} else {
if (mode == 2) {
//if (!requireSucess) {
String remark = "未查找任务原因为:";
String remark = LangProcess.msg("universal_remark1");
if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态,";
}

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java
View File

@@ -3,6 +3,7 @@ package org.nl.acs.history;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import org.nl.config.SpringContextHolder;
import org.nl.config.language.LangProcess;
import org.nl.system.service.dict.ISysDictService;
import org.nl.system.service.dict.dao.Dict;
import org.nl.system.service.dict.dto.DictDetailDto;
@@ -40,7 +41,7 @@ public class ErrorUtil {
}
}
}
return detail == null ? "字典表未配置对应的报警信息" : detail;
return detail == null ? LangProcess.msg("error_not_configured") : detail;
}
public static Map<Integer, String> getDictDetailByName(String type) {

53
acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
View File

@@ -1,26 +1,27 @@
error_checkEq=参数校验异常：信息不一致
error_checkExist=信息已经存在{0}
error_checkFile=只能上传图片
error_checkFileSize=文件超出规定大小\!
error_checkNull={0}信息为空
error_checkNumber=长度不是偶数\!
error_checkParam=参数不正确
error_checkRelate=存在相关联的数据权限
error_checkTypes=未实现目前支持是{0}
error_communication=通信结束
error_config=配置信息不正确
error_dbCreate=创建失败
error_dbDelete=删除失败
error_dbUpdate=更新失败
error_generator=此环境不允许生成代码，请选择预览或者下载查看
error_isNull={0}查询信息不存在
error_lockOut=操作锁被占用{0},等待结束
error_nullPoint=信息为空
error_run=执行失败
error_send=消息发送失败
error_status={0}信息状态不正确
error_sys=系统繁忙，稍后在试
error_sysAuth=权限不足，操作失败
error_sysFile=上传失败
error_sysLimit=访问次数限制\!
zh_device_name_isNotNull = 中文设备名称不能位空
error_checkEq=\u53C2\u6570\u6821\u9A8C\u5F02\u5E38\uFF1A\u4FE1\u606F\u4E0D\u4E00\u81F4
error_checkExist=\u4FE1\u606F\u5DF2\u7ECF\u5B58\u5728{0}
error_checkFile=\u53EA\u80FD\u4E0A\u4F20\u56FE\u7247
error_checkFileSize=\u6587\u4EF6\u8D85\u51FA\u89C4\u5B9A\u5927\u5C0F\!
error_checkNull={0}\u4FE1\u606F\u4E3A\u7A7A
error_checkNumber=\u957F\u5EA6\u4E0D\u662F\u5076\u6570\!
error_checkParam=\u53C2\u6570\u4E0D\u6B63\u786E
error_checkRelate=\u5B58\u5728\u76F8\u5173\u8054\u7684\u6570\u636E\u6743\u9650
error_checkTypes=\u672A\u5B9E\u73B0\u76EE\u524D\u652F\u6301\u662F{0}
error_communication=\u901A\u4FE1\u7ED3\u675F
error_config=\u914D\u7F6E\u4FE1\u606F\u4E0D\u6B63\u786E
error_dbCreate=\u521B\u5EFA\u5931\u8D25
error_dbDelete=\u5220\u9664\u5931\u8D25
error_dbUpdate=\u66F4\u65B0\u5931\u8D25
error_generator=\u6B64\u73AF\u5883\u4E0D\u5141\u8BB8\u751F\u6210\u4EE3\u7801\uFF0C\u8BF7\u9009\u62E9\u9884\u89C8\u6216\u8005\u4E0B\u8F7D\u67E5\u770B
error_isNull={0}\u67E5\u8BE2\u4FE1\u606F\u4E0D\u5B58\u5728
error_lockOut=\u64CD\u4F5C\u9501\u88AB\u5360\u7528{0},\u7B49\u5F85\u7ED3\u675F
error_nullPoint=\u4FE1\u606F\u4E3A\u7A7A
error_run=\u6267\u884C\u5931\u8D25
error_send=\u6D88\u606F\u53D1\u9001\u5931\u8D25
error_status={0}\u4FE1\u606F\u72B6\u6001\u4E0D\u6B63\u786E
error_sys=\u7CFB\u7EDF\u7E41\u5FD9\uFF0C\u7A0D\u540E\u5728\u8BD5
error_sysAuth=\u6743\u9650\u4E0D\u8DB3\uFF0C\u64CD\u4F5C\u5931\u8D25
error_sysFile=\u4E0A\u4F20\u5931\u8D25
error_sysLimit=\u8BBF\u95EE\u6B21\u6570\u9650\u5236\!
zh_device_name_isNotNull = \u4E2D\u6587\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4F4D\u7A7A
error_not_configured=\u5B57\u5178\u8868\u672A\u914D\u7F6E\u5BF9\u5E94\u7684\u62A5\u8B66\u4FE1\u606F

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
View File

@@ -24,3 +24,5 @@ error_sysAuth=Insufficient permissions, operation failed
error_sysFile=Upload failed
error_sysLimit=Access limit\!
zh_device_name_isNotNull = Chinese device name cannot be empty\!
error_not_configured=The dictionary table is not configured with alarm information

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

@@ -24,3 +24,4 @@ error_sysAuth=Keizinan tidak cukup, operasi gagal
error_sysFile=Upload gagal
error_sysLimit=Batas akses\!
zh_device_name_isNotNull= Nama perangkat dalam bahasa Cina tidak boleh kosong!
error_not_configured=Informasi alarm tak dikonfigurasi dari tabel kamus

54
acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
View File

@@ -1,26 +1,28 @@
error_checkEq=参数校验异常：信息不一致
error_checkExist=信息已经存在{0}
error_checkFile=只能上传图片
error_checkFileSize=文件超出规定大小\!
error_checkNull={0}信息为空
error_checkNumber=长度不是偶数\!
error_checkParam=参数不正确
error_checkRelate=存在相关联的数据权限
error_checkTypes=未实现目前支持是{0}
error_communication=通信结束
error_config=配置信息不正确
error_dbCreate=创建失败
error_dbDelete=删除失败
error_dbUpdate=更新失败
error_generator=此环境不允许生成代码，请选择预览或者下载查看
error_isNull={0}查询信息不存在
error_lockOut=操作锁被占用{0},等待结束
error_nullPoint=信息为空
error_run=执行失败
error_send=消息发送失败
error_status={0}信息状态不正确
error_sys=系统繁忙，稍后在试
error_sysAuth=权限不足，操作失败
error_sysFile=上传失败
error_sysLimit=访问次数限制\!
zh_device_name_isNotNull = 中文设备名称不能为空
error_checkEq=\u53C2\u6570\u6821\u9A8C\u5F02\u5E38\uFF1A\u4FE1\u606F\u4E0D\u4E00\u81F4
error_checkExist=\u4FE1\u606F\u5DF2\u7ECF\u5B58\u5728{0}
error_checkFile=\u53EA\u80FD\u4E0A\u4F20\u56FE\u7247
error_checkFileSize=\u6587\u4EF6\u8D85\u51FA\u89C4\u5B9A\u5927\u5C0F\!
error_checkNull={0}\u4FE1\u606F\u4E3A\u7A7A
error_checkNumber=\u957F\u5EA6\u4E0D\u662F\u5076\u6570\!
error_checkParam=\u53C2\u6570\u4E0D\u6B63\u786E
error_checkRelate=\u5B58\u5728\u76F8\u5173\u8054\u7684\u6570\u636E\u6743\u9650
error_checkTypes=\u672A\u5B9E\u73B0\u76EE\u524D\u652F\u6301\u662F{0}
error_communication=\u901A\u4FE1\u7ED3\u675F
error_config=\u914D\u7F6E\u4FE1\u606F\u4E0D\u6B63\u786E
error_dbCreate=\u521B\u5EFA\u5931\u8D25
error_dbDelete=\u5220\u9664\u5931\u8D25
error_dbUpdate=\u66F4\u65B0\u5931\u8D25
error_generator=\u6B64\u73AF\u5883\u4E0D\u5141\u8BB8\u751F\u6210\u4EE3\u7801\uFF0C\u8BF7\u9009\u62E9\u9884\u89C8\u6216\u8005\u4E0B\u8F7D\u67E5\u770B
error_isNull={0}\u67E5\u8BE2\u4FE1\u606F\u4E0D\u5B58\u5728
error_lockOut=\u64CD\u4F5C\u9501\u88AB\u5360\u7528{0},\u7B49\u5F85\u7ED3\u675F
error_nullPoint=\u4FE1\u606F\u4E3A\u7A7A
error_run=\u6267\u884C\u5931\u8D25
error_send=\u6D88\u606F\u53D1\u9001\u5931\u8D25
error_status={0}\u4FE1\u606F\u72B6\u6001\u4E0D\u6B63\u786E
error_sys=\u7CFB\u7EDF\u7E41\u5FD9\uFF0C\u7A0D\u540E\u5728\u8BD5
error_sysAuth=\u6743\u9650\u4E0D\u8DB3\uFF0C\u64CD\u4F5C\u5931\u8D25
error_sysFile=\u4E0A\u4F20\u5931\u8D25
error_sysLimit=\u8BBF\u95EE\u6B21\u6570\u9650\u5236\!
zh_device_name_isNotNull = \u4E2D\u6587\u8BBE\u5907\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
error_not_configured=\u5B57\u5178\u8868\u672A\u914D\u7F6E\u5BF9\u5E94\u7684\u62A5\u8B66\u4FE1\u606F

8
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice.properties Normal file
View File

@@ -0,0 +1,8 @@
one_message1=\u7533\u8BF7\u5378\u8D27
one_message2=\u53D6\u8D27\u51C6\u5907
one_message3=\u53EC\u56DE
one_message4=\u6025\u505C
one_message5=\u4E0D\u660E
one_message6=\u6CA1\u6709\u8F93\u9001\u7EBF\u5230\u5806\u579B\u673A\u7684\u8DEF\u7531
one_message7=\u672A\u8054\u673A\u6216\u5DF2\u4FEE\u6539
one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1

8
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_en_US.properties Normal file
View File

@@ -0,0 +1,8 @@
one_message1=Application for discharge
one_message2=Pick-up preparation
one_message3=recall
one_message4=scram
one_message5=unknown
one_message6=There is no routing of the conveyor line to the stacker
one_message7=Not online or modified
one_mode1=Request a warehouse entry task

8
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_in_ID.properties Normal file
View File

@@ -0,0 +1,8 @@
one_message1=Berlaku untuk membongkar
one_message2=Mendapatkan siap
one_message3=Penarikan kembali
one_message4=tiba-tiba
one_message5=Tak diketahui
one_message6=Tidak ada rute pengiriman ke stacker
one_message7=Unfreed atau diubah
one_mode1=Berlaku untuk tugas pustaka

8
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_zh_CN.properties Normal file
View File

@@ -0,0 +1,8 @@
one_message1=\u7533\u8BF7\u5378\u8D27
one_message2=\u53D6\u8D27\u51C6\u5907
one_message3=\u53EC\u56DE
one_message4=\u6025\u505C
one_message5=\u4E0D\u660E
one_message6=\u6CA1\u6709\u8F93\u9001\u7EBF\u5230\u5806\u579B\u673A\u7684\u8DEF\u7531
one_message7=\u672A\u8054\u673A\u6216\u5DF2\u4FEE\u6539
one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1

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

@@ -0,0 +1,29 @@
universal_off-line=\u8131\u673A
universal_stand-alone=\u5355\u673A
universal_standby=\u5F85\u673A
universal_operation=\u8FD0\u884C\u4E2D
universal_no=\u65E0\u8D27
universal_yes=\u6709\u8D27
universal_two_yes=\u6709\u6258\u76D8\u6709\u8D27
universal_delivery=\u53D6\u8D27\u4E2D
universal_completed=\u53D6\u8D27\u5B8C\u6210
universal_releasing=\u653E\u8D27\u4E2D
universal_releasing_completed=\u653E\u8D27\u5B8C\u6210
universal_remark1=\u672A\u67E5\u627E\u4EFB\u52A1\u539F\u56E0\u4E3A\uFF1A
universal_remark2=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u662F\u5F85\u673A\u72B6\u6001
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_message1=\u653E\u8D27\u5B8C\u6210
universal_message2=\u653E\u8D27\u5931\u8D25
universal_message3=\u6709\u62A5\u8B66
universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001
universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001
universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001
universal_feedMessage4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u4E0D\u5E94\u8BE5\u4E3A0
universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B

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

@@ -0,0 +1,25 @@
universal_off-line=off-line
universal_stand-alone=stand-alone
universal_standby=standby
universal_operation=operation
universal_no=Out of stock
universal_yes=In stock
universal_two_yes=There are pallets and goods
universal_delivery=Taking delivery
universal_completed=Pick-up completed
universal_releasing=Releasing goods
universal_releasing_completed=Release completed
universal_remark1=The task is not found because
universal_remark2=Working mode (mode) is not standby
universal_remark3=Photoelectric signal (move) is in stock status
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_message1=Release completed
universal_message2=Delivery failure
universal_message3=Have an alarm
universal_feedMessage1=mode is not in the running state
universal_feedMessage2=action signal (action signal) is not a release completed status
universal_feedMessage3=Photoelectric signal (move) is not out of stock
universal_feedMessage4=The current report task number (task) should not be 0
universal_feedMessage5=Gantry manipulator

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

@@ -0,0 +1,25 @@
universal_off-line=Akses internet
universal_stand-alone=(s) single-player
universal_standby=siaga
universal_operation=operasi
universal_no=bayar
universal_yes=Yang aku mau
universal_two_yes=Ada nampan dengan barang
universal_delivery=Mengambil barang
universal_completed=Pengambilan barang selesai
universal_releasing=Letakkan barang
universal_releasing_completed=Pengiriman selesai
universal_remark1=Alasan tugas yang tidak dicari adalah
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_message1=Pengiriman selesai
universal_message2=Gagal memasukkan barang
universal_message3=Alarm berbunyi
universal_feedMessage1=Mode kerja tidak untuk mode dalam mode
universal_feedMessage2=Sinyal aksi tidak lengkap untuk penempatan
universal_feedMessage3=tidak ada status pengiriman
universal_feedMessage4=Tugaskan tugaskan tugaskan bukan hanya 0
universal_feedMessage5=Pengemudi-mekanik line

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

@@ -0,0 +1,25 @@
universal_off-line=\u8131\u673A
universal_stand-alone=\u5355\u673A
universal_standby=\u5F85\u673A
universal_operation=\u8FD0\u884C\u4E2D
universal_no=\u65E0\u8D27
universal_yes=\u6709\u8D27
universal_two_yes=\u6709\u6258\u76D8\u6709\u8D27
universal_delivery=\u53D6\u8D27\u4E2D
universal_completed=\u53D6\u8D27\u5B8C\u6210
universal_releasing=\u653E\u8D27\u4E2D
universal_releasing_completed=\u653E\u8D27\u5B8C\u6210
universal_remark1=\u672A\u67E5\u627E\u4EFB\u52A1\u539F\u56E0\u4E3A\uFF1A
universal_remark2=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u662F\u5F85\u673A\u72B6\u6001
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_message1=\u653E\u8D27\u5B8C\u6210
universal_message2=\u653E\u8D27\u5931\u8D25
universal_message3=\u6709\u62A5\u8B66
universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001
universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001
universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001
universal_feedMessage4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u4E0D\u5E94\u8BE5\u4E3A0
universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B

2
acs2/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -422,7 +422,7 @@ export default {
// console.log('item', item)
this.arr = [
{ name: i18n.t('monitor.click.equipment_number'), value: item.device_code },
{ name: '设备名称', value: item.device_name }
{ name: i18n.t('monitor.click.device_name'), value: item.device_name }
]
const data = item.data
for (const val in data) {