diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java index 6b02ecc..b18eddc 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDefination.java @@ -56,10 +56,14 @@ public class HaiLiangCoatingDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB605.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB605.B2", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_move, "光电信号", "DB605.B3")); + list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB605.B4")); + list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB605.D8")); + list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB605.D12")); + list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB605.D16")); + list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB605.D20")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java index d80bc94..8df1279 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/HaiLiangCoatingDeviceDriver.java @@ -1,25 +1,12 @@ package org.nl.acs.device_driver.hailiang.hailiang_coating; -import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ReadUtil; -import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; -import org.nl.utils.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * 海亮-裹膜机线体 diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java index cce09b0..5e6f01c 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_coating/ItemProtocol.java @@ -2,6 +2,7 @@ package org.nl.acs.device_driver.hailiang.hailiang_coating; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device_driver.hailiang.hailiang_strapping.HaiLiangStrappingDeviceDriver; import java.util.ArrayList; import java.util.List; @@ -10,8 +11,12 @@ import java.util.List; public class ItemProtocol { public static String item_heartbeat = "heartbeat"; public static String item_mode = "mode"; - public static String item_action = "action"; + public static String item_move = "move"; public static String item_error = "error"; + public static String item_order = "order"; + public static String item_order_detail = "order_detail"; + public static String item_detail_qty = "detail_qty"; + public static String item_detail_qualified_qty = "detail_qualified_qty"; public static String item_to_command = "to_command"; @@ -29,19 +34,36 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } - public int getAction() { - return this.getOpcIntegerValue(item_action); + public int getMove() { + return this.getOpcIntegerValue(item_move); } public int getError() { return this.getOpcIntegerValue(item_error); } + public int getOrder() { + return this.getOpcIntegerValue(item_order); + } + + public int getOrder_detail() { + return this.getOpcIntegerValue(item_order_detail); + } + + public int getDetail_qty() { + return this.getOpcIntegerValue(item_detail_qty); + } + + public int getDetail_qualified_qty() { + return this.getOpcIntegerValue(item_detail_qualified_qty); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } + public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); if (value == null) { @@ -55,16 +77,20 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB605.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB605.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电信号", "DB605.B3")); + list.add(new ItemDto(item_error, "故障信号", "DB605.B4")); + list.add(new ItemDto(item_order, "当前执行工单号", "DB605.D8")); + list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB605.D12")); + list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB605.D16")); + list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB605.D20")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "裹膜完成反馈", "DB615.D2", Boolean.valueOf(true))); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDefination.java index 6791ff5..bb06505 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/HaiLiangFeedingDefination.java @@ -56,15 +56,15 @@ public class HaiLiangFeedingDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB600.B3")); - list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB600.D8")); - list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB600.D12")); - list.add(new ItemDto(ItemProtocol.item_order_qty, "当前工单上料数量 ", "DB600.D16")); - list.add(new ItemDto(ItemProtocol.item_order_qualified_qty, "当前工单上料合格数量", "DB600.D20")); - list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB600.D24")); - list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB600.D28")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB601.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB601.B2", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB601.B3")); + list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB601.D8")); + list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB601.D12")); + list.add(new ItemDto(ItemProtocol.item_order_qty, "当前工单上料数量 ", "DB601.D16")); + list.add(new ItemDto(ItemProtocol.item_order_qualified_qty, "当前工单上料合格数量", "DB601.D20")); + list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB601.D24")); + list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB601.D28")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/ItemProtocol.java index 76faf21..916e045 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding/ItemProtocol.java @@ -26,7 +26,6 @@ public class ItemProtocol { public static String item_to_command = "to_command"; - private HaiLiangFeedingDeviceDriver driver; public ItemProtocol(HaiLiangFeedingDeviceDriver driver) { @@ -41,10 +40,38 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } + public int getMove() { + return this.getOpcIntegerValue(item_move); + } + public int getError() { return this.getOpcIntegerValue(item_error); } + public int getOrder() { + return this.getOpcIntegerValue(item_order); + } + + public int getOrder_detail() { + return this.getOpcIntegerValue(item_order_detail); + } + + public int getOrder_qty() { + return this.getOpcIntegerValue(item_order_qty); + } + + public int getOrder_qualified_qty() { + return this.getOpcIntegerValue(item_order_qualified_qty); + } + + public int getDetail_qty() { + return this.getOpcIntegerValue(item_detail_qty); + } + + public int getDetail_qualified_qty() { + return this.getOpcIntegerValue(item_detail_qualified_qty); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } @@ -63,21 +90,22 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B2", Boolean.valueOf(true))); - list.add(new ItemDto(item_error, "故障信号", "DB600.B3")); - list.add(new ItemDto(item_order, "当前执行工单号", "DB600.D8")); - list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB600.D12")); - list.add(new ItemDto(item_order_qty, "当前工单上料数量 ", "DB600.D16")); - list.add(new ItemDto(item_order_qualified_qty, "当前工单上料合格数量", "DB600.D20")); - list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB600.D24")); - list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB600.D28")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB601.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB601.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电信号", "DB601.B3")); + list.add(new ItemDto(item_error, "故障信号", "DB601.B4")); + list.add(new ItemDto(item_order, "当前执行工单号", "DB601.D8")); + list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB601.D12")); + list.add(new ItemDto(item_order_qty, "当前工单上料数量 ", "DB601.D16")); + list.add(new ItemDto(item_order_qualified_qty, "当前工单上料合格数量", "DB601.D20")); + list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB601.D24")); + list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB601.D28")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.D2", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "上料完成反馈", "DB611.D2", Boolean.valueOf(true))); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDefination.java index 7f27215..9e7fadd 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/HaiLiangFeedingTrunkDefination.java @@ -74,6 +74,7 @@ public class HaiLiangFeedingTrunkDefination implements OpcDeviceDriverDefination list.add(new ItemDto(ItemProtocol.item_labeling_order, "当前贴标工单明细号", "DB600.D52")); list.add(new ItemDto(ItemProtocol.item_detail_rlabeling_qualified_qty, "当前工单明细号刻字数量", "DB600.D56")); list.add(new ItemDto(ItemProtocol.item_detail_rlabeling_qty, "当前贴标工单明细号贴标数", "DB600.D60")); + list.add(new ItemDto(ItemProtocol.item_ready, "设备就绪", "DB600.D64")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java index f153049..5faa99b 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_feeding_trunk/ItemProtocol.java @@ -38,15 +38,17 @@ public class ItemProtocol { public static String item_detail_rlabeling_qualified_qty = "detail_rlabeling_qualified_qty"; //当前贴标工单明细号贴标数 public static String item_detail_rlabeling_qty = "detail_rlabeling_qty"; + //设备就绪 + public static String item_ready = "ready"; - + public static String item_to_heartbeat = "to_heartbeat"; public static String item_to_command = "to_command"; public static String item_to_order = "to_order"; public static String item_to_order_detail = "to_order_detail"; public static String item_to_order_feeding_qty = "to_order_feeding_qty"; public static String item_to_detail_feeding_qty = "to_detail_feeding_qty"; public static String item_to_outer_diameter = "to_outer_diameter"; - public static String item_to_wall_thickness = "to_wall thickness"; + public static String item_to_wall_thickness = "to_wall_thickness"; public static String item_to_length = "to_length"; public static String item_to_is_last = "to_is_last"; public static String item_to_strapping_qty = "to_strapping_qty"; @@ -55,7 +57,21 @@ public class ItemProtocol { public static String item_to_coating_qty = "to_coating_qty"; public static String item_to_labeling_qty = "to_labeling_qty"; public static String item_to_stop = "to_stop"; - public static String item_to_force_complete = "to_force_complete"; + public static String item_to_clear = "to_clear"; + public static String item_to_pause = "to_pause"; + public static String item_to_order_detail_complete = "to_order_detail_complete"; + public static String item_to_order_complete = "to_order_complete"; + public static String item_to_line_speed = "to_line_speed"; + public static String item_to_feeding_mouth = "to_feeding_mouth"; + public static String item_to_is_lettering = "to_is_lettering"; + public static String item_to_is_risking = "to_is_risking"; + public static String item_to_is_coating = "to_is_coating"; + public static String item_to_is_strapping = "to_is_strapping"; + public static String item_to_is_labeling = "to_is_labeling"; + public static String item_to_delay_time = "to_delay_time"; + public static String item_to_lettering_frequency = "to_lettering_frequency"; + public static String item_to_one_speed = "to_one_speed"; + public static String item_to_coating_frequency = "to_coating_frequency"; private HaiLiangFeedingTrunkDeviceDriver driver; @@ -136,11 +152,133 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_detail_rlabeling_qty); } + public int getReady() { + return this.getOpcIntegerValue(item_ready); + } + + public int getTo_heartbeat() { + return this.getOpcIntegerValue(item_to_heartbeat); + } + + public int getTo_order() { + return this.getOpcIntegerValue(item_to_order); + } + + public int getTo_order_detail() { + return this.getOpcIntegerValue(item_to_order_detail); + } + + public int getTo_order_feeding_qty() { + return this.getOpcIntegerValue(item_to_order_feeding_qty); + } + + public int getTo_detail_feeding_qty() { + return this.getOpcIntegerValue(item_to_detail_feeding_qty); + } + + public int getTo_outer_diameter() { + return this.getOpcIntegerValue(item_to_outer_diameter); + } + + public int getTo_wall_thickness() { + return this.getOpcIntegerValue(item_to_wall_thickness); + } + + public int getTo_length() { + return this.getOpcIntegerValue(item_to_length); + } + + public int getTo_is_last() { + return this.getOpcIntegerValue(item_to_is_last); + } + + public int getTo_strapping_qty() { + return this.getOpcIntegerValue(item_to_strapping_qty); + } + + public int getTo_one_strapping_qty() { + return this.getOpcIntegerValue(item_to_one_strapping_qty); + } + + public int getTo_lastone_strapping_qty() { + return this.getOpcIntegerValue(item_to_lastone_strapping_qty); + } + + public int getTo_coating_qty() { + return this.getOpcIntegerValue(item_to_coating_qty); + } + + public int getTo_labeling_qty() { + return this.getOpcIntegerValue(item_to_labeling_qty); + } public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } + public int getTo_stop() { + return this.getOpcIntegerValue(item_to_stop); + } + + public int getTo_clear() { + return this.getOpcIntegerValue(item_to_clear); + } + + public int getTo_pause() { + return this.getOpcIntegerValue(item_to_pause); + } + + public int getTo_order_detail_complete() { + return this.getOpcIntegerValue(item_to_order_detail_complete); + } + + public int getTo_order_complete() { + return this.getOpcIntegerValue(item_to_order_complete); + } + + public int getTo_line_speed() { + return this.getOpcIntegerValue(item_to_line_speed); + } + + public int getTo_feeding_mouth() { + return this.getOpcIntegerValue(item_to_feeding_mouth); + } + + public int getTo_is_lettering() { + return this.getOpcIntegerValue(item_to_is_lettering); + } + + public int getTo_is_risking() { + return this.getOpcIntegerValue(item_to_is_risking); + } + + public int getTo_is_coating() { + return this.getOpcIntegerValue(item_to_is_coating); + } + + public int getTo_is_strapping() { + return this.getOpcIntegerValue(item_to_is_strapping); + } + + public int getTo_is_labeling() { + return this.getOpcIntegerValue(item_to_is_labeling); + } + + public int getTo_delay_time() { + return this.getOpcIntegerValue(item_to_delay_time); + } + + public int getTo_lettering_frequency() { + return this.getOpcIntegerValue(item_to_lettering_frequency); + } + + public int getTo_one_speed() { + return this.getOpcIntegerValue(item_to_one_speed); + } + + public int getTo_coating_frequency() { + return this.getOpcIntegerValue(item_to_coating_frequency); + } Boolean isonline; @@ -175,28 +313,44 @@ public class ItemProtocol { list.add(new ItemDto(item_labeling_order, "当前贴标工单明细号", "DB600.D52")); list.add(new ItemDto(item_detail_rlabeling_qualified_qty, "当前工单明细号刻字数量", "DB600.D56")); list.add(new ItemDto(item_detail_rlabeling_qty, "当前贴标工单明细号贴标数", "DB600.D60")); + list.add(new ItemDto(item_ready, "设备就绪", "DB600.D64")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_order, "工单号", "DB601.D2")); - list.add(new ItemDto(item_to_order_detail, "工单明细号", "DB601.D6")); - list.add(new ItemDto(item_to_order_feeding_qty, "工单上料总数量", "DB601.D10")); - list.add(new ItemDto(item_to_detail_feeding_qty, "工单明细号上料数量", "DB601.D14")); - list.add(new ItemDto(item_to_outer_diameter, "外径", "DB601.REAL18")); - list.add(new ItemDto(item_to_wall_thickness, "壁厚", "DB601.REAL22")); - list.add(new ItemDto(item_to_length, "长度", "DB601.REAL26")); - list.add(new ItemDto(item_to_is_last, "是否最后工单明细号", "DB601.D30")); - list.add(new ItemDto(item_to_strapping_qty, "总捆扎包数", "DB601.D34")); - list.add(new ItemDto(item_to_one_strapping_qty, "标准每捆数量", "DB601.D38")); - list.add(new ItemDto(item_to_lastone_strapping_qty, "捆扎尾料数量", "DB601.D42")); - list.add(new ItemDto(item_to_coating_qty, "需要裹膜捆数", "DB601.D42")); - list.add(new ItemDto(item_to_labeling_qty, "需要贴标数量", "DB601.D46")); - list.add(new ItemDto(item_to_stop, "急停", "DB601.D50")); - list.add(new ItemDto(item_to_force_complete, "工单强制完成", "DB601.D54")); - list.add(new ItemDto(item_to_command, "作业命令", "DB601.D62", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_heartbeat, "心跳", "DB610.B0")); + list.add(new ItemDto(item_to_order, "工单号", "DB610.D2")); + list.add(new ItemDto(item_to_order_detail, "工单明细号", "DB610.D6")); + list.add(new ItemDto(item_to_order_feeding_qty, "工单上料总数量", "DB610.D10")); + list.add(new ItemDto(item_to_detail_feeding_qty, "工单明细号上料数量", "DB610.D14")); + list.add(new ItemDto(item_to_outer_diameter, "外径", "DB610.REAL18")); + list.add(new ItemDto(item_to_wall_thickness, "壁厚", "DB610.REAL22")); + list.add(new ItemDto(item_to_length, "长度", "DB610.REAL26")); + list.add(new ItemDto(item_to_is_last, "是否最后工单明细号", "DB610.D30")); + list.add(new ItemDto(item_to_strapping_qty, "总捆扎包数", "DB610.D34")); + list.add(new ItemDto(item_to_one_strapping_qty, "标准每捆数量", "DB610.D38")); + list.add(new ItemDto(item_to_lastone_strapping_qty, "捆扎尾料数量", "DB610.D42")); + list.add(new ItemDto(item_to_coating_qty, "需要裹膜捆数", "DB610.D46")); + list.add(new ItemDto(item_to_labeling_qty, "需要贴标数量", "DB610.D50")); + list.add(new ItemDto(item_to_command, "反馈命令", "DB610.D54", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_stop, "急停", "DB610.D58")); + list.add(new ItemDto(item_to_clear, "清料", "DB610.D62")); + list.add(new ItemDto(item_to_pause, "复位\\暂停", "DB610.D66")); + list.add(new ItemDto(item_to_order_detail_complete, "工单明细强制完成", "DB610.D70")); + list.add(new ItemDto(item_to_order_complete, "工单强制完成", "DB610.D74")); + list.add(new ItemDto(item_to_line_speed, "线体速度", "DB610.REAL78")); + list.add(new ItemDto(item_to_feeding_mouth, "上料口", "DB610.D82")); + list.add(new ItemDto(item_to_is_lettering, "是否刻字", "DB610.D86")); + list.add(new ItemDto(item_to_is_risking, "是否套冒", "DB610.D90")); + list.add(new ItemDto(item_to_is_coating, "是否裹膜", "DB610.D94")); + list.add(new ItemDto(item_to_is_strapping, "是否捆扎", "DB610.D98")); + list.add(new ItemDto(item_to_is_labeling, "是否贴标", "DB610.D102")); + list.add(new ItemDto(item_to_delay_time, "工段动作延时", "DB610.D106")); + list.add(new ItemDto(item_to_lettering_frequency, "刻字频率", "DB610.D110")); + list.add(new ItemDto(item_to_one_speed, "捆扎\\裹膜\\贴标段输送速度", "DB610.REAL114")); + list.add(new ItemDto(item_to_coating_frequency, "裹膜机频率", "DB610.D118")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java index 8ef3cf8..40dde6b 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/HaiLiangLabelingDefination.java @@ -56,9 +56,14 @@ public class HaiLiangLabelingDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "V100.1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "V100.0")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "VB101")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB606.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB606.B2", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_move, "光电信号", "DB606.B3")); + list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB606.B4")); + list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB606.D8")); + list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB606.D12")); + list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB606.D16")); + list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB606.D20")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java index 455eb8a..e485569 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_labeling/ItemProtocol.java @@ -8,9 +8,14 @@ import java.util.List; @Slf4j public class ItemProtocol { + public static String item_heartbeat = "heartbeat"; public static String item_mode = "mode"; - public static String item_action = "action"; + public static String item_move = "move"; public static String item_error = "error"; + public static String item_order = "order"; + public static String item_order_detail = "order_detail"; + public static String item_detail_qty = "detail_qty"; + public static String item_detail_qualified_qty = "detail_qualified_qty"; public static String item_to_command = "to_command"; @@ -24,14 +29,30 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } - public int getAction() { - return this.getOpcIntegerValue(item_action); + public int getMove() { + return this.getOpcIntegerValue(item_move); } public int getError() { return this.getOpcIntegerValue(item_error); } + public int getOrder() { + return this.getOpcIntegerValue(item_order); + } + + public int getOrder_detail() { + return this.getOpcIntegerValue(item_order_detail); + } + + public int getDetail_qty() { + return this.getOpcIntegerValue(item_detail_qty); + } + + public int getDetail_qualified_qty() { + return this.getOpcIntegerValue(item_detail_qualified_qty); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } @@ -50,15 +71,20 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_mode, "工作状态", "V100.1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "V100.0")); - list.add(new ItemDto(item_error, "报警信号", "VB101")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB606.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB606.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电信号", "DB606.B3")); + list.add(new ItemDto(item_error, "故障信号", "DB606.B4")); + list.add(new ItemDto(item_order, "当前执行工单号", "DB606.D8")); + list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB606.D12")); + list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB606.D16")); + list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB606.D20")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "V102.0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "作业命令", "DB616.D2", Boolean.valueOf(true))); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java index 74378ec..5d1f5c4 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/HaiLiangLetteringDefination.java @@ -56,9 +56,14 @@ public class HaiLiangLetteringDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "V100.1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "V100.0")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "VB101")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB602.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB602.B2", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_move, "光电信号", "DB602.B3")); + list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB602.B4")); + list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB602.D8")); + list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB602.D12")); + list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB602.D16")); + list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB602.D20")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/ItemProtocol.java index 75f02b5..fef74aa 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_lettering/ItemProtocol.java @@ -8,9 +8,14 @@ import java.util.List; @Slf4j public class ItemProtocol { + public static String item_heartbeat = "heartbeat"; public static String item_mode = "mode"; - public static String item_action = "action"; + public static String item_move = "move"; public static String item_error = "error"; + public static String item_order = "order"; + public static String item_order_detail = "order_detail"; + public static String item_detail_qty = "detail_qty"; + public static String item_detail_qualified_qty = "detail_qualified_qty"; public static String item_to_command = "to_command"; @@ -24,14 +29,30 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } - public int getAction() { - return this.getOpcIntegerValue(item_action); + public int getMove() { + return this.getOpcIntegerValue(item_move); } public int getError() { return this.getOpcIntegerValue(item_error); } + public int getOrder() { + return this.getOpcIntegerValue(item_order); + } + + public int getOrder_detail() { + return this.getOpcIntegerValue(item_order_detail); + } + + public int getDetail_qty() { + return this.getOpcIntegerValue(item_detail_qty); + } + + public int getDetail_qualified_qty() { + return this.getOpcIntegerValue(item_detail_qualified_qty); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } @@ -50,15 +71,20 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_mode, "工作状态", "V100.1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "V100.0")); - list.add(new ItemDto(item_error, "报警信号", "VB101")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB602.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB602.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电信号", "DB602.B3")); + list.add(new ItemDto(item_error, "故障信号", "DB602.B4")); + list.add(new ItemDto(item_order, "当前执行工单号", "DB602.D8")); + list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB602.D12")); + list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB602.D16")); + list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB602.D20")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "V102.0", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "刻字完成反馈", "DB612.D2", Boolean.valueOf(true))); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java index d8e7653..65cb2eb 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/HaiLiangRiskingDefination.java @@ -56,10 +56,14 @@ public class HaiLiangRiskingDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB603.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB603.B2", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_move, "光电信号", "DB603.B3")); + list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB603.B4")); + list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB603.D8")); + list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB603.D12")); + list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB603.D16")); + list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB603.D20")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/ItemProtocol.java index 99f203c..efa1dfa 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_risking/ItemProtocol.java @@ -10,8 +10,12 @@ import java.util.List; public class ItemProtocol { public static String item_heartbeat = "heartbeat"; public static String item_mode = "mode"; - public static String item_action = "action"; + public static String item_move = "move"; public static String item_error = "error"; + public static String item_order = "order"; + public static String item_order_detail = "order_detail"; + public static String item_detail_qty = "detail_qty"; + public static String item_detail_qualified_qty = "detail_qualified_qty"; public static String item_to_command = "to_command"; @@ -29,19 +33,34 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } - public int getAction() { - return this.getOpcIntegerValue(item_action); + public int getMove() { + return this.getOpcIntegerValue(item_move); } public int getError() { return this.getOpcIntegerValue(item_error); } + public int getOrder() { + return this.getOpcIntegerValue(item_order); + } + + public int getOrder_detail() { + return this.getOpcIntegerValue(item_order_detail); + } + + public int getDetail_qty() { + return this.getOpcIntegerValue(item_detail_qty); + } + + public int getDetail_qualified_qty() { + return this.getOpcIntegerValue(item_detail_qualified_qty); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } - public int getOpcIntegerValue(String protocol) { Integer value = this.driver.getIntegeregerValue(protocol); if (value == null) { @@ -55,16 +74,20 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB603.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB603.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电信号", "DB603.B3")); + list.add(new ItemDto(item_error, "故障信号", "DB603.B4")); + list.add(new ItemDto(item_order, "当前执行工单号", "DB603.D8")); + list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB603.D12")); + list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB603.D16")); + list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB603.D20")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "套冒完成反馈", "DB613.D2", Boolean.valueOf(true))); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDefination.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDefination.java index ef907b0..ac514a1 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDefination.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/HaiLiangStrappingDefination.java @@ -56,10 +56,16 @@ public class HaiLiangStrappingDefination implements OpcDeviceDriverDefination { public static List getReadableItemDtos2() { List list = new ArrayList(); - list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "DB600.B1", true)); - list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "DB600.B4")); + list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB604.B0")); + list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB604.B2", Boolean.valueOf(true))); + list.add(new ItemDto(ItemProtocol.item_move, "光电信号", "DB604.B3")); + list.add(new ItemDto(ItemProtocol.item_error, "故障信号", "DB604.B4")); + list.add(new ItemDto(ItemProtocol.item_order, "当前执行工单号", "DB604.D8")); + list.add(new ItemDto(ItemProtocol.item_order_detail, "当前工单明细号", "DB604.D12")); + list.add(new ItemDto(ItemProtocol.item_detail_qty, "当前工单实时上料数量", "DB604.D16")); + list.add(new ItemDto(ItemProtocol.item_detail_qualified_qty, "当前工单明细号合格数量", "DB604.D20")); + list.add(new ItemDto(ItemProtocol.item_cache_qty, "当前缓存数量", "DB604.D24")); + list.add(new ItemDto(ItemProtocol.item_qty, "当前捆扎数量", "DB604.D28")); return list; } diff --git a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/ItemProtocol.java b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/ItemProtocol.java index ad454f0..e5a13e2 100644 --- a/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/ItemProtocol.java +++ b/nladmin-system/src/main/java/org/nl/acs/device_driver/hailiang/hailiang_strapping/ItemProtocol.java @@ -10,8 +10,14 @@ import java.util.List; public class ItemProtocol { public static String item_heartbeat = "heartbeat"; public static String item_mode = "mode"; - public static String item_action = "action"; + public static String item_move = "move"; public static String item_error = "error"; + public static String item_order = "order"; + public static String item_order_detail = "order_detail"; + public static String item_detail_qty = "detail_qty"; + public static String item_detail_qualified_qty = "detail_qualified_qty"; + public static String item_cache_qty = "cache_qty"; + public static String item_qty = "qty"; public static String item_to_command = "to_command"; @@ -29,17 +35,42 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_mode); } - public int getAction() { - return this.getOpcIntegerValue(item_action); + public int getMove() { + return this.getOpcIntegerValue(item_move); } public int getError() { return this.getOpcIntegerValue(item_error); } + public int getOrder() { + return this.getOpcIntegerValue(item_order); + } + + public int getOrder_detail() { + return this.getOpcIntegerValue(item_order_detail); + } + + public int getDetail_qty() { + return this.getOpcIntegerValue(item_detail_qty); + } + + public int getDetail_qualified_qty() { + return this.getOpcIntegerValue(item_detail_qualified_qty); + } + + public int getCache_qty() { + return this.getOpcIntegerValue(item_cache_qty); + } + + public int getQty() { + return this.getOpcIntegerValue(item_qty); + } + public int getToCommand() { return this.getOpcIntegerValue(item_to_command); } + public int getOpcIntegerValue(String protocol) { @@ -55,16 +86,22 @@ public class ItemProtocol { public static List getReadableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDto(item_mode, "工作状态", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDto(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDto(item_error, "报警信号", "DB51.B4")); + list.add(new ItemDto(item_heartbeat, "心跳", "DB604.B0")); + list.add(new ItemDto(item_mode, "工作模式", "DB604.B2", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电信号", "DB604.B3")); + list.add(new ItemDto(item_error, "故障信号", "DB604.B4")); + list.add(new ItemDto(item_order, "当前执行工单号", "DB604.D8")); + list.add(new ItemDto(item_order_detail, "当前工单明细号", "DB604.D12")); + list.add(new ItemDto(item_detail_qty, "当前工单实时上料数量", "DB604.D16")); + list.add(new ItemDto(item_detail_qualified_qty, "当前工单明细号合格数量", "DB604.D20")); + list.add(new ItemDto(item_cache_qty, "当前缓存数量", "DB604.D24")); + list.add(new ItemDto(item_qty, "当前捆扎数量", "DB604.D28")); return list; } public static List getWriteableItemDtos() { ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); + list.add(new ItemDto(item_to_command, "捆扎完成反馈", "DB614.W2", Boolean.valueOf(true))); return list; }