From 4772072564c7124a1cd1154de44666cacac81446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Fri, 18 Aug 2023 16:11:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=8D=E9=A6=88=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 24 ++++++++++++++----- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 24 ++++++++++++++----- .../OvenGantryManipulatorDeviceDriver.java | 17 +++++++------ .../SiemensConveyorDeviceDriver.java | 2 +- .../SiemensConveyorCkkDeviceDriver.java | 2 +- .../SiemensConveyorLabelingDeviceDriver.java | 2 +- ...iemensOneFloorAGVConveyorDeviceDriver.java | 2 +- .../SlitTwoManipulatorDeviceDriver.java | 2 +- 8 files changed, 49 insertions(+), 26 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 9a8b3668c..58e380272 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -471,14 +471,26 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //三色灯状态 status = ikey; - if (status != last_status) { + if (status != last_status && status != 6 && status != 7) { + boolean flag = true; JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", status); - param.put("device_name", this.getDevice().getDevice_name()); - param.put("device_type", "4"); - param.put("product_area", paramService.findByCode("productArea").getValue()); - acsToWmsService.sendDeviceStatus(param); + if (status == 1) { + param.put("mode", 0); + } else if (status == 2) { + param.put("mode", 3); + } else if ("345".contains(String.valueOf(status))) { + param.put("mode", 2); + } else { + flag = false; + } + + if (flag) { + param.put("device_name", this.getDevice().getDevice_name()); + param.put("device_type", "4"); + param.put("product_area", paramService.findByCode("productArea").getValue()); + acsToWmsService.sendDeviceStatus(param); + } } last_status = status; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index f829443f6..97ad49791 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -714,14 +714,26 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic //三色灯状态 status = ikey; - if (status != last_status) { + if (status != last_status && status != 6 && status != 7) { + boolean flag = true; JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", status); - param.put("device_name", this.getDevice().getDevice_name()); - param.put("device_type", "4"); - param.put("product_area", ParamService.findByCode("productArea").getValue()); - acsToWmsService.sendDeviceStatus(param); + if (status == 1) { + param.put("mode", 0); + } else if (status == 2) { + param.put("mode", 3); + } else if ("345".contains(String.valueOf(status))) { + param.put("mode", 2); + } else { + flag = false; + } + + if (flag) { + param.put("device_name", this.getDevice().getDevice_name()); + param.put("device_type", "4"); + param.put("product_area", ParamService.findByCode("productArea").getValue()); + acsToWmsService.sendDeviceStatus(param); + } } last_status = status; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 6fd5c62f5..d3b00b6a9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -182,7 +182,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (mode != last_mode) { JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", mode); + param.put("mode", Math.min(mode, 3)); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "2"); param.put("product_area", paramService.findByCode("productArea").getValue()); @@ -247,7 +247,6 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i update_instruction_status(); - } catch (Exception var17) { var17.printStackTrace(); feedMessage = var17.getMessage(); @@ -296,7 +295,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } if (task != 0) { remark = remark + "当前上报任务号(task)应该为0,"; - if(ObjectUtil.isNotEmpty(this.inst)){ + if (ObjectUtil.isNotEmpty(this.inst)) { this.inst = null; } } @@ -346,11 +345,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } else { this.instruction_require_time = date; //抓取工位 - if(ObjectUtil.isEmpty(getDeviceCodeList)){ + if (ObjectUtil.isEmpty(getDeviceCodeList)) { getDeviceCodeList = this.getExtraDeviceCodes("get_device_code"); } //放货工位 - if(ObjectUtil.isEmpty(putDeviceCodeList)){ + if (ObjectUtil.isEmpty(putDeviceCodeList)) { putDeviceCodeList = this.getExtraDeviceCodes("put_device_code"); } @@ -1094,10 +1093,10 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } - public Instruction checkInst(){ - if(ObjectUtil.isNotEmpty(this.inst)){ - if(this.task>0){ - if(this.inst.getInstruction_code().equals(String.valueOf(this.task))){ + public Instruction checkInst() { + if (ObjectUtil.isNotEmpty(this.inst)) { + if (this.task > 0) { + if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) { return this.inst; } else { inst = instructionService.findByCodeFromCache(String.valueOf(task)); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 6b3b84f54..f5fcc25a9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -232,7 +232,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme if ("true".equals(this.device.getExtraValue().get("sendDeviceStatus"))) { JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", mode); + param.put("mode", Math.min(mode, 3)); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "1"); param.put("product_area", paramService.findByCode("productArea").getValue()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index a745b49aa..f755222ed 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -190,7 +190,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", mode); + param.put("mode", Math.min(mode, 3)); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "1"); param.put("product_area", paramService.findByCode("productArea").getValue()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index b6fb67619..f2c42a173 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java @@ -173,7 +173,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", mode); + param.put("mode", Math.min(mode, 3)); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "1"); param.put("product_area", paramService.findByCode("productArea").getValue()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java index 985094f8c..c568401c3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java @@ -164,7 +164,7 @@ public class SiemensOneFloorAGVConveyorDeviceDriver extends AbstractOpcDeviceDri if (last_mode != mode) { JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", mode); + param.put("mode", Math.min(mode, 3)); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "1"); param.put("product_area", paramService.findByCode("productArea").getValue()); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 9b8c7eaa0..a82db0757 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -235,7 +235,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl if (mode != last_mode) { JSONObject param = new JSONObject(); param.put("device_code", this.device_code); - param.put("mode", mode); + param.put("mode", Math.min(mode, 3)); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "2"); param.put("product_area", paramService.findByCode("productArea").getValue());