From 0b40e04794bc2e0f6ede29cf5dd2c8e3859a2e6d Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Sun, 29 Jan 2023 19:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OvenGantryManipulatorDeviceDriver.java | 7 +- .../SiemensConveyorDeviceDriver.java | 2 +- ...CoveyorControlWithScannerDeviceDriver.java | 23 +- .../acs/monitor/device/XJDeviceMonitor.vue | 223 ------- .../src/views/acs/monitor/device/index2.vue | 631 ------------------ .../src/views/system/monitor/device/index.vue | 127 +--- 6 files changed, 51 insertions(+), 962 deletions(-) delete mode 100644 acs/nladmin-ui/src/views/acs/monitor/device/XJDeviceMonitor.vue delete mode 100644 acs/nladmin-ui/src/views/acs/monitor/device/index2.vue 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 b30a9fbff..20160ad0b 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 @@ -127,6 +127,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (mode != last_mode) { if (mode == 2) { this.setRequireSucess(false); + message = null; } logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); @@ -760,7 +761,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } else if (this.getMove() == 1) { move = "有货"; } - + String requireSucess = "0"; + if (this.requireSucess) { + requireSucess = "1"; + } + jo.put("requireSucess", requireSucess); if (this.getAction() == 1) { action = "取货中"; } else if (this.getAction() == 2) { 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 c0aecbfad..b82564185 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 @@ -145,6 +145,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme task = this.itemProtocol.getTask(); if (mode != last_mode) { if( mode == 2){ + message = null; requireSucess = false; requireApplyLabelingSuccess = false; requireApplyLaStrangulationSuccess =false; @@ -152,7 +153,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme requireEmptyOutSuccess =false; logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode +"复位请求标记"); } - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index f91a28899..23ae7e9a9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -85,7 +85,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe int error = 0; int task = 0; String plcbarcode = null; + String last_plcbarcode = null; int plcbarcode_length = 0; + int last_plcbarcode_length = 0; Boolean isonline = true; @@ -185,16 +187,31 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe if (mode != last_mode) { logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode +"复位请求标记"); - this.setRequireSucess(false); + if(mode == 2){ + this.setRequireSucess(false); + this.setApplySucess(false); + message = null; + } } if (move != last_move) { if (move == 0 && mode == 2) { thingToNothing(); } + logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); } if (error != last_error) { + logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error); + } + if (plcbarcode_length != last_plcbarcode_length) { + logServer.deviceExecuteLog(this.device_code, "", "", "信号plcbarcode_length：" + last_plcbarcode_length + "->" + plcbarcode_length); + } + if (!StrUtil.equals(plcbarcode,last_plcbarcode) ) { + logServer.deviceExecuteLog(this.device_code, "", "", "信号plcbarcode：" + last_plcbarcode + "->" + plcbarcode); } + if (task != last_task) { + logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task+ "->" + task); + } if (mode == 2 && move != 0 && task > 0) { //inst_message inst = instructionService.findByCodeFromCache(String.valueOf(task)); @@ -271,6 +288,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe last_error = error; last_move = move; last_task = task; + } public boolean exe_error() { @@ -734,7 +752,8 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); jo.put("task", this.getTask()); - jo.put("barcode", this.getBarcode()); + jo.put("barcode", plcbarcode); + jo.put("barcode_length", plcbarcode_length); String requireSucess = "0"; if (this.requireSucess) { requireSucess = "1"; diff --git a/acs/nladmin-ui/src/views/acs/monitor/device/XJDeviceMonitor.vue b/acs/nladmin-ui/src/views/acs/monitor/device/XJDeviceMonitor.vue deleted file mode 100644 index f6a8a1609..000000000 --- a/acs/nladmin-ui/src/views/acs/monitor/device/XJDeviceMonitor.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - - - diff --git a/acs/nladmin-ui/src/views/acs/monitor/device/index2.vue b/acs/nladmin-ui/src/views/acs/monitor/device/index2.vue deleted file mode 100644 index febabca33..000000000 --- a/acs/nladmin-ui/src/views/acs/monitor/device/index2.vue +++ /dev/null @@ -1,631 +0,0 @@ - - - - - diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue index 68d9a28e6..d0055ab22 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -365,9 +365,12 @@ export default { } else if (val === 'last_instruction_message') { const obj = { name: '上次指令信息', value: data[val] } this.arr.push(obj) - } else if (val === 'container') { + } else if (val === 'barcode') { const obj = { name: '载具号', value: data[val] } this.arr.push(obj) + } else if (val === 'barcode_length') { + const obj = { name: '载具长度', value: data[val] } + this.arr.push(obj) } else if (val === 'last_container') { const obj = { name: '上次载具号', value: data[val] } this.arr.push(obj) @@ -395,87 +398,15 @@ export default { } else if (val === 'applySucess') { const obj = { name: '是否申请指令', value: data[val] } this.arr.push(obj) - } else if (val === 'message') { - const obj = { name: '说明', value: data[val] } - this.arr.push(obj) } else if (val === 'status') { const obj = { name: '设备状态', value: data[val] } this.arr.push(obj) - } else if (val === 'open_time') { - const obj = { name: '开机时间', value: data[val] } - this.arr.push(obj) - } else if (val === 'close_time') { - const obj = { name: '关机时间', value: data[val] } - this.arr.push(obj) - } else if (val === 'standby_time') { - const obj = { name: '待机时间', value: data[val] } - this.arr.push(obj) - } else if (val === 'production_time') { - const obj = { name: '生产时间', value: data[val] } - this.arr.push(obj) - } else if (val === 'error_time') { - const obj = { name: '故障时间', value: data[val] } - this.arr.push(obj) } else if (val === 'weight') { - const obj = { name: '生产重量', value: data[val] } - this.arr.push(obj) - } else if (val === 'order_No') { - const obj = { name: '工单号', value: data[val] } - this.arr.push(obj) - } else if (val === 'mix_num') { - const obj = { name: '碾次', value: data[val] } - this.arr.push(obj) - } else if (val === 'barcode') { - const obj = { name: '条码', value: data[val] } - this.arr.push(obj) - } else if (val === 'qualified') { - const obj = { name: '合格数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'unqualified') { - const obj = { name: '不合格数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'put_station') { - const obj = { name: '当前码盘工位', value: data[val] } - this.arr.push(obj) - } else if (val === 'encoder_qty') { - const obj = { name: '码盘数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'outKiln_move') { - const obj = { name: '出窑光电', value: data[val] } - this.arr.push(obj) - } else if (val === 'outKiln_barcode') { - const obj = { name: '出窑条码', value: data[val] } - this.arr.push(obj) - } else if (val === 'outKiln_device') { - const obj = { name: '出窑设备', value: data[val] } - this.arr.push(obj) - } else if (val === 'car_sum') { - const obj = { name: '窑车总数', value: data[val] } - this.arr.push(obj) - } else if (val === 'nullCar_qty') { - const obj = { name: '空窑车数', value: data[val] } - this.arr.push(obj) - } else if (val === 'burning_car_qty') { - const obj = { name: '在烧窑车数', value: data[val] } - this.arr.push(obj) - } else if (val === 'container_qty') { - const obj = { name: '托盘数', value: data[val] } + const obj = { name: '重量', value: data[val] } this.arr.push(obj) } else if (val === 'tray_crib_qty') { const obj = { name: '托盘垛数', value: data[val] } this.arr.push(obj) - } else if (val === 'total_container') { - const obj = { name: '托盘总数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'total_split') { - const obj = { name: '累计拆垛数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'getStation') { - const obj = { name: '当前抓取工位', value: data[val] } - this.arr.push(obj) - } else if (val === 'putStation') { - const obj = { name: '当前码盘工位', value: data[val] } - this.arr.push(obj) } else if (val === 'move_1') { const obj = { name: '前工位光电信号', value: data[val] } this.arr.push(obj) @@ -500,39 +431,27 @@ export default { } else if (val === 'task') { const obj = { name: '任务号', value: data[val] } this.arr.push(obj) - } else if (val === 'labeling_qty') { - const obj = { name: '贴标数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'container_type') { - const obj = { name: '托盘类型', value: data[val] } - this.arr.push(obj) - } else if (val === 'specifications') { - const obj = { name: '规格', value: data[val] } - this.arr.push(obj) - } else if (val === 'onoff_status') { - const obj = { name: '开关机状态', value: data[val] } - this.arr.push(obj) - } else if (val === 'task_qty') { - const obj = { name: '当前任务数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'finishTask_qty') { - const obj = { name: '完成任务数量', value: data[val] } - this.arr.push(obj) - } else if (val === 'AlongSide') { - const obj = { name: 'A长边', value: data[val] } - this.arr.push(obj) - } else if (val === 'BshortSide') { - const obj = { name: 'B短边', value: data[val] } - this.arr.push(obj) - } else if (val === 'Htrapezoidal') { - const obj = { name: 'H梯形高', value: data[val] } - this.arr.push(obj) - } else if (val === 'Wthickness') { - const obj = { name: 'W厚度', value: data[val] } - this.arr.push(obj) } else if (val === 'is_disable') { const obj = { name: '是否禁用', value: data[val] } this.arr.push(obj) + } else if (val === 'temperature') { + const obj = { name: '当前温度', value: data[val] } + this.arr.push(obj) + } else if (val === 'finish') { + const obj = { name: '烘箱完成', value: data[val] } + this.arr.push(obj) + } else if (val === 'countdown_house') { + const obj = { name: '恒温倒计时(时)', value: data[val] } + this.arr.push(obj) + } else if (val === 'countdown_min') { + const obj = { name: '恒温倒计时(分)', value: data[val] } + this.arr.push(obj) + } else if (val === 'countdown_sec') { + const obj = { name: '恒温倒计时(秒)', value: data[val] } + this.arr.push(obj) + } else if (val === 'door') { + const obj = { name: '门状态', value: data[val] } + this.arr.push(obj) } else if (val === 'notCreateTaskMessage') { const obj = { name: '任务创建失败原因', value: data[val] } this.arr.push(obj)