From 4338fe895572eeee1fd75cad74c91a5750eaf5c1 Mon Sep 17 00:00:00 2001 From: yanps Date: Thu, 14 Dec 2023 13:50:12 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=B8=AD=E7=9A=84=E7=BA=B8=E7=AE=A1=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paper_tube_device2/ItemProtocol.java | 94 +++++++++---------- .../PaperTubeConveyor2DeviceDriver.java | 61 +++++++++++- acs/nladmin-ui/src/views/acs/task/index.vue | 12 +-- .../src/views/system/monitor/device/index.vue | 84 ++++++++++++++++- 4 files changed, 192 insertions(+), 59 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/ItemProtocol.java index 89c3c38f0..1a4592ff4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/ItemProtocol.java @@ -351,58 +351,58 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "1001.W0")); - list.add(new ItemDto(item_mode, "工作模式", "1001.W2")); - list.add(new ItemDto(item_move, "光电信号", "1001.W4")); - list.add(new ItemDto(item_carrier_direction, "托盘方向", "1001.W6")); - list.add(new ItemDto(item_error, "报警", "1001.W8")); - list.add(new ItemDto(item_task, "任务号", "1001.W10")); - list.add(new ItemDto(item_out_seq_arr, "出库顺序数组", "1001.String.150")); - list.add(new ItemDto(item_out_qty_arr, "出库数量数组", "1001.W166")); - list.add(new ItemDto(item_material1, "物料1", "1001.String170.50")); - list.add(new ItemDto(item_qty1, "数量1", "1001.W222")); - list.add(new ItemDto(item_material2, "物料2", "1001.String224.50")); - list.add(new ItemDto(item_qty2, "数量2", "1001.W276")); - list.add(new ItemDto(item_material3, "物料3", "1001.String278.50")); - list.add(new ItemDto(item_qty3, "数量3", "1001.W330")); - list.add(new ItemDto(item_material4, "物料4", "1001.String332.50")); - list.add(new ItemDto(item_qty4, "数量4", "1001.W384")); - list.add(new ItemDto(item_material5, "物料5", "1001.String386.50")); - list.add(new ItemDto(item_qty5, "数量5", "1001.W438")); - list.add(new ItemDto(item_material6, "物料6", "1001.String440.50")); - list.add(new ItemDto(item_qty6, "数量6", "1001.W492")); - list.add(new ItemDto(item_material7, "物料7", "1001.String494.50")); - list.add(new ItemDto(item_qty7, "数量7", "1001.W546")); - list.add(new ItemDto(item_material8, "物料8", "1001.String548.50")); - list.add(new ItemDto(item_qty8, "数量8", "1001.W600")); - list.add(new ItemDto(item_material9, "物料9", "1001.String602.50")); - list.add(new ItemDto(item_qty9, "数量9", "1001.W654")); - list.add(new ItemDto(item_material10, "物料10", "1001.String656.50")); - list.add(new ItemDto(item_qty10, "数量10", "1001.W708")); - list.add(new ItemDto(item_material11, "物料11", "1001.String710.50")); - list.add(new ItemDto(item_qty11, "数量11", "1001.W762")); - list.add(new ItemDto(item_material12, "物料12", "1001.String764.50")); - list.add(new ItemDto(item_qty12, "数量12", "1001.W816")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB1001.W0")); + list.add(new ItemDto(item_mode, "工作模式", "DB1001.W2")); + list.add(new ItemDto(item_move, "光电信号", "DB1001.W4")); + list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB1001.W6")); + list.add(new ItemDto(item_error, "报警", "DB1001.W8")); + list.add(new ItemDto(item_task, "任务号", "DB1001.W10")); + list.add(new ItemDto(item_out_seq_arr, "出库顺序数组", "DB1001.String.150")); + list.add(new ItemDto(item_out_qty_arr, "出库数量数组", "DB1001.W166")); + list.add(new ItemDto(item_material1, "物料1", "DB1001.String170.50")); + list.add(new ItemDto(item_qty1, "数量1", "DB1001.W222")); + list.add(new ItemDto(item_material2, "物料2", "DB1001.String224.50")); + list.add(new ItemDto(item_qty2, "数量2", "DB1001.W276")); + list.add(new ItemDto(item_material3, "物料3", "DB1001.String278.50")); + list.add(new ItemDto(item_qty3, "数量3", "DB1001.W330")); + list.add(new ItemDto(item_material4, "物料4", "DB1001.String332.50")); + list.add(new ItemDto(item_qty4, "数量4", "DB1001.W384")); + list.add(new ItemDto(item_material5, "物料5", "DB1001.String386.50")); + list.add(new ItemDto(item_qty5, "数量5", "DB1001.W438")); + list.add(new ItemDto(item_material6, "物料6", "DB1001.String440.50")); + list.add(new ItemDto(item_qty6, "数量6", "DB1001.W492")); + list.add(new ItemDto(item_material7, "物料7", "DB1001.String494.50")); + list.add(new ItemDto(item_qty7, "数量7", "DB1001.W546")); + list.add(new ItemDto(item_material8, "物料8", "DB1001.String548.50")); + list.add(new ItemDto(item_qty8, "数量8", "DB1001.W600")); + list.add(new ItemDto(item_material9, "物料9", "DB1001.String602.50")); + list.add(new ItemDto(item_qty9, "数量9", "DB1001.W654")); + list.add(new ItemDto(item_material10, "物料10", "DB1001.String656.50")); + list.add(new ItemDto(item_qty10, "数量10", "DB1001.W708")); + list.add(new ItemDto(item_material11, "物料11", "DB1001.String710.50")); + list.add(new ItemDto(item_qty11, "数量11", "DB1001.W762")); + list.add(new ItemDto(item_material12, "物料12", "DB1001.String764.50")); + list.add(new ItemDto(item_qty12, "数量12", "DB1001.W816")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_target , "下发仓位号", "1002.W0")); - list.add(new ItemDto(item_to_command, "下发命令", "1002.W2")); - list.add(new ItemDto(item_to_task, "下发任务号", "1002.DW4")); - list.add(new ItemDto(item_to_material1, "下发物料1", "1002.String8.50")); - list.add(new ItemDto(item_to_out_qty1, "下发物料1数量", "1002.W60")); - list.add(new ItemDto(item_to_seq1, "出库顺序1", "1002.W62")); - list.add(new ItemDto(item_to_position1, "仓位1", "1002.W64")); - list.add(new ItemDto(item_to_material2, "下发物料2", "1002.String66.50")); - list.add(new ItemDto(item_to_out_qty2, "下发物料2数量", "1002.W118")); - list.add(new ItemDto(item_to_seq2, "出库顺序2", "1002.W120")); - list.add(new ItemDto(item_to_position2, "仓位2", "1002.W122")); - list.add(new ItemDto(item_to_material3, "下发物料3", "1002.String124.50")); - list.add(new ItemDto(item_to_out_qty3, "下发物料3数量", "1002.W176")); - list.add(new ItemDto(item_to_seq3, "出库顺序3", "1002.W178")); - list.add(new ItemDto(item_to_position3, "仓位3", "1002.W180")); + list.add(new ItemDto(item_to_target , "下发仓位号", "DB1002.W0")); + list.add(new ItemDto(item_to_command, "下发命令", "DB1002.W2")); + list.add(new ItemDto(item_to_task, "下发任务号", "DB1002.DW4")); + list.add(new ItemDto(item_to_material1, "下发物料1", "DB1002.String8.50")); + list.add(new ItemDto(item_to_out_qty1, "下发物料1数量", "DB1002.W60")); + list.add(new ItemDto(item_to_seq1, "出库顺序1", "DB1002.W62")); + list.add(new ItemDto(item_to_position1, "仓位1", "DB1002.W64")); + list.add(new ItemDto(item_to_material2, "下发物料2", "DB1002.String66.50")); + list.add(new ItemDto(item_to_out_qty2, "下发物料2数量", "DB1002.W118")); + list.add(new ItemDto(item_to_seq2, "出库顺序2", "DB1002.W120")); + list.add(new ItemDto(item_to_position2, "仓位2", "DB1002.W122")); + list.add(new ItemDto(item_to_material3, "下发物料3", "DB1002.String124.50")); + list.add(new ItemDto(item_to_out_qty3, "下发物料3数量", "DB1002.W176")); + list.add(new ItemDto(item_to_seq3, "出库顺序3", "DB1002.W178")); + list.add(new ItemDto(item_to_position3, "仓位3", "DB1002.W180")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java index 8ffae261d..e4e1be924 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java @@ -686,7 +686,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl @Override public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); + //JSONObject jo = new JSONObject(); String mode = ""; String move = ""; @@ -706,15 +706,70 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl }else if(this.getMove() == 1){ move = "有托盘"; } - jo.put("device_name", this.getDevice().getDevice_name()); + /*jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); jo.put("inventory_qty", item_qty1); jo.put("move", move); jo.put("out_finish", out_finish); - jo.put("material", item_material1); jo.put("isOnline", this.getIsonline()); + jo.put("material1", this.getItem_material1()); + jo.put("z_qty1", this.getItem_qty1()); + jo.put("material2", this.getItem_material2()); + jo.put("z_qty2", this.getItem_qty2()); + jo.put("material3", this.getItem_material3()); + jo.put("z_qty3", this.getItem_qty3()); + jo.put("material4", this.getItem_material4()); + jo.put("z_qty4", this.getItem_qty4()); + jo.put("material5", this.getItem_material5()); + jo.put("z_qty5", this.getItem_qty5()); + jo.put("material6", this.getItem_material6()); + jo.put("z_qty6", this.getItem_qty6()); + jo.put("material7", this.getItem_material7()); + jo.put("z_qty7", this.getItem_qty7()); + jo.put("material8", this.getItem_material8()); + jo.put("z_qty8", this.getItem_qty8()); + jo.put("material9", this.getItem_material9()); + jo.put("z_qty9", this.getItem_qty9()); + jo.put("material10", this.getItem_material10()); + jo.put("z_qty10", this.getItem_qty10()); + jo.put("material11", this.getItem_material11()); + jo.put("z_qty11", this.getItem_qty11()); + jo.put("material12", this.getItem_material12()); + jo.put("z_qty12", this.getItem_qty12());*/ + Map map = new LinkedHashMap<>(); + map.put("device_name", this.getDevice().getDevice_name()); + map.put("mode", mode); + map.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); + map.put("move", move); + map.put("isOnline", this.getIsonline()); + map.put("material1", this.getItem_material1()); + map.put("z_qty1", this.getItem_qty1()); + map.put("material2", this.getItem_material2()); + map.put("z_qty2", this.getItem_qty2()); + map.put("material3", this.getItem_material3()); + map.put("z_qty3", this.getItem_qty3()); + map.put("material4", this.getItem_material4()); + map.put("z_qty4", this.getItem_qty4()); + map.put("material5", this.getItem_material5()); + map.put("z_qty5", this.getItem_qty5()); + map.put("material6", this.getItem_material6()); + map.put("z_qty6", this.getItem_qty6()); + map.put("material7", this.getItem_material7()); + map.put("z_qty7", this.getItem_qty7()); + map.put("material8", this.getItem_material8()); + map.put("z_qty8", this.getItem_qty8()); + map.put("material9", this.getItem_material9()); + map.put("z_qty9", this.getItem_qty9()); + map.put("material10", this.getItem_material10()); + map.put("z_qty10", this.getItem_qty10()); + map.put("material11", this.getItem_material11()); + map.put("z_qty11", this.getItem_qty11()); + map.put("material12", this.getItem_material12()); + map.put("z_qty12", this.getItem_qty12()); + + JSONObject jo = new JSONObject(map); return jo; } diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue index 1f0c69f75..623754fcd 100644 --- a/acs/nladmin-ui/src/views/acs/task/index.vue +++ b/acs/nladmin-ui/src/views/acs/task/index.vue @@ -320,7 +320,7 @@ - 添加新行 + 添加新行 @@ -332,7 +332,7 @@ border > - + - + - + - + @@ -403,7 +403,7 @@ /> --> - +
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 d731d4a42..024e7917a 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -635,13 +635,91 @@ export default { const obj = { name: '任务号', value: data[val] } this.arr.push(obj) } else if (val === 'inflatable_shaft_size') { - const obj = { name: '任务号', value: data[val] } + const obj = { name: '气胀轴尺寸', value: data[val] } this.arr.push(obj) } else if (val === 'qty1') { - const obj = { name: '任务号', value: data[val] } + const obj = { name: '重量1', value: data[val] } this.arr.push(obj) } else if (val === 'qty2') { - const obj = { name: '任务号', value: data[val] } + const obj = { name: '重量2', value: data[val] } + this.arr.push(obj) + } else if (val === 'move1') { + const obj = { name: '光电信号1', value: data[val] } + this.arr.push(obj) + } else if (val === 'move2') { + const obj = { name: '光电信号2', value: data[val] } + this.arr.push(obj) + } else if (val === 'material1') { + const obj = { name: '物料1', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty1') { + const obj = { name: '数量1', value: data[val] } + this.arr.push(obj) + } else if (val === 'material2') { + const obj = { name: '物料2', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty2') { + const obj = { name: '数量2', value: data[val] } + this.arr.push(obj) + } else if (val === 'material3') { + const obj = { name: '物料3', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty3') { + const obj = { name: '数量3', value: data[val] } + this.arr.push(obj) + } else if (val === 'material4') { + const obj = { name: '物料4', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty4') { + const obj = { name: '数量4', value: data[val] } + this.arr.push(obj) + } else if (val === 'material5') { + const obj = { name: '物料5', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty5') { + const obj = { name: '数量5', value: data[val] } + this.arr.push(obj) + } else if (val === 'material6') { + const obj = { name: '物料6', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty6') { + const obj = { name: '数量6', value: data[val] } + this.arr.push(obj) + } else if (val === 'material7') { + const obj = { name: '物料7', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty7') { + const obj = { name: '数量7', value: data[val] } + this.arr.push(obj) + } else if (val === 'material8') { + const obj = { name: '物料8', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty8') { + const obj = { name: '数量8', value: data[val] } + this.arr.push(obj) + } else if (val === 'material9') { + const obj = { name: '物料9', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty9') { + const obj = { name: '数量9', value: data[val] } + this.arr.push(obj) + } else if (val === 'material10') { + const obj = { name: '物料10', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty10') { + const obj = { name: '数量10', value: data[val] } + this.arr.push(obj) + } else if (val === 'material11') { + const obj = { name: '物料11', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty11') { + const obj = { name: '数量11', value: data[val] } + this.arr.push(obj) + } else if (val === 'material12') { + const obj = { name: '物料12', value: data[val] } + this.arr.push(obj) + } else if (val === 'z_qty12') { + const obj = { name: '数量12', value: data[val] } this.arr.push(obj) } }