diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index e6ef10bbd..59dce8c31 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -813,6 +813,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); String mode = ""; + String move = ""; String requireSucess = "0"; if (this.requireSucess) { requireSucess = "1"; @@ -832,18 +833,22 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("message", LangProcess.msg(message)); - jo.put("error", this.getError()); - String move = "无货"; - jo.put("hasGoods", false); - if (this.move == 1) { - move = "有货"; + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); + 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); + } else if (this.getMove() == 2) { + move = LangProcess.msg("universal_two_yes"); jo.put("hasGoods", true); } String container_type = ""; if (this.container_type == 1) { - container_type = "小托盘"; + container_type = LangProcess.msg("universal_small_pallets"); } else if (this.container_type == 2) { - container_type = "大托盘"; + container_type = LangProcess.msg("universal_large_pallets"); } jo.put("move", move); jo.put("task", task); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java index f86337142..6b296d1ed 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -14,6 +14,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.monitor.DeviceStageMonitor; @@ -28,6 +29,7 @@ import org.nl.acs.task.service.mapper.TaskMapper; import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.CodeUtil; import org.nl.config.SpringContextHolder; +import org.nl.config.language.LangProcess; import org.openscada.opc.lib.da.Server; import java.util.Date; @@ -418,23 +420,22 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp 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()); @@ -442,7 +443,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("move", move); jo.put("action", action); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("task", this.getTask()); return jo; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 1e438a7fd..8a30e9cc5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -10,12 +10,14 @@ import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.common.base.CommonFinalParam; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; +import org.nl.acs.device.service.dto.DeviceDto; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; @@ -228,12 +230,12 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple String action = ""; String move = ""; String option = ""; - if(this.getOption() == 0){ - option ="禁止进出"; - } else if(this.getOption() == 1){ - option ="允许进入"; - } else if(this.getOption() == 2){ - option ="允许离开"; + if (this.getOption() == 0) { + action = LangProcess.msg("universal_actionMessage1"); + } else if (this.getOption() == 1) { + action = LangProcess.msg("universal_actionMessage2"); + } else if (this.getOption() == 2) { + action = LangProcess.msg("universal_actionMessage3"); } if (this.getMode() == 0) { mode = LangProcess.msg("universal_off-line"); @@ -256,13 +258,15 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple move = LangProcess.msg("universal_two_yes"); jo.put("hasGoods", true); } - - jo.put("device_name", this.getDevice().getDevice_name()); + DeviceDto dto = deviceservice.findByCode(this.getDevice().getDevice_code()); + jo.put("zh_device_name",dto.getZh_device_name()); + jo.put("en_device_name",dto.getEn_device_name()); + jo.put("in_device_name",dto.getIn_device_name()); jo.put("mode", mode); jo.put("move", move); jo.put("action", action); jo.put("isOnline", true); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("option", option); jo.put("is_click", true); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java index cbc742666..1359c9851 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java @@ -619,9 +619,9 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i } if (this.carrier_direction == 1) { - carrier_direction = "正转"; + carrier_direction = LangProcess.msg("universal_forward_rotation"); } else if (this.carrier_direction == 2) { - carrier_direction = "反转"; + carrier_direction = LangProcess.msg("universal_rollback"); } String requireSucess = "0"; if (this.requireSucess) { @@ -637,7 +637,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("inst_message", this.inst_message); jo.put("last_inst_message", this.last_inst_message); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("hand_barcode", hand_barcode); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java index 51faeb6f0..3e11b6c61 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java @@ -333,7 +333,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("inst_message", this.inst_message); jo.put("last_inst_message", this.last_inst_message); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("hand_barcode", hand_barcode); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index eaaf07258..d434825f7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java @@ -640,9 +640,9 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr if (this.carrier_direction == 1) { - carrier_direction = "正转"; + carrier_direction = LangProcess.msg("universal_forward_rotation"); } else if (this.carrier_direction == 2) { - carrier_direction = "反转"; + carrier_direction = LangProcess.msg("universal_rollback"); } String requireSucess = "0"; if (this.requireSucess) { @@ -658,7 +658,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr jo.put("inst_message", this.inst_message); jo.put("last_inst_message", this.last_inst_message); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("hand_barcode", hand_barcode); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index 12ed13238..42aea8be4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -633,7 +633,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements jo.put("action", action); jo.put("task", task); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 05dd81be7..d6f28126d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -800,7 +800,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv jo.put("action", action); jo.put("task", task); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java index fc7b9ce1c..4e3a2f964 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java @@ -396,9 +396,9 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl if (this.carrier_direction == 1) { - carrier_direction = "正转"; + carrier_direction = LangProcess.msg("universal_forward_rotation"); } else if (this.carrier_direction == 2) { - carrier_direction = "反转"; + carrier_direction = LangProcess.msg("universal_rollback"); } String requireSucess = "0"; if (this.requireSucess) { @@ -414,7 +414,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("inst_message", this.inst_message); jo.put("last_inst_message", this.last_inst_message); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("hand_barcode", hand_barcode); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java index 8a55936ac..4dee22a8a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java @@ -631,7 +631,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("task", task); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index b1be9a5ea..6d1193161 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java @@ -583,7 +583,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("action", action); jo.put("task", task); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java index 7d60f656f..3ace89feb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java @@ -597,7 +597,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("action", action); jo.put("task", task); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java index 76794eee8..e8f84b53e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java @@ -616,7 +616,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice jo.put("action", action); jo.put("task", task); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java index ef6677728..6626f9ee0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java @@ -635,7 +635,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi jo.put("action", action); jo.put("task", task); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java index e2a9e3a68..9b790950c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java @@ -686,7 +686,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl map.put("device_name", this.getDevice().getDevice_name()); map.put("is_click", true); map.put("mode", mode); - map.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); + map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); map.put("move", move); map.put("isOnline", this.getIsonline()); map.put("out_seq_arr", this.getItem_out_seq_arr()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDefination.java index 7908f8c29..7450a3eed 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDefination.java @@ -5,7 +5,6 @@ import org.nl.acs.device.domain.Device; import org.nl.acs.device.enums.DeviceType; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device_driver.two_conveyor.pull_head_manipulator.ItemProtocol; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java index 485f9f684..06df4f541 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java @@ -11,6 +11,7 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; import org.nl.acs.instruction.domain.Instruction; @@ -23,6 +24,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; @@ -214,13 +216,32 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); String mode = ""; - String action = ""; 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); + } else if (this.getMove() == 2) { + move = LangProcess.msg("universal_two_yes"); + jo.put("hasGoods", true); + } + String action = ""; jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", "联机"); - jo.put("action", action); + jo.put("mode", mode); + jo.put("move", move);jo.put("action", action); jo.put("isOnline", true); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); return jo; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java index 23b4fee90..2da704d38 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java @@ -317,19 +317,24 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr 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"; @@ -338,13 +343,13 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr } 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()); @@ -354,7 +359,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr jo.put("task", task); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", message); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 408dcf376..f993b2a14 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -1070,25 +1070,25 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } String command = ""; if(this.command == 0){ - command = "待机"; + command = LangProcess.msg("universal_standby"); }else if(this.command == 1){ - command = "取货中"; + command = LangProcess.msg("universal_delivery"); }else if(this.command == 2){ - command = "取货完成"; + command = LangProcess.msg("universal_completed"); }else if(this.command == 3){ - command = "放货中"; + command = LangProcess.msg("universal_releasing"); }else if(this.command == 4){ - command = "请求卸货(申请卸货)"; + command = LangProcess.msg("one_message1"); }else if(this.command == 5){ - command = "放货完成"; + command = LangProcess.msg("universal_releasing_completed"); }else if(this.command == 6){ - command = "取货准备(回库台)"; + command = LangProcess.msg("one_message2"); }else if(this.command == 7){ - command = "召回"; + command = LangProcess.msg("one_message3"); }else if(this.command == 8){ - command = "急停"; + command = LangProcess.msg("one_message4"); }else if(this.command == 9){ - command = "未知"; + command = LangProcess.msg("one_message5"); } jo.put("mode", mode); jo.put("move", move); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java index ab4623e6c..c638e5707 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java @@ -699,7 +699,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem jo.put("task", task); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java index d69c17f02..05726a8a0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blanking_button/BlankingButtonDriver.java @@ -18,6 +18,7 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.BlankingButtonRequest; import org.nl.acs.ext.wms.data.BlankingButtonResponse; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; import org.nl.acs.instruction.domain.Instruction; @@ -320,19 +321,19 @@ public class BlankingButtonDriver extends AbstractOpcDeviceDriver implements Dev 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"; @@ -341,13 +342,13 @@ public class BlankingButtonDriver extends AbstractOpcDeviceDriver implements Dev } 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()); @@ -356,7 +357,7 @@ public class BlankingButtonDriver extends AbstractOpcDeviceDriver implements Dev jo.put("action", action); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("driver_type", "siemens_conveyor"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/green_foil_machine_button/GreenFoilMachineButtonDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/green_foil_machine_button/GreenFoilMachineButtonDriver.java index 7e8081ce0..dfc03da4a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/green_foil_machine_button/GreenFoilMachineButtonDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/green_foil_machine_button/GreenFoilMachineButtonDriver.java @@ -18,6 +18,7 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.ApplyGreenFoilButtonRequest; import org.nl.acs.ext.wms.data.ApplyGreenFoilButtonResponse; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; import org.nl.acs.instruction.domain.Instruction; @@ -263,19 +264,19 @@ public class GreenFoilMachineButtonDriver extends AbstractOpcDeviceDriver implem 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"; @@ -284,11 +285,11 @@ public class GreenFoilMachineButtonDriver extends AbstractOpcDeviceDriver implem } jo.put("requireSucess", requireSucess); if (this.getAction() == 0) { - action = "不允许取放"; + action = LangProcess.msg("universal_actionMessage1"); } else if (this.getAction() == 1) { - action = "允许取放"; + action = LangProcess.msg("universal_actionMessage2"); } else if (this.getAction() == 2) { - action = "允许离开"; + action = LangProcess.msg("universal_actionMessage3"); } jo.put("device_name", this.getDevice().getDevice_name()); @@ -297,7 +298,7 @@ public class GreenFoilMachineButtonDriver extends AbstractOpcDeviceDriver implem jo.put("action", action); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("driver_type", "siemens_conveyor"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java index d9d5a3515..442bff12d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_conveyor/HongXiangStationDeviceDriver.java @@ -14,12 +14,14 @@ import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; +import org.nl.config.language.LangProcess; import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.param.ISysParamService; @@ -181,11 +183,30 @@ public class HongXiangStationDeviceDriver extends AbstractOpcDeviceDriver implem if(error == 0 && iserror){ message = "universal_message11"; } + String mode = ""; + String action = ""; + 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.getAction() == 0) { + action = LangProcess.msg("universal_actionMessage1"); + } else if (this.getAction() == 1) { + action = LangProcess.msg("universal_actionMessage2"); + } else if (this.getAction() == 2) { + action = LangProcess.msg("universal_actionMessage3"); + } + jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode ==2 ? "待机": "脱机"); - jo.put("action", action == 1 ? "允许取放": "不允许取放"); + jo.put("mode", mode); + jo.put("action", action); jo.put("isOnline", true); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("task", this.getTask()); return jo; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java index 8830c9a19..7b73cfa32 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java @@ -27,6 +27,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.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; import org.springframework.beans.factory.annotation.Autowired; @@ -364,11 +365,13 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver 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 = LangProcess.msg("universal_operation"); } String requireSucess = "0"; if (this.requireSucess) { @@ -377,13 +380,13 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple jo.put("requireSucess", requireSucess); 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(error == 0 && iserror){ @@ -393,7 +396,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple jo.put("temperature", temperature); jo.put("finish", finish); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("hx_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("countdown_house", countdown_house); jo.put("countdown_min", countdown_min); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/inflatable_shaft_library/InflatableShaftLibraryDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/inflatable_shaft_library/InflatableShaftLibraryDeviceDriver.java index 75d8cbe0f..7de801752 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/inflatable_shaft_library/InflatableShaftLibraryDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/inflatable_shaft_library/InflatableShaftLibraryDeviceDriver.java @@ -12,6 +12,7 @@ import org.nl.acs.device_driver.FeedLmsRealFailed; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; import org.nl.acs.instruction.service.InstructionService; @@ -154,19 +155,19 @@ public class InflatableShaftLibraryDeviceDriver extends AbstractOpcDeviceDriver 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"; @@ -175,13 +176,13 @@ public class InflatableShaftLibraryDeviceDriver extends AbstractOpcDeviceDriver } 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()); @@ -190,7 +191,7 @@ public class InflatableShaftLibraryDeviceDriver extends AbstractOpcDeviceDriver jo.put("action", action); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("driver_type", "siemens_conveyor"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java index 06ac5eaa4..bd883b46c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java @@ -24,6 +24,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; @@ -189,8 +190,26 @@ public class ManipulatorAgvStationDeviceDriver extends AbstractOpcDeviceDriver i if(iserror){ message = "universal_message11"; } + 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.getAction() == 1) { + action = LangProcess.msg("universal_delivery"); + } else if (this.getAction() == 2) { + action = LangProcess.msg("universal_completed"); + } else if (this.getAction() == 3) { + action = LangProcess.msg("universal_releasing"); + } else if (this.getAction() == 4) { + action = LangProcess.msg("universal_releasing_completed"); + } jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", "联机"); + jo.put("mode", mode); jo.put("action", action); jo.put("isOnline", true); jo.put("isError", this.getIserror()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 34283cd88..e46782819 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -1109,20 +1109,20 @@ public class OvenGantryManipulatorDeviceDriver 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"); } if (error == 0 && iserror) { this.setMessage(LangProcess.msg("universal_message4")); } - String requireActionSucess = "请求动作已复位"; + String requireActionSucess = LangProcess.msg("universal_actionMessage4"); if(this.requireActionSucess){ - requireActionSucess = "请求动作未复位"; + requireActionSucess = LangProcess.msg("universal_actionMessage5"); } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); @@ -1131,7 +1131,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("task", task); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", ErrorUtil.getDictDetail("hxhj_error_type", String.valueOf(this.getError()))); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", message); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index f36ba36a6..0f3d9cbf2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -20,6 +20,7 @@ import org.nl.acs.ext.wms.data.ApplyPlugPullSitResponse; import org.nl.acs.ext.wms.data.ApplyPlugPullSiteRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; @@ -613,6 +614,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("mode", mode); jo.put("move", move); jo.put("action", action); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isOnline", this.getIsonline()); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); @@ -624,6 +626,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl } + public void writing(String param, String value) { String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index 3dc846cc0..221acfd67 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java @@ -664,7 +664,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("task", task); jo.put("walk_y", walkY); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", message); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index 88bdcd7fa..f930a6196 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java @@ -579,37 +579,37 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp 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"; if (this.requireSucess) { requireSucess = "1"; } 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"); } if(error == 0 && this.itemProtocol.isError){ - message = "信号连接异常!"; iserror = true; }else if(error == 0 && !this.itemProtocol.isError){ iserror = false; @@ -621,7 +621,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("task", task); jo.put("walk_y", walk_y); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 18560b69c..87f776a76 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -16,6 +16,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; @@ -30,6 +31,7 @@ import org.nl.acs.task.service.dto.TaskDto; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; +import org.nl.config.language.InitLocaleResolver; import org.nl.config.language.LangProcess; import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; @@ -731,9 +733,9 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (this.getIs_disable() == 0) { - is_disable = "正常"; + is_disable = LangProcess.msg("universal_normal"); } else if (this.getIs_disable() == 1) { - is_disable = "禁用"; + is_disable = LangProcess.msg("universal_disable"); } String requireSucess = "0"; @@ -755,7 +757,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("move_2", move_2); jo.put("action", action); jo.put("walk_y", walk_y); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("task", this.getTask()); jo.put("isOnline", this.getIsonline()); jo.put("isError", this.getIserror()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java index eb7893aa0..790ae0dc1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/waste_foil_weighing_station/WasteFoilWeighingStationDriver.java @@ -14,6 +14,7 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.data.GetWasteFoilWeightRequest; import org.nl.acs.ext.wms.data.GetWasteFoilWeightResponse; import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; import org.nl.acs.instruction.domain.Instruction; @@ -351,7 +352,7 @@ public class WasteFoilWeighingStationDriver extends AbstractOpcDeviceDriver impl jo.put("mode", mode); jo.put("move", move); jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); + jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("isError", this.getIserror()); jo.put("weight", this.getWeight()); jo.put("old_weight", this.getOld_weight()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java index 83be744c2..07a323bd0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java @@ -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.InitLocaleResolver; import org.nl.config.language.LangProcess; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; @@ -27,6 +28,8 @@ public class ErrorUtil { public static String getDictDetail(String type, String error_code) { + InitLocaleResolver initLocaleResolver = new InitLocaleResolver(); + String language = initLocaleResolver.getLanguage(); getDict(); List dictDetailDtos = dictMap.get(type); String detail = null; @@ -34,10 +37,24 @@ public class ErrorUtil { for (int i = 0; i < dictDetailDtos.size(); i++) { Dict dictDetailDto = dictDetailDtos.get(i); String value = dictDetailDto.getValue(); - String label = dictDetailDto.getLabel(); +// String label = dictDetailDto.getLabel(); + String en_label = dictDetailDto.getEn_label(); + String in_label = dictDetailDto.getIn_label(); + String zh_label = dictDetailDto.getZh_label(); if (StrUtil.equals(value, error_code)) { - detail = label; - break; + if (language.contains("zh")){ + detail = zh_label; + break; + } + if (language.contains("in")){ + detail = in_label; + break; + } + if (language.contains("en")){ + detail = en_label; + break; + } + } } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java index be92de0d7..5d16d842e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java @@ -12,11 +12,14 @@ import java.util.Map; public class InitLocaleResolver implements LocaleResolver { public static Map Language_Country = MapOf.of("id","in-ID","in","in-ID","en-US,en;q=0.9","en-US","en","en-US","zh","zh-CN"); + public static String language = ""; @Override public Locale resolveLocale(HttpServletRequest request) { String header = request.getHeader("Accept-Language"); if (StringUtils.isNotEmpty(header)){ String lang = Language_Country.get(header); + language = lang; + System.out.println("lang的值为："+lang); if (StringUtils.isNotEmpty(lang)){ String[] l = lang.split("-"); //印尼的ISO标准国家代码为id-ID @@ -29,4 +32,7 @@ public class InitLocaleResolver implements LocaleResolver { @Override public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) { } + public String getLanguage(){ + return language; + } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java index 2010f30e8..cb1cc49de 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java @@ -104,4 +104,19 @@ public class Dict implements Serializable { */ private String update_time; + /** + * 中文字典标签 + */ + private String zh_label; + + /** + * 英文字典标签 + */ + private String en_label; + + /** + * 印尼字典标签 + */ + private String in_label; + } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java index 33f9a3e25..a46d4af5e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java @@ -74,5 +74,20 @@ public class Stage implements Serializable { */ private String update_time; + /** + * 舞台中文名称 + */ + private String zh_stage_name; + + /** + * 舞台英文名称 + */ + private String en_stage_name; + + /** + * 舞台印尼名称 + */ + private String in_stage_name; + } diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties index 5dd2b8e3c..c727facc2 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties @@ -5,6 +5,12 @@ universal_standby=\u5F85\u673A universal_operation=\u8FD0\u884C\u4E2D universal_no=\u65E0\u8D27 universal_yes=\u6709\u8D27 +universal_normal=\u6B63\u5E38 +universal_disable=\u7981\u7528 +universal_large_pallets=\u5927\u6258\u76D8 +universal_small_pallets=\u5C0F\u6258\u76D8 +universal_forward_rotation=\u6B63\u8F6C +universal_rollback=\u53CD\u8F6C universal_two_yes=\u6709\u6258\u76D8\u6709\u8D27 universal_delivery=\u53D6\u8D27\u4E2D universal_completed=\u53D6\u8D27\u5B8C\u6210 @@ -47,6 +53,11 @@ universal_notCreateInstMessage3=\u8BBE\u5907\u5F85\u673A\u6216\u4E0D\u5141\u8BB8 universal_notCreateInstMessage4=ddj\u5BF9\u63A5\u4F4D\u6709\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4! universal_notCreateInstMessage5=\u5B58\u5728\u76F8\u540C\u8DEF\u7EBF\u7684\u6307\u4EE4! universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93\u9001\u7EBF\u6307\u4EE4! +universal_actionMessage1=\u4E0D\u5141\u8BB8\u53D6\u653E +universal_actionMessage2=\u5141\u8BB8\u53D6\u653E +universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00 +universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D +universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties index 786aa8688..5e900dad7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties @@ -4,6 +4,12 @@ universal_standby=standby universal_operation=operation universal_no=Out of stock universal_yes=In stock +universal_normal=normal +universal_disable=disable +universal_large_pallets=large pallets +universal_small_pallets=small pallets +universal_forward_rotation=forward rotation +universal_rollback=rollback universal_two_yes=There are pallets and goods universal_delivery=Taking delivery universal_completed=Pick-up completed @@ -46,3 +52,8 @@ universal_notCreateInstMessage3=The device is in standby mode or is not allowed universal_notCreateInstMessage4=ddj interface bit is in stock, cannot generate command! universal_notCreateInstMessage5=Instructions with the same route exist! universal_notCreateInstMessage6=The next device is not a conveyor line directive! +universal_actionMessage1=Pick-and-place is not permitted +universal_actionMessage2=Pick-and-place is allowed +universal_actionMessage3=Permission to leave +universal_actionMessage4=The request action has been reset +universal_actionMessage5=The request action is not reset diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties index cc6ee070b..94a1ed003 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties @@ -4,6 +4,12 @@ universal_standby=siaga universal_operation=operasi universal_no=bayar universal_yes=Yang aku mau +universal_normal=biasa +universal_disable=menonaktifkan +universal_large_pallets=Palet besar +universal_small_pallets=Nampan kecil +universal_forward_rotation=Rotasi ke depan +universal_rollback=Rollback universal_two_yes=Ada nampan dengan barang universal_delivery=Mengambil barang universal_completed=Pengambilan barang selesai @@ -46,3 +52,8 @@ universal_notCreateInstMessage3=Siaga perangkat atau tidak diizinkan masuk universal_notCreateInstMessage4=DDJ mendarat di dok, tidak ada perintah yang diberikan! universal_notCreateInstMessage5=Ada instruksi tentang rute yang sama! universal_notCreateInstMessage6=Perangkat berikutnya bukan arahan jalur konveyor! +universal_actionMessage1=Pick-and-place tidak diizinkan +universal_actionMessage2=Pick-and-place diperbolehkan +universal_actionMessage3=Izin untuk pergi +universal_actionMessage4=Tindakan permintaan telah disetel ulang +universal_actionMessage5=Tindakan permintaan tidak disetel ulang diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties index ee062b42c..0e45f7682 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties @@ -4,7 +4,13 @@ universal_standby=\u5F85\u673A universal_operation=\u8FD0\u884C\u4E2D universal_no=\u65E0\u8D27 universal_yes=\u6709\u8D27 +universal_normal=\u6B63\u5E38 +universal_disable=\u7981\u7528 universal_two_yes=\u6709\u6258\u76D8\u6709\u8D27 +universal_large_pallets=\u5927\u6258\u76D8 +universal_small_pallets=\u5C0F\u6258\u76D8 +universal_forward_rotation=\u6B63\u8F6C +universal_rollback=\u53CD\u8F6C universal_delivery=\u53D6\u8D27\u4E2D universal_completed=\u53D6\u8D27\u5B8C\u6210 universal_releasing=\u653E\u8D27\u4E2D @@ -33,6 +39,11 @@ universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u7 universal_feedMessage4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u4E0D\u5E94\u8BE5\u4E3A0 universal_feedMessage5=\u884C\u67B6\u673A\u68B0\u624B universal_feedMessage6=\u4EFB\u52A1\u5B8C\u6210 +universal_actionMessage1=\u4E0D\u5141\u8BB8\u53D6\u653E +universal_actionMessage2=\u5141\u8BB8\u53D6\u653E +universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00 +universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D +universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D universal_feedMessage7=move\u4E0D\u4E3A\u6709\u8D27\u72B6\u6001 universal_feedMessage8=\u4EFB\u52A1\u53F7\u4E3A0 universal_feedMessage9=\u52A8\u4F5C\u4FE1\u53F7\u4E0D\u662F\u4EFB\u52A1\u5B8C\u6210 diff --git a/acs2/nladmin-ui/src/i18n/langs/chinese.js b/acs2/nladmin-ui/src/i18n/langs/chinese.js index 82faadfc1..1a29c69f1 100644 --- a/acs2/nladmin-ui/src/i18n/langs/chinese.js +++ b/acs2/nladmin-ui/src/i18n/langs/chinese.js @@ -23,6 +23,7 @@ import department from './department/zh' import dict from './dict/zh' import angle from './angle/zh' import regional from './regional/zh' +import stage from './stage/zh' export default { ...zhLocale, @@ -49,6 +50,7 @@ export default { ...department, ...dict, ...angle, - ...regional + ...regional, + ...stage } diff --git a/acs2/nladmin-ui/src/i18n/langs/dict/en.js b/acs2/nladmin-ui/src/i18n/langs/dict/en.js index 21b21370c..633d7fb0d 100644 --- a/acs2/nladmin-ui/src/i18n/langs/dict/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/dict/en.js @@ -13,6 +13,9 @@ export default { 'other': { 'Dict_detail': 'Dict Detail', 'Department_label': 'Department Label', + 'Department_label_zh': 'Chinese dictionary tags', + 'Department_label_en': 'English dictionary tags', + 'Department_label_in': 'Indonesian dictionary labels', 'Dictionary_value': 'Dictionary Value', 'Sort': 'Sort', 'Parameter1': 'Parameter1', diff --git a/acs2/nladmin-ui/src/i18n/langs/dict/in.js b/acs2/nladmin-ui/src/i18n/langs/dict/in.js index f63d7a54a..ce70cd683 100644 --- a/acs2/nladmin-ui/src/i18n/langs/dict/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/dict/in.js @@ -13,6 +13,9 @@ export default { 'other': { 'Dict_detail': 'Detail Kamus', 'Department_label': 'Tag Kamus', + 'Department_label_zh': 'Kamus Cina tags', + 'Department_label_en': 'Kamus bahasa Inggris tags', + 'Department_label_in': 'Label kamus bahasa Indonesia', 'Dictionary_value': 'Nilai Kamus', 'Sort': 'Jenis', 'Parameter1': 'Parameter 1', diff --git a/acs2/nladmin-ui/src/i18n/langs/dict/zh.js b/acs2/nladmin-ui/src/i18n/langs/dict/zh.js index e8f48a75b..9c9108fd5 100644 --- a/acs2/nladmin-ui/src/i18n/langs/dict/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/dict/zh.js @@ -13,6 +13,9 @@ export default { 'other': { 'Dict_detail': '字典详情', 'Department_label': '字典标签', + 'Department_label_zh': '中文字典标签', + 'Department_label_en': '英文字典标签', + 'Department_label_in': '印尼字典标签', 'Dictionary_value': '字典值', 'Sort': '排序', 'Parameter1': '参数1', diff --git a/acs2/nladmin-ui/src/i18n/langs/english.js b/acs2/nladmin-ui/src/i18n/langs/english.js index 71cf71401..fbf45031e 100644 --- a/acs2/nladmin-ui/src/i18n/langs/english.js +++ b/acs2/nladmin-ui/src/i18n/langs/english.js @@ -23,6 +23,7 @@ import department from './department/en' import dict from './dict/en' import angle from './angle/en' import regional from './regional/en' +import stage from './stage/en' export default { ...enLocale, @@ -49,6 +50,7 @@ export default { ...department, ...dict, ...angle, - ...regional + ...regional, + ...stage } diff --git a/acs2/nladmin-ui/src/i18n/langs/indonesian.js b/acs2/nladmin-ui/src/i18n/langs/indonesian.js index 1b00062df..e2e3e4c46 100644 --- a/acs2/nladmin-ui/src/i18n/langs/indonesian.js +++ b/acs2/nladmin-ui/src/i18n/langs/indonesian.js @@ -23,6 +23,7 @@ import department from './department/in' import dict from './dict/in' import angle from './angle/in' import regional from './regional/in' +import stage from './stage/in' export default { ...idLocale, @@ -50,5 +51,6 @@ export default { ...department, ...dict, ...angle, - ...regional + ...regional, + ...stage } diff --git a/acs2/nladmin-ui/src/i18n/langs/stage/en.js b/acs2/nladmin-ui/src/i18n/langs/stage/en.js new file mode 100644 index 000000000..e04d797fb --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/stage/en.js @@ -0,0 +1,22 @@ +export default { + 'stage': { + 'title': 'Stage', + 'stage_table_title': { + 'stage_uuid': 'Stage Signage', + 'stage_code': 'Stage Coding', + 'stage_name': 'Stage Name', + 'in_stage_name': 'Indonesian Stage Name', + 'en_stage_name': 'English Stage Name', + 'zh_stage_name': 'Chinese Stage Name', + 'stage_data': 'Stage Data', + 'message1': 'Stage encoding cannot be empty', + 'message2': 'The stage name cannot be empty' + }, + 'driver_configuration': { + 'basic_information': 'Basic Information' + }, + 'msg': { + 'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!' + } + } +} diff --git a/acs2/nladmin-ui/src/i18n/langs/stage/in.js b/acs2/nladmin-ui/src/i18n/langs/stage/in.js new file mode 100644 index 000000000..adf1917d8 --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/stage/in.js @@ -0,0 +1,23 @@ +export default { + 'stage': { + 'title': 'Panggung', + 'stage_table_title': { + 'stage_uuid': 'Papan Nama Panggung', + 'stage_code': 'Tahap Pengkodean', + 'stage_name': 'Nama Panggung', + 'in_stage_name': 'Nama Panggung Indonesia', + 'en_stage_name': 'Nama Panggung Bahasa Inggris', + 'zh_stage_name': 'Nama Panggung Cina', + 'stage_data': 'Data Tahapan', + 'message1': 'Pengkodean Tahap Tidak Boleh Kosong', + 'message2': 'Nama Panggung Tidak Boleh Kosong' + }, + 'driver_configuration': { + 'basic_information': 'Informasi Dasar' + }, + 'msg': { + 'delete_msg': 'Apakah Anda Yakin Untuk Menghapusnya? Jika Ada Nod Subordinat, Mereka Akan Dihapus Bersama. Operasi Ini Tidak Dapat Dibatalkan!' + } + } +} + diff --git a/acs2/nladmin-ui/src/i18n/langs/stage/zh.js b/acs2/nladmin-ui/src/i18n/langs/stage/zh.js new file mode 100644 index 000000000..40ba64f6a --- /dev/null +++ b/acs2/nladmin-ui/src/i18n/langs/stage/zh.js @@ -0,0 +1,23 @@ +export default { + 'stage': { + 'title': '舞台', + 'stage_table_title': { + 'stage_uuid': '舞台标识', + 'stage_code': '舞台编码', + 'stage_name': '舞台名字', + 'in_stage_name': '印尼舞台名字', + 'en_stage_name': '英文舞台名称', + 'zh_stage_name': '中文舞台名称', + 'stage_data': '舞台数据', + 'message1': '舞台编码不能为空', + 'message2': '舞台名字不能为空' + }, + 'driver_configuration': { + 'basic_information': '基本信息' + }, + 'msg': { + 'delete_msg': '确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！' + } + } +} + diff --git a/acs2/nladmin-ui/src/views/acs/device/config.vue b/acs2/nladmin-ui/src/views/acs/device/config.vue index 9119a1ef8..52d5f3b8e 100644 --- a/acs2/nladmin-ui/src/views/acs/device/config.vue +++ b/acs2/nladmin-ui/src/views/acs/device/config.vue @@ -116,6 +116,7 @@ import pull_tail_manipulator from '@/views/acs/device/driver/pull_tail_manipulat import green_foil_machine_button from '@/views/acs/device/driver/green_foil_machine_button.vue' import inflatable_shaft_library from '@/views/acs/device/driver/inflatable_shaft_library.vue' import manipulator_agv_station from '@/views/acs/device/driver/manipulator_agv_station.vue' +import paper_tube_pick_size from '@/views/acs/device/driver/paper_tube_pick_size.vue' import subvolume_weighing_station from '@/views/acs/device/driver/subvolume_weighing_station.vue' import waste_foil_weighing_station from '@/views/acs/device/driver/waste_foil_weighing_station.vue' import blank_manipulator from '@/views/acs/device/driver/blank_manipulator.vue' @@ -192,7 +193,8 @@ export default { oven_inspect_site, manipulator_agv_station, volume_two_manipulator, - manipulator_cache + manipulator_cache, + paper_tube_pick_size }, dicts: ['device_type'], mixins: [crud], diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/paper_tube_pick_size.vue b/acs2/nladmin-ui/src/views/acs/device/driver/paper_tube_pick_size.vue new file mode 100644 index 000000000..9bf9558a8 --- /dev/null +++ b/acs2/nladmin-ui/src/views/acs/device/driver/paper_tube_pick_size.vue @@ -0,0 +1,507 @@ + + + + + diff --git a/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue b/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue index 1c2ce04ab..6f35aa83d 100644 --- a/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue +++ b/acs2/nladmin-ui/src/views/system/dict/dictDetail.vue @@ -30,9 +30,18 @@ width="600px" > - + + + + + + + + + + diff --git a/acs2/nladmin-ui/src/views/system/logicflow/index.vue b/acs2/nladmin-ui/src/views/system/logicflow/index.vue index 91d84556d..e4e933fd9 100644 --- a/acs2/nladmin-ui/src/views/system/logicflow/index.vue +++ b/acs2/nladmin-ui/src/views/system/logicflow/index.vue @@ -12,20 +12,29 @@ :title="crud.status.title" width="500px" > - - + + - + - + + + + + + + + + +
- 取消 - 确认 + {{ $t('auto.common.Cancel') }} + {{ $t('auto.common.Confirm') }}
@@ -38,15 +47,15 @@ @selection-change="crud.selectionChangeHandler" > - - - - - - + + + + + + - +