fix :国际化修改

This commit is contained in:
2024-02-29 14:45:10 +08:00
parent 881ade414e
commit 36155bac2e
40 changed files with 141 additions and 136 deletions

View File

@@ -536,7 +536,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
jo.put("task_code", ObjectUtil.isEmpty(instruction) ? "0" : instruction.getTask_code()); jo.put("task_code", ObjectUtil.isEmpty(instruction) ? "0" : instruction.getTask_code());
//异常 //异常
jo.put("fault", this.getError_message()); jo.put("fault", this.getError_message());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
return jo; return jo;
} }

View File

@@ -1213,7 +1213,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
jo.put("task_code", ObjectUtil.isEmpty(instruction) ? "0" : instruction.getTask_code()); jo.put("task_code", ObjectUtil.isEmpty(instruction) ? "0" : instruction.getTask_code());
//异常 //异常
jo.put("fault", this.getError_message()); jo.put("fault", this.getError_message());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
return jo; return jo;
} }

View File

@@ -345,7 +345,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
String mode = ""; String mode = "";
jo.put("device_name", this.getDevice().getDevice_name()); jo.put("device_name", this.getDevice().getDevice_name());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("is_click", true); jo.put("is_click", true);
jo.put("address", address); jo.put("address", address);
jo.put("stop", stop); jo.put("stop", stop);

View File

@@ -247,12 +247,12 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -355,10 +355,10 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -253,10 +253,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -381,10 +381,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
.build(); .build();
luceneExecuteLogService.deviceExecuteLog(logDto2); luceneExecuteLogService.deviceExecuteLog(logDto2);
if (ObjectUtil.isEmpty(jo)) { if (ObjectUtil.isEmpty(jo)) {
message = LangProcess.msg("one_message15"); message = "one_message15";
} else { } else {
if (jo.getInteger("status") == 200) { if (jo.getInteger("status") == 200) {
message = LangProcess.msg("one_message16"); message = "one_message16";
List list = new ArrayList(); List list = new ArrayList();
while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".to_command").toString() while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".to_command").toString()
, "8")) { , "8")) {
@@ -403,7 +403,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
requireSucess = true; requireSucess = true;
} else { } else {
message = LangProcess.msg("one_message17") + jo.get("message").toString(); message = "one_message17" + jo.get("message").toString();
} }
} }
return; return;
@@ -418,11 +418,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
JSONObject jo = JSON.parseObject(str); JSONObject jo = JSON.parseObject(str);
if (ObjectUtil.isEmpty(jo)) { if (ObjectUtil.isEmpty(jo)) {
message = LangProcess.msg("one_message15"); message = "one_message15";
// requireSucess = true; // requireSucess = true;
} else { } else {
if (jo.getInteger("status") == 200) { if (jo.getInteger("status") == 200) {
message = LangProcess.msg("one_message16"); message = "one_message16";
List list = new ArrayList(); List list = new ArrayList();
Map map = new HashMap(); Map map = new HashMap();
map.put("code", "to_command"); map.put("code", "to_command");
@@ -442,7 +442,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
logServer.deviceExecuteLog(this.device_code, "", "", "申请AGV任务,返回参数:" + jo); logServer.deviceExecuteLog(this.device_code, "", "", "申请AGV任务,返回参数:" + jo);
requireSucess = true; requireSucess = true;
} else { } else {
message = LangProcess.msg("one_message17") + jo.get("message").toString(); message = "one_message17" + jo.get("message").toString();
} }
} }
@@ -693,7 +693,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("device_name", this.getDevice().getDevice_name()); jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode); jo.put("mode", mode);
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("move", move); jo.put("move", move);
jo.put("is_click", true); jo.put("is_click", true);

View File

@@ -380,7 +380,7 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
return jo; return jo;
} }

View File

@@ -492,7 +492,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("is_click", true); jo.put("is_click", true);
jo.put("requireSucess", requireSucess); jo.put("requireSucess", requireSucess);
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");

View File

@@ -451,7 +451,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("is_click", true); jo.put("is_click", true);
jo.put("requireSucess", requireSucess); jo.put("requireSucess", requireSucess);
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");

View File

@@ -488,7 +488,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("is_click", true); jo.put("is_click", true);
jo.put("requireSucess", requireSucess); jo.put("requireSucess", requireSucess);
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");

View File

@@ -849,7 +849,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("inst_message", this.inst_message); jo.put("inst_message", this.inst_message);
jo.put("task", this.getTask()); jo.put("task", this.getTask());
jo.put("barcode", plcbarcode); jo.put("barcode", plcbarcode);

View File

@@ -344,10 +344,10 @@
// jo.put("isOnline", this.getIsonline()); // jo.put("isOnline", this.getIsonline());
// jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); // jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
// jo.put("isError", this.getIserror()); // jo.put("isError", this.getIserror());
// jo.put("message", this.getMessage()); // jo.put("message", LangProcess.msg(message));
// jo.put("notCreateTaskMessage", notCreateTaskMessage); // jo.put("notCreateTaskMessage", notCreateTaskMessage);
// jo.put("notCreateInstMessage", notCreateInstMessage); // jo.put("notCreateInstMessage", notCreateInstMessage);
// jo.put("feedMessage", feedMessage); // jo.put("feedMessage", LangProcess.msg(feedMessage));
// jo.put("driver_type", "siemens_conveyor"); // jo.put("driver_type", "siemens_conveyor");
// jo.put("is_click", true); // jo.put("is_click", true);
// jo.put("x", x_position); // jo.put("x", x_position);

View File

@@ -343,10 +343,10 @@
// jo.put("isOnline", this.getIsonline()); // jo.put("isOnline", this.getIsonline());
// jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); // jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
// jo.put("isError", this.getIserror()); // jo.put("isError", this.getIserror());
// jo.put("message", this.getMessage()); // jo.put("message", LangProcess.msg(message));
// jo.put("notCreateTaskMessage", notCreateTaskMessage); // jo.put("notCreateTaskMessage", notCreateTaskMessage);
// jo.put("notCreateInstMessage", notCreateInstMessage); // jo.put("notCreateInstMessage", notCreateInstMessage);
// jo.put("feedMessage", feedMessage); // jo.put("feedMessage", LangProcess.msg(feedMessage));
// jo.put("driver_type", "siemens_conveyor"); // jo.put("driver_type", "siemens_conveyor");
// jo.put("is_click", true); // jo.put("is_click", true);
// jo.put("x", x_position); // jo.put("x", x_position);

View File

@@ -349,10 +349,10 @@
// jo.put("isOnline", this.getIsonline()); // jo.put("isOnline", this.getIsonline());
// jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); // jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
// jo.put("isError", this.getIserror()); // jo.put("isError", this.getIserror());
// jo.put("message", this.getMessage()); // jo.put("message", LangProcess.msg(message));
// jo.put("notCreateTaskMessage", notCreateTaskMessage); // jo.put("notCreateTaskMessage", notCreateTaskMessage);
// jo.put("notCreateInstMessage", notCreateInstMessage); // jo.put("notCreateInstMessage", notCreateInstMessage);
// jo.put("feedMessage", feedMessage); // jo.put("feedMessage", LangProcess.msg(feedMessage));
// jo.put("driver_type", "siemens_conveyor"); // jo.put("driver_type", "siemens_conveyor");
// jo.put("is_click", true); // jo.put("is_click", true);
// jo.put("x", x_position); // jo.put("x", x_position);

View File

@@ -196,7 +196,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
@@ -205,7 +205,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
this.setIserror(false); this.setIserror(false);
if (error != 0) { if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
} }
Instruction instruction = null; Instruction instruction = null;
@@ -355,7 +355,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
return false; return false;
} }
} }
message = LangProcess.msg("universal_message5"); message = "universal_message5";
requireSucess = true; requireSucess = true;
return true; return true;
} }
@@ -560,7 +560,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("hand_barcode", hand_barcode); jo.put("hand_barcode", hand_barcode);
jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code()); jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code());
jo.put("is_click", true); jo.put("is_click", true);

View File

@@ -201,7 +201,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
this.setIserror(false); this.setIserror(false);
if (error != 0) { if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
} }
Instruction instruction = null; Instruction instruction = null;
@@ -309,7 +309,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("hand_barcode", hand_barcode); jo.put("hand_barcode", hand_barcode);
jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code()); jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code());
jo.put("is_click", true); jo.put("is_click", true);
@@ -410,7 +410,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
return false; return false;
} }
} }
message = LangProcess.msg("universal_message5"); message = "universal_message5";
requireSucess = true; requireSucess = true;
return true; return true;
} }

View File

@@ -213,7 +213,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
@@ -222,7 +222,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
this.setIserror(false); this.setIserror(false);
if (error != 0) { if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
} }
Instruction instruction = null; Instruction instruction = null;
@@ -368,7 +368,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
try { try {
this.writing(list); this.writing(list);
} catch (Exception e) { } catch (Exception e) {
message = "写入信号失败"; message = "universal_write_erro";
} }
this.setRequireSucess(true); this.setRequireSucess(true);
@@ -458,7 +458,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("hand_barcode", hand_barcode); jo.put("hand_barcode", hand_barcode);
jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? barcode : checkInst().getVehicle_code()); jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? barcode : checkInst().getVehicle_code());
jo.put("is_click", true); jo.put("is_click", true);
@@ -559,7 +559,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
return false; return false;
} }
} }
message = LangProcess.msg("universal_message5"); message = "universal_message5";
requireSucess = true; requireSucess = true;
return true; return true;
} }

View File

@@ -163,7 +163,6 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
@Override @Override
public void execute() { public void execute() {
String message = null;
try { try {
device_code = this.getDeviceCode(); device_code = this.getDeviceCode();
mode = this.itemProtocol.getMode(); mode = this.itemProtocol.getMode();
@@ -204,12 +203,12 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -367,10 +366,10 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -187,7 +187,6 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
@Override @Override
public void execute() { public void execute() {
String message = null;
try { try {
device_code = this.getDeviceCode(); device_code = this.getDeviceCode();
mode = this.itemProtocol.getMode(); mode = this.itemProtocol.getMode();
@@ -229,11 +228,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = "未联机";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = "有报警"; message = "one_mode5";
//申请异常位任务 //申请异常位任务
applyErrorTask(); applyErrorTask();
} else { } else {
@@ -604,10 +602,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -187,7 +187,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
@@ -196,7 +196,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
this.setIserror(false); this.setIserror(false);
if (error != 0) { if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = "有报警"; message = "universal_message3";
} }
List toInstructions; List toInstructions;
@@ -313,7 +313,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
try { try {
this.writing(list); this.writing(list);
} catch (Exception e) { } catch (Exception e) {
message = "写入信号失败"; message = "universal_write_erro";
} }
this.setRequireSucess(true); this.setRequireSucess(true);
@@ -404,7 +404,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("hand_barcode", hand_barcode); jo.put("hand_barcode", hand_barcode);
jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code()); jo.put("barcode", this.getMove() == 0 ? null : checkInst() == null ? vehicle_code : checkInst().getVehicle_code());
jo.put("is_click", true); jo.put("is_click", true);
@@ -505,7 +505,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
return false; return false;
} }
} }
message = LangProcess.msg("universal_message5"); message = "universal_message5";
requireSucess = true; requireSucess = true;
return true; return true;
} }

View File

@@ -191,7 +191,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
@@ -284,24 +284,24 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map1.put("value", 5); map1.put("value", 5);
list.add(map1); list.add(map1);
this.writing(list); this.writing(list);
message = LangProcess.msg("universal_message1"); message = "universal_message1";
} catch (Exception e) { } catch (Exception e) {
message = LangProcess.msg("universal_message2"); message = "universal_message2";
} }
feedMessage = ""; feedMessage = "";
}else { }else {
feedMessage = LangProcess.msg("universal_feedMessage5"); feedMessage = "universal_feedMessage5";
if (mode != 3) { if (mode != 3) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1"); feedMessage = feedMessage + "universal_feedMessage1";
} }
if (action != 8) { if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2"); feedMessage = feedMessage + "universal_feedMessage2";
} }
if (move != 0) { if (move != 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3"); feedMessage = feedMessage + "universal_feedMessage3";
} }
if (task == 0) { if (task == 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4"); feedMessage = feedMessage + "universal_feedMessage4";
} }
} }
} }
@@ -575,10 +575,10 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
jo.put("x", x_position); jo.put("x", x_position);

View File

@@ -165,12 +165,12 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -242,25 +242,25 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map1.put("value", 5); map1.put("value", 5);
list.add(map1); list.add(map1);
this.writing(list); this.writing(list);
message = LangProcess.msg("universal_message1"); message = "universal_message1";
} catch (Exception e) { } catch (Exception e) {
message = LangProcess.msg("universal_message2"); message = "universal_message2";
e.printStackTrace(); e.printStackTrace();
} }
feedMessage = ""; feedMessage = "";
} else { } else {
feedMessage = LangProcess.msg("universal_feedMessage5"); feedMessage = "universal_feedMessage5";
if (mode != 3) { if (mode != 3) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1"); feedMessage = feedMessage + "universal_feedMessage1";
} }
if (action != 8) { if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2"); feedMessage = feedMessage + "universal_feedMessage2";
} }
if (move != 0) { if (move != 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3"); feedMessage = feedMessage + "universal_feedMessage3";
} }
if (task == 0) { if (task == 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4"); feedMessage = feedMessage + "universal_feedMessage4";
} }
} }
} }
@@ -540,10 +540,10 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -175,12 +175,12 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -262,25 +262,25 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map1.put("value", 5); map1.put("value", 5);
list.add(map1); list.add(map1);
this.writing(list); this.writing(list);
message = LangProcess.msg("universal_message1"); message = "universal_message1";
} catch (Exception e) { } catch (Exception e) {
message = LangProcess.msg("universal_message2"); message = "universal_message2";
e.printStackTrace(); e.printStackTrace();
} }
feedMessage = ""; feedMessage = "";
} else { } else {
feedMessage = LangProcess.msg("universal_feedMessage5"); feedMessage = "universal_feedMessage5";
if (mode != 3) { if (mode != 3) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1"); feedMessage = feedMessage + "universal_feedMessage1";
} }
if (action != 8) { if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2"); feedMessage = feedMessage + "universal_feedMessage2";
} }
if (move != 0) { if (move != 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3"); feedMessage = feedMessage + "universal_feedMessage3";
} }
if (task == 0) { if (task == 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4"); feedMessage = feedMessage + "universal_feedMessage4";
} }
} }
} }
@@ -562,10 +562,10 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -261,25 +261,25 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
map1.put("value", 5); map1.put("value", 5);
list.add(map1); list.add(map1);
this.writing(list); this.writing(list);
message = LangProcess.msg("universal_message1"); message = "universal_message1";
} catch (Exception e) { } catch (Exception e) {
message = LangProcess.msg("universal_message2"); message = "universal_message2";
e.printStackTrace(); e.printStackTrace();
} }
feedMessage = ""; feedMessage = "";
}else { }else {
feedMessage = LangProcess.msg("universal_feedMessage5"); feedMessage = "universal_feedMessage5";
if (mode != 3) { if (mode != 3) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1"); feedMessage = feedMessage + "universal_feedMessage1";
} }
if (action != 8) { if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2"); feedMessage = feedMessage + "universal_feedMessage2";
} }
if (move != 0) { if (move != 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3"); feedMessage = feedMessage + "universal_feedMessage3";
} }
if (task == 0) { if (task == 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4"); feedMessage = feedMessage + "universal_feedMessage4";
} }
} }
} }
@@ -573,10 +573,10 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -193,12 +193,12 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = LangProcess.msg("universal_off-line"); message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = LangProcess.msg("universal_message3"); message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -285,25 +285,25 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
map1.put("value", 5); map1.put("value", 5);
list.add(map1); list.add(map1);
this.writing(list); this.writing(list);
message = LangProcess.msg("universal_message1"); message = "universal_message1";
} catch (Exception e) { } catch (Exception e) {
message = LangProcess.msg("universal_message2"); message = "universal_message2";
e.printStackTrace(); e.printStackTrace();
} }
feedMessage = ""; feedMessage = "";
} else { } else {
feedMessage = LangProcess.msg("universal_feedMessage5"); feedMessage = "universal_feedMessage5";
if (mode != 3) { if (mode != 3) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1"); feedMessage = feedMessage + "universal_feedMessage1";
} }
if (action != 8) { if (action != 8) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage2"); feedMessage = feedMessage + "universal_feedMessage2";
} }
if (move != 0) { if (move != 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage3"); feedMessage = feedMessage + "universal_feedMessage3";
} }
if (task == 0) { if (task == 0) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage4"); feedMessage = feedMessage + "universal_feedMessage4";
} }
} }
} }
@@ -583,10 +583,10 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -378,10 +378,10 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -349,10 +349,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
if (mode != 3 || requireSucess) { if (mode != 3 || requireSucess) {
message = LangProcess.msg("one_message7"); message = "one_message7";
} else if (error != 0) { } else if (error != 0) {
message = LangProcess.msg("universal_message3"); message = "universal_message3";
//指定库位满入 //指定库位满入
if (error == 5) { if (error == 5) {
applyUpdatePointCode(StandarStirageErroEnum.FILL.getType()); applyUpdatePointCode(StandarStirageErroEnum.FILL.getType());
@@ -384,13 +384,13 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
} }
break; break;
case 1: case 1:
message = LangProcess.msg("universal_delivery"); message = "universal_delivery";
break; break;
case 2: case 2:
message = LangProcess.msg("universal_completed"); message = "universal_completed";
Instruction instruction = checkInst(); Instruction instruction = checkInst();
if (ObjectUtil.isEmpty(instruction)){ if (ObjectUtil.isEmpty(instruction)){
message = LangProcess.msg("universal_message4"); message = "universal_message4";
break; break;
} }
String next_device_code = instruction.getNext_device_code(); String next_device_code = instruction.getNext_device_code();
@@ -446,10 +446,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true; requireSucess = true;
break; break;
case 3: case 3:
message = LangProcess.msg("universal_releasing"); message = "universal_releasing";
break; break;
case 4: case 4:
message = LangProcess.msg("one_message1"); message = "one_message1";
Instruction instruction1 = checkInst(); Instruction instruction1 = checkInst();
String next_device_code1 = instruction1.getNext_device_code(); String next_device_code1 = instruction1.getNext_device_code();
Device nextDevice1 = deviceAppService.findDeviceByCode(next_device_code1); Device nextDevice1 = deviceAppService.findDeviceByCode(next_device_code1);
@@ -472,7 +472,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true; requireSucess = true;
break; break;
case 5: case 5:
message = LangProcess.msg("universal_releasing_completed"); message = "universal_releasing_completed";
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("code", "to_command"); map.put("code", "to_command");
map.put("value", 5); map.put("value", 5);
@@ -486,7 +486,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true; requireSucess = true;
break; break;
case 6: case 6:
message = LangProcess.msg("one_message2"); message = "one_message2";
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
map1.put("code", "to_command"); map1.put("code", "to_command");
map1.put("value", 6); map1.put("value", 6);
@@ -494,7 +494,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true; requireSucess = true;
break; break;
case 7: case 7:
message = LangProcess.msg("one_message3"); message = "one_message3";
Map<String, Object> map2 = new HashMap<>(); Map<String, Object> map2 = new HashMap<>();
map2.put("code", "to_command"); map2.put("code", "to_command");
map2.put("value", 7); map2.put("value", 7);
@@ -502,7 +502,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true; requireSucess = true;
break; break;
case 8: case 8:
message = LangProcess.msg("one_message4"); message = "one_message4";
Map<String, Object> map3 = new HashMap<>(); Map<String, Object> map3 = new HashMap<>();
map3.put("code", "to_command"); map3.put("code", "to_command");
map3.put("value", 8); map3.put("value", 8);
@@ -510,7 +510,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = true; requireSucess = true;
break; break;
default: default:
message = LangProcess.msg("one_message5"); message = "one_message5";
requireSucess = true; requireSucess = true;
break; break;
} }
@@ -567,7 +567,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
} else { } else {
Instruction instruction = instructionService.findByCode(String.valueOf(task)); Instruction instruction = instructionService.findByCode(String.valueOf(task));
if (ObjectUtil.isNotEmpty(instruction)){ if (ObjectUtil.isNotEmpty(instruction)){
message = LangProcess.msg("one_message9"); message = "one_message9";
return; return;
} }
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
@@ -664,7 +664,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
for (Instruction instruction : instructions) { for (Instruction instruction : instructions) {
List<RouteLineDto> routeLineDtos = routeLineService.selectDeviceCodeList(instruction.getStart_device_code()); List<RouteLineDto> routeLineDtos = routeLineService.selectDeviceCodeList(instruction.getStart_device_code());
if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) { if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) {
message = LangProcess.msg("one_message6"); message = "one_message6";
logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->" logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->"
+ this.device_code + "的路由"); + this.device_code + "的路由");
continue; continue;
@@ -673,7 +673,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
if (this.getDeviceCode().equals(routeLineDto.getNext_device_code())) { if (this.getDeviceCode().equals(routeLineDto.getNext_device_code())) {
List<RouteLineDto> routeLineDtoList = routeLineService.selectDeviceCodeList(this.getDeviceCode()); List<RouteLineDto> routeLineDtoList = routeLineService.selectDeviceCodeList(this.getDeviceCode());
if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) { if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) {
message = LangProcess.msg("one_message6"); message = "one_message6";
logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->" logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->"
+ this.device_code + "的路由"); + this.device_code + "的路由");
continue; continue;
@@ -898,7 +898,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
jo.put("action", action); jo.put("action", action);
jo.put("task", task); jo.put("task", task);
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("prohibitInWarehouse", this.prohibitInWarehouse); jo.put("prohibitInWarehouse", this.prohibitInWarehouse);
jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse); jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse);
jo.put("stopReceiveTask", this.stopReceiveTask); jo.put("stopReceiveTask", this.stopReceiveTask);

View File

@@ -258,9 +258,9 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
} }
} else { } else {
feedMessage = LangProcess.msg("universal_feedMessage5"); feedMessage = "universal_feedMessage5";
if (mode != 3) { if (mode != 3) {
feedMessage = feedMessage + LangProcess.msg("universal_feedMessage1"); feedMessage = feedMessage + "universal_feedMessage1";
} }
if (action != 5) { if (action != 5) {
feedMessage = feedMessage + LangProcess.msg("two_message4"); feedMessage = feedMessage + LangProcess.msg("two_message4");
@@ -618,10 +618,10 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
return jo; return jo;

View File

@@ -1068,10 +1068,10 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
jo.put("x", x_position); jo.put("x", x_position);

View File

@@ -562,7 +562,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
jo.put("action", action); jo.put("action", action);
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
return jo; return jo;
} }

View File

@@ -614,10 +614,10 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
jo.put("x", x_position); jo.put("x", x_position);

View File

@@ -616,10 +616,10 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError()); jo.put("error", this.getError());
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", this.getMessage()); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);
jo.put("x", x_position); jo.put("x", x_position);

View File

@@ -737,7 +737,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
jo.put("driver_type", "slit_two_manipulator"); jo.put("driver_type", "slit_two_manipulator");
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("notCreateInstMessage", notCreateInstMessage);
jo.put("feedMessage", feedMessage); jo.put("feedMessage", LangProcess.msg(feedMessage));
return jo; return jo;
} }

View File

@@ -18,3 +18,4 @@ one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1
one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93
one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1
one_mode4=\u7533\u8BF7\u7A7A\u6258\u76D8\u51FA\u5E93 one_mode4=\u7533\u8BF7\u7A7A\u6258\u76D8\u51FA\u5E93
one_mode5=\u6709\u62A5\u8B66,\u7533\u8BF7\u5F02\u5E38\u4F4D\u4EFB\u52A1

View File

@@ -18,4 +18,5 @@ one_mode1=Request a warehouse entry task
one_mode2=Request empty pallets for storage one_mode2=Request empty pallets for storage
one_mode3=Request AGV one_mode3=Request AGV
one_mode4=Request empty pallets out of warehouse one_mode4=Request empty pallets out of warehouse
one_mode5=have an alarm. Request an anomaly task

View File

@@ -18,3 +18,4 @@ one_mode1=Berlaku untuk tugas pustaka
one_mode2=Pendaftaran nampan kosong one_mode2=Pendaftaran nampan kosong
one_mode3=Permintaan AGV one_mode3=Permintaan AGV
one_mode4=Mendaftar untuk pengiriman nampan kosong one_mode4=Mendaftar untuk pengiriman nampan kosong
one_mode5=have an alarm. Request an anomaly task

View File

@@ -18,3 +18,4 @@ one_mode1=\u7533\u8BF7\u5165\u5E93\u4EFB\u52A1
one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93 one_mode2=\u7533\u8BF7\u7A7A\u6258\u76D8\u5165\u5E93
one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1 one_mode3=\u7533\u8BF7AGV\u4EFB\u52A1
one_mode4=\u7533\u8BF7\u7A7A\u6258\u76D8\u51FA\u5E93 one_mode4=\u7533\u8BF7\u7A7A\u6258\u76D8\u51FA\u5E93
one_mode5=\u6709\u62A5\u8B66,\u7533\u8BF7\u5F02\u5E38\u4F4D\u4EFB\u52A1

View File

@@ -34,6 +34,7 @@ universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B
universal_feedMessage6=\u89E6\u53D1\u65F6\u95F4\u56E0\u4E3A\u5C0F\u4E8E{}\u6BEB\u79D2\uFF0C\u800C\u88AB\u65E0\u89C6 universal_feedMessage6=\u89E6\u53D1\u65F6\u95F4\u56E0\u4E3A\u5C0F\u4E8E{}\u6BEB\u79D2\uFF0C\u800C\u88AB\u65E0\u89C6
universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001 universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001
universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0 universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0
universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25

View File

@@ -34,3 +34,4 @@ universal_feedMessage5=Gantry manipulator
universal_feedMessage6=The trigger time is ignored because it is less than {} milliseconds universal_feedMessage6=The trigger time is ignored because it is less than {} milliseconds
universal_feedMessage7=Move is not in stock universal_feedMessage7=Move is not in stock
universal_feedMessage8=The task number is 0 universal_feedMessage8=The task number is 0
universal_write_erro=Write signal failure

View File

@@ -34,3 +34,4 @@ universal_feedMessage5=Pengemudi-mekanik line
universal_feedMessage6=Waktu pemicu diabaikan karena kurang dari {} milidetik universal_feedMessage6=Waktu pemicu diabaikan karena kurang dari {} milidetik
universal_feedMessage7=Pindah tidak tersedia universal_feedMessage7=Pindah tidak tersedia
universal_feedMessage8=Nomor tugasnya adalah 0 universal_feedMessage8=Nomor tugasnya adalah 0
universal_write_erro=Sinyal penulis gagal

View File

@@ -34,3 +34,4 @@ universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B
universal_feedMessage6=\u89E6\u53D1\u65F6\u95F4\u56E0\u4E3A\u5C0F\u4E8E{}\u6BEB\u79D2\uFF0C\u800C\u88AB\u65E0\u89C6 universal_feedMessage6=\u89E6\u53D1\u65F6\u95F4\u56E0\u4E3A\u5C0F\u4E8E{}\u6BEB\u79D2\uFF0C\u800C\u88AB\u65E0\u89C6
universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001 universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001
universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0 universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0
universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25