自动门及混料间设备驱动更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java

@@ -41,7 +41,11 @@ public enum DriverTypeEnum {
 
     TRAFFIC_LIGHT(34, "traffic_light", "标准版-交通灯-欧姆龙plc", "alarmLamp"),
 
-    STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv");
+    STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"),
+
+    INSPECT_SITE_SMART(41, "standard_inspect_site_smart", "检测站点_smaet200", "station"),
+
+    AUTODOOR_SMART(9, "standard_autodoor_smart", "标准版-自动门(Smart)", "autodoor");
 
     //驱动索引
     private int index;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java

@@ -73,6 +73,10 @@ public interface OpcDeviceDriver extends DeviceDriver {
         return (String) this.getOpcValueAccessor().getValue(this.getItem(protocol));
     }
 
+    default Integer getIntegerValue(String protocol) {
+        return (Integer) this.getValue(protocol);
+    }
+
     default Object getValue(String protocol) {
         return this.getOpcValueAccessor().getValue(this.getItem(protocol));
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor_smart/ItemProtocol.java

@@ -0,0 +1,72 @@
+package org.nl.acs.device_driver.standard_autodoor_smart;
+
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+
+import java.util.ArrayList;
+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_error = "error";
+    public static String item_to_command = "to_command";
+
+
+    private StandardAutodoorSmartDeviceDriver driver;
+
+    public ItemProtocol(StandardAutodoorSmartDeviceDriver driver) {
+        this.driver = driver;
+    }
+
+    public int getHeartbeat() {
+        return this.getOpcIntegerValue(item_heartbeat);
+    }
+
+    public int getMode() {
+        return this.getOpcIntegerValue(item_mode);
+    }
+
+    public int getAction() {
+        return this.getOpcIntegerValue(item_action);
+    }
+
+    public int getError() {
+        return this.getOpcIntegerValue(item_error);
+    }
+
+    public int getToCommand() {
+        return this.getOpcIntegerValue(item_to_command);
+    }
+
+
+    public int getOpcIntegerValue(String protocol) {
+        Integer value = this.driver.getIntegeregerValue(protocol);
+        if (value == null) {
+            log.error("读取错误!");
+        } else {
+            return value;
+        }
+        return 0;
+
+    }
+
+    public static List<ItemDto> getReadableItemDtos() {
+        ArrayList list = new ArrayList();
+        list.add(new ItemDto(item_heartbeat, "心跳", "VW0"));
+        list.add(new ItemDto(item_mode, "工作状态", "VW2", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_action, "动作信号", "VW4"));
+        list.add(new ItemDto(item_error, "报警信号", "VW6"));
+        return list;
+    }
+
+    public static List<ItemDto> getWriteableItemDtos() {
+        ArrayList list = new ArrayList();
+        list.add(new ItemDto(item_to_command, "作业命令", "VW52", Boolean.valueOf(true)));
+        return list;
+    }
+
+}
+

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor_smart/StandardAutodoorSmartDefination.java

@@ -0,0 +1,71 @@
+package org.nl.acs.device_driver.standard_autodoor_smart;
+
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
+import org.nl.acs.opc.Device;
+import org.nl.acs.opc.DeviceType;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 自动门驱动定义
+ */
+@Service
+public class StandardAutodoorSmartDefination implements OpcDeviceDriverDefination {
+    @Override
+    public String getDriverCode() {
+        return "standard_autodoor_smart";
+    }
+
+    @Override
+    public String getDriverName() {
+        return "标准版-自动门(Smart)";
+    }
+
+    @Override
+    public String getDriverDescription() {
+        return "标准版-自动门(Smart)";
+    }
+
+    @Override
+    public DeviceDriver getDriverInstance(Device device) {
+        return (new StandardAutodoorSmartDeviceDriver()).setDevice(device).setDriverDefination(this);
+
+    }
+
+    @Override
+    public Class<? extends DeviceDriver> getDeviceDriverType() {
+        return StandardAutodoorSmartDeviceDriver.class;
+    }
+
+    @Override
+    public List<DeviceType> getFitDeviceTypes() {
+        List<DeviceType> types = new LinkedList();
+        types.add(DeviceType.conveyor);
+        return types;
+    }
+
+    @Override
+    public List<ItemDto> getReadableItemDtos() {
+        return getReadableItemDtos2();
+    }
+
+    public static List<ItemDto> getReadableItemDtos2() {
+        List<ItemDto> list = new ArrayList();
+        list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "VW0"));
+        list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "VW2", true));
+        list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "VW4"));
+        list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "VW6"));
+        return list;
+    }
+
+    @Override
+    public List<ItemDto> getWriteableItemDtos() {
+        return ItemProtocol.getWriteableItemDtos();
+    }
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_autodoor_smart/StandardAutodoorSmartDeviceDriver.java

@@ -0,0 +1,163 @@
+package org.nl.acs.device_driver.standard_autodoor_smart;
+
+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;
+
+/**
+ * 自动门驱动
+ */
+@Slf4j
+@Data
+@RequiredArgsConstructor
+public class StandardAutodoorSmartDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver {
+    protected ItemProtocol itemProtocol = new ItemProtocol(this);
+    @Autowired
+    InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
+    @Autowired
+    DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
+    @Autowired
+    RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
+    @Autowired
+    TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
+    String container;
+    String container_type_desc;
+    String last_container_type_desc;
+    String last_container;
+    //放货准备锁
+    String putReadyLock = null;
+    //有货标记
+    protected boolean has_goods_tag = false;
+    String devicecode;
+    int mode = 0;
+    int action = 0;
+    int error = 0;
+    Boolean iserror = false;
+
+    int move = 0;
+    int task = 0;
+    int last_action = 0;
+    int last_mode = 0;
+    int last_error = 0;
+    int last_move = 0;
+    int last_task = 0;
+
+    boolean hasVehicle = false;
+    boolean isReady = false;
+    protected int instruction_num = 0;
+    protected int instruction_num_truth = 0;
+    protected boolean hasGoods = false;
+    boolean isFold = false;
+    private String assemble_check_tag;
+    private Boolean sampleMode0;
+    private Boolean sampleMode3;
+    private Integer sampleError;
+    private Boolean sampleOnline;
+    protected String displayMessage = null;
+    public int display_message_time_out = 30000;
+    public Date display_message_time;
+    protected String current_stage_instruction_message;
+    protected String last_stage_instruction_message;
+    Integer heartbeat_tag;
+    private Date instruction_require_time = new Date();
+    private Date instruction_finished_time = new Date();
+
+    private int instruction_require_time_out;
+    boolean requireSucess = false;
+
+    private int instruction_finished_time_out;
+
+    int branchProtocol = 0;
+
+    @Override
+    public Device getDevice() {
+        return this.device;
+    }
+
+
+    @Override
+    public void execute() {
+        String message = null;
+
+        String device_code = this.getDevice().getDevice_code();
+        mode = this.itemProtocol.getMode();
+        action = this.itemProtocol.getAction();
+        error = this.itemProtocol.getError();
+        if (mode != last_mode) {
+        }
+        if (action != last_action) {
+        }
+        if (error != last_error) {
+            //this.execute_log.setContainer("");
+        }
+        last_action = action;
+        last_mode = mode;
+        last_error = error;
+        //message = StringFormatUtl.format("设备报警:{}", new Object[]{});
+
+//        String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString();
+
+    }
+
+    public synchronized String getStatus() {
+        JSONObject jo = new JSONObject();
+
+        if (action == 1) {
+            jo.put("name", this.getDevice().getDevice_code());
+            jo.put("status", "OPEN");
+
+        } else if (action == 2) {
+            jo.put("name", this.getDevice().getDevice_code());
+            jo.put("status", "CLOSE");
+
+        } else {
+            jo.put("name", this.getDevice().getDevice_code());
+            jo.put("status", "ERROR");
+        }
+        return jo.toString();
+    }
+
+
+    public void writeing(int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, command);
+        ReadUtil.write(itemMap, server);
+        log.info("下发PLC信号：{},{}", to_command, command);
+        System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command);
+
+    }
+
+    public synchronized void OpenOrClose(String type) {
+
+        //开门
+        if ("1".equals(type)) {
+            writeing(1);
+        } else {
+            writeing(2);
+        }
+
+    }
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/ItemProtocol.java

@@ -0,0 +1,108 @@
+package org.nl.acs.device_driver.standard_inspect_site_smart200;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Data
+public class ItemProtocol {
+
+    public static String item_heartbeat = "heartbeat";
+    public static String item_mode = "mode";
+    public static String item_move = "move";
+    public static String item_action = "action";
+    public static String item_ioaction = "ioaction";
+    public static String item_error = "error";
+    public static String item_task = "task";
+    public static String item_to_command = "to_command";
+    public static String item_to_target = "to_target";
+    public static String item_to_task = "to_task";
+    public static String item_weight = "weight";
+
+    private StandardInspectSiteSmartDeviceDriver driver;
+
+    public ItemProtocol(StandardInspectSiteSmartDeviceDriver driver) {
+        this.driver = driver;
+    }
+
+    public int getHeartbeat() {
+        return this.getOpcIntegerValue(item_heartbeat);
+    }
+
+    public int getMode() {
+        return this.getOpcIntegerValue(item_mode);
+    }
+
+    public int getMove() {
+        return this.getOpcIntegerValue(item_move);
+    }
+
+    public int getIoaction() {
+        return this.getOpcIntegerValue(item_ioaction);
+    }
+
+    public int getError() {
+        return this.getOpcIntegerValue(item_error);
+    }
+
+    public int getTask() {
+        return this.getOpcIntegerValue(item_task);
+    }
+
+    public int getToCommand() {
+        return this.getOpcIntegerValue(item_to_command);
+    }
+
+    public int getToTarget() {
+        return this.getOpcIntegerValue(item_to_target);
+    }
+
+    public int getToTask() {
+        return this.getOpcIntegerValue(item_to_task);
+    }
+
+    //是否有货
+    public int hasGoods(int move) {
+        return move;
+    }
+
+    Boolean isonline;
+
+    public int getOpcIntegerValue(String protocol) {
+        Integer value = this.driver.getIntegerValue(protocol);
+        if (value == null) {
+            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            setIsonline(false);
+        } else {
+            setIsonline(true);
+            return value;
+        }
+        return 0;
+
+    }
+
+    public static List<ItemDto> getReadableItemDtos() {
+        ArrayList list = new ArrayList();
+        list.add(new ItemDto(item_heartbeat, "心跳", "VW0"));
+        list.add(new ItemDto(item_mode, "工作状态", "VW2", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_move, "光电开关信号", "VW4"));
+        list.add(new ItemDto(item_action, "动作信号", "VW8"));
+        list.add(new ItemDto(item_error, "报警信号", "VW12"));
+        list.add(new ItemDto(item_task, "任务号", "VD14"));
+        return list;
+    }
+
+    public static List<ItemDto> getWriteableItemDtos() {
+        ArrayList list = new ArrayList();
+        list.add(new ItemDto(item_to_command, "作业命令", "VW52", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_to_target, "目标站", "VW54"));
+        list.add(new ItemDto(item_to_task, "任务号", "VD58"));
+        return list;
+    }
+
+}
+

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/StandardInspectSiteSmartDefination.java

@@ -0,0 +1,62 @@
+package org.nl.acs.device_driver.standard_inspect_site_smart200;
+
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
+import org.nl.acs.opc.Device;
+import org.nl.acs.opc.DeviceType;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 检测站点驱动定义
+ * 说明：该站点为普通带光电检测站点
+ */
+@Service
+public class StandardInspectSiteSmartDefination implements OpcDeviceDriverDefination {
+    @Override
+    public String getDriverCode() {
+        return "standard_inspect_site_smart";
+    }
+
+    @Override
+    public String getDriverName() {
+        return "标准版-检测站点_smart";
+    }
+
+    @Override
+    public String getDriverDescription() {
+        return "标准版-检测站点_smart";
+    }
+
+    @Override
+    public DeviceDriver getDriverInstance(Device device) {
+        return (new StandardInspectSiteSmartDeviceDriver()).setDevice(device).setDriverDefination(this);
+
+    }
+
+    @Override
+    public Class<? extends DeviceDriver> getDeviceDriverType() {
+        return StandardInspectSiteSmartDeviceDriver.class;
+    }
+
+    @Override
+    public List<DeviceType> getFitDeviceTypes() {
+        List<DeviceType> types = new LinkedList();
+        types.add(DeviceType.conveyor);
+        return types;
+    }
+
+    @Override
+    public List<ItemDto> getReadableItemDtos() {
+        return ItemProtocol.getReadableItemDtos();
+    }
+
+    @Override
+    public List<ItemDto> getWriteableItemDtos() {
+        return ItemProtocol.getWriteableItemDtos();
+    }
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/StandardInspectSiteSmartDeviceDriver.java

@@ -0,0 +1,725 @@
+package org.nl.acs.device_driver.standard_inspect_site_smart200;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
+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.RouteableDeviceDriver;
+import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
+import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver;
+import org.nl.acs.instruction.service.InstructionService;
+import org.nl.acs.instruction.service.dto.Instruction;
+import org.nl.acs.opc.Device;
+import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.opc.WcsConfig;
+import org.nl.acs.route.service.RouteLineService;
+import org.nl.acs.route.service.dto.RouteLineDto;
+import org.nl.acs.task.service.TaskService;
+import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.utils.SpringContextHolder;
+import org.nl.wql.core.bean.WQLObject;
+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.List;
+import java.util.Map;
+
+/**
+ * 检测站点驱动
+ */
+@Slf4j
+@Data
+@RequiredArgsConstructor
+public class StandardInspectSiteSmartDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver {
+    protected ItemProtocol itemProtocol = new ItemProtocol(this);
+    @Autowired
+    InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
+    @Autowired
+    DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
+    @Autowired
+    RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
+    @Autowired
+    TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
+    @Autowired
+    DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class);
+    String container;
+    String container_type_desc;
+    String last_container_type_desc;
+    String last_container;
+    //放货准备锁
+    String putReadyLock = null;
+    //有货标记
+    protected boolean has_goods_tag = false;
+
+    int mode = 0;
+    int error = 0;
+    int move = 0;
+    int task = 0;
+    int last_mode = 0;
+    int last_error = 0;
+    int last_move = 0;
+    int last_task = 0;
+    Boolean isonline = true;
+    int hasGoods = 0;
+    String message = null;
+    Boolean iserror = false;
+
+
+    boolean hasVehicle = false;
+    boolean isReady = false;
+    protected int instruction_num = 0;
+    protected int instruction_num_truth = 0;
+    boolean isFold = false;
+    private String assemble_check_tag;
+
+    protected String current_stage_instruction_message;
+    protected String last_stage_instruction_message;
+    Integer heartbeat_tag;
+    private Date instruction_require_time = new Date();
+    private Date instruction_finished_time = new Date();
+
+    private int instruction_require_time_out;
+    boolean requireSucess = false;
+    boolean inrequireSucess = false;
+    boolean emptyrequireSucess = false;
+
+    private int instruction_finished_time_out;
+
+    int branchProtocol = 0;
+    //备注
+    String remark;
+    //数量
+    String qty;
+    //物料
+    String material;
+    //批次
+    String batch;
+    //当前指令
+    Instruction inst = null;
+    //上次指令
+    Instruction last_inst = null;
+
+    Object object = new Object();
+    //触摸屏手动触发任务
+    private Boolean is_has_task = false;
+
+    //申请搬运任务
+    private Boolean apply_handling = false;
+    //申请物料
+    private Boolean apply_material = false;
+
+    //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
+    int flag;
+
+    String devicecode;
+
+    // 手持设备信息
+    private String model;
+
+    // 工序
+    private String process;
+
+    // 重量
+    private String weight;
+
+    // 质量状态
+    private String qc_status;
+
+    // 日期
+    private String date;
+
+    // 操作员
+    private String operation_by;
+
+    String put_goods_time = "";
+
+    Boolean islock = false;
+
+    @Override
+    public Device getDevice() {
+        return this.device;
+    }
+
+
+    @Override
+    public void execute() {
+        String message = null;
+        try {
+            String device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            move = this.itemProtocol.getMove();
+            task = this.itemProtocol.getTask();
+            hasGoods = this.itemProtocol.getMove();
+
+            if (mode != last_mode) {
+                if (mode == 5) {
+                    this.setEmptyrequireSucess(false);
+                }
+                if (mode == 6) {
+                    this.setInrequireSucess(false);
+                }
+            }
+
+            if (this.getApply_handling()) {
+                String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString();
+                DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
+                Device link_device = appService.findDeviceByCode(link_device_code);
+                StandardInspectSiteSmartDeviceDriver standardInspectSiteDevicedriver;
+                if (link_device.getDeviceDriver() instanceof StandardInspectSiteSmartDeviceDriver) {
+                    standardInspectSiteDevicedriver = (StandardInspectSiteSmartDeviceDriver) link_device.getDeviceDriver();
+//                            if(standardInspectSiteDevicedriver.getMode() != 2){
+//                                log.debug("设备未待机");
+//                                return;
+//                            }
+//                            if(standardInspectSiteDevicedriver.getMove() != 0){
+//                                log.debug("设备不满足放货条件");
+//                                return;
+//                            }
+
+                    //如果目标设备申请叫料 则允许生成任务
+                    if (standardInspectSiteDevicedriver.getApply_material()) {
+                        TaskDto dto = new TaskDto();
+                        String now = DateUtil.now();
+                        dto.setTask_id(IdUtil.simpleUUID());
+                        dto.setCreate_by(this.getDevice().getDevice_code());
+                        dto.setUpdate_by(this.getDevice().getDevice_code());
+                        dto.setStart_point_code(this.getDevice().getDevice_code());
+
+                        String taskcode = CodeUtil.getNewCode("TASK_NO");
+                        dto.setTask_code("-" + taskcode);
+                        dto.setTask_status("0");
+                        dto.setPriority("101");
+//                        RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
+//                        String next_device_codecode = jo.getNext_device_code();
+//                                if(StrUtil.isEmpty(next_device_codecode)){
+//                                    throw new RuntimeException("该设备未找到对应路由");
+//                                }
+                        dto.setNext_point_code(standardInspectSiteDevicedriver.getDevicecode());
+                        dto.setUpdate_time(now);
+                        dto.setCreate_time(now);
+
+                        WQLObject wo = WQLObject.getWQLObject("acs_task");
+                        JSONObject json = JSONObject.fromObject(dto);
+                        wo.insert(json);
+                        standardInspectSiteDevicedriver.setApply_material(false);
+                    }
+                }
+                this.setApply_handling(false);
+            }
+
+        } catch (Exception var17) {
+            return;
+        }
+
+        if (!this.itemProtocol.getIsonline()) {
+            this.setIsonline(false);
+            this.setIserror(true);
+            message = "信号量同步异常";
+            //未联机
+        } else if (mode == 0) {
+            this.setIsonline(false);
+            this.setIserror(true);
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+            this.setIsonline(false);
+            this.setIserror(true);
+            message = "有报警";
+            //无报警
+        } else {
+            this.setIsonline(true);
+            this.setIserror(false);
+            message = "";
+            Instruction instruction = null;
+            List toInstructions;
+
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    return;
+                case 2:
+                    //申请任务
+//                    if (this.getApply_handling()) {
+//                        String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString();
+//                        DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
+//                        Device link_device =  appService.findDeviceByCode(link_device_code);
+//                        StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver;
+//                        if(link_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+//                            standardInspectSiteDevicedriver = (StandardInspectSiteDeviceDriver) link_device.getDeviceDriver();
+//                            if(standardInspectSiteDevicedriver.getMode() != 2){
+//                                log.debug("设备未待机");
+//                                return;
+//                            }
+//                            if(standardInspectSiteDevicedriver.getMove() != 0){
+//                                log.debug("设备不满足放货条件");
+//                                return;
+//                            }
+//
+//                            //如果目标设备申请叫料 则允许生成任务
+//                            if(standardInspectSiteDevicedriver.getApply_material()){
+//                                TaskDto dto = new TaskDto();
+//                                String now = DateUtil.now();
+//                                dto.setTask_id(IdUtil.simpleUUID());
+//                                dto.setCreate_by(this.getDevice().getDevice_code());
+//                                dto.setUpdate_by(this.getDevice().getDevice_code());
+//                                dto.setStart_point_code(this.getDevice().getDevice_code());
+//
+//                                String taskcode = CodeGenerateUtil.getNewCode("TASK_NO");
+//                                dto.setTask_code("-"+taskcode);
+//                                dto.setTask_status("0");
+//                                dto.setPriority("101");
+//                                RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
+//                                String next_device_codecode = jo.getNext_device_code();
+//                                if(StrUtil.isEmpty(next_device_codecode)){
+//                                    throw new RuntimeException("该设备未找到对应路由");
+//                                }
+//                                dto.setNext_point_code(next_device_codecode);
+//                                dto.setUpdate_time(now);
+//                                dto.setCreate_time(now);
+//
+//                                WQLObject wo = WQLObject.getWQLObject("acs_task");
+//                                JSONObject json = JSONObject.fromObject(dto);
+//                                wo.insert(json);
+//                                standardInspectSiteDevicedriver.setApply_material(false);
+//                            }
+//                        }
+//                        this.setApply_handling(false);
+//                    }
+
+                    if (material.length() > 0 && qty.length() > 0 && !requireSucess) {
+
+                        this.instruction_require(container);
+
+                    }
+                case 5:
+                    if (!emptyrequireSucess) {
+                        //mode = 5 并且工位上无货时申请空托盘
+                        if (move == 0) {
+                            this.apply_empty_require(container);
+                        }
+                    }
+                    break;
+                case 6:
+                    if (!inrequireSucess) {
+                        if (move == 1) {
+                            this.apply_in_require(container);
+                        }
+                    }
+                    break;
+            }
+
+            switch (flag) {
+                //取货完成
+                case 1:
+                    writing(2);
+                    return;
+                //放货完成
+                case 2:
+                    writing(3);
+                    return;
+
+            }
+
+        }
+        last_mode = mode;
+        last_error = error;
+        last_move = move;
+        last_task = task;
+
+    }
+
+
+    public boolean exe_error() {
+        if (this.error == 0) {
+            return true;
+        } else {
+            log.debug("设备报警");
+            return false;
+        }
+    }
+
+    protected void thingToNothing() {
+        log.debug("从有货到无货 清理数据");
+        this.set_last_container(container, container_type_desc);
+    }
+
+    public void set_last_container(String barcode, String type_desc) {
+        this.set_last_container(barcode);
+        this.set_last_container_type_desc(type_desc);
+    }
+
+    public void set_last_container(String barcode) {
+    }
+
+    public void set_last_container_type_desc(String type) {
+    }
+
+    public boolean exe_business() {
+        return true;
+    }
+
+    protected void executing(Instruction instruction) {
+        this.executing(1, instruction, "");
+    }
+
+    public void executing(int command, Instruction instruction, String appendMessage) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+        String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_target;
+        String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_task;
+        if (appendMessage == null) {
+            appendMessage = "";
+        }
+        if (instruction != null) {
+            instruction_num = Integer.parseInt(instruction.getInstruction_code());
+        }
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, 1);
+        itemMap.put(to_task, instruction_num);
+        ReadUtil.write(itemMap, server);
+
+    }
+
+    public void executing(Server server, Map<String, Object> itemMap) {
+        ReadUtil.write(itemMap, server);
+    }
+
+    public void writing(int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, command);
+        ReadUtil.write(itemMap, server);
+
+    }
+
+    public void writing(int type, int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+        String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_target;
+        String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_task;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        if (type == 1) {
+            itemMap.put(to_command, command);
+        } else if (type == 2) {
+            itemMap.put(to_target, command);
+
+        } else if (type == 3) {
+            itemMap.put(to_task, command);
+        }
+        ReadUtil.write(itemMap, server);
+
+    }
+
+    public boolean instruction_require(String container_code) {
+        return instruction_require(container_code, WcsConfig.task_container_type_default_desc);
+    }
+
+    public synchronized boolean apply_empty_require(String container_code) {
+        return apply_empty_require(container_code, WcsConfig.task_container_type_default_desc);
+    }
+
+    public synchronized boolean apply_in_require(String container_code) {
+        return apply_in_require(container_code, WcsConfig.task_container_type_default_desc);
+    }
+
+
+    /**
+     * 请求指令
+     *
+     * @param container_code
+     * @param container_type
+     */
+    public synchronized boolean apply_in_require(String container_code, String container_type) {
+        WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
+        Date date = new Date();
+        Boolean flag = false;
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            //查询该设备所有路由
+            List<RouteLineDto> pathLinesByCode = routelineserver.getSuperiorShortPathLinesByCode(this.getDevice().getDevice_code(), "normal");
+            StandardInspectSiteSmartDeviceDriver standardInspectSiteDeviceDriver;
+            for (int i = 0; i < pathLinesByCode.size(); i++) {
+                RouteLineDto routeLineDto = pathLinesByCode.get(i);
+                //获取该路由的起点设备编码
+                String start_device_code = routeLineDto.getDevice_code();
+                //获取该路由的终点设备编码
+                String next_device_code = routeLineDto.getNext_device_code();
+                //获取该路由终点设备信息
+                Device route_link_device = deviceAppservice.findDeviceByCode(next_device_code);
+                //判断终点设备驱动是否为检测站点驱动
+                if (route_link_device.getDeviceDriver() instanceof StandardInspectSiteSmartDeviceDriver) {
+                    standardInspectSiteDeviceDriver = (StandardInspectSiteSmartDeviceDriver) route_link_device.getDeviceDriver();
+                    //判断该终点设备是否有货,有货就结束循环
+                    if (standardInspectSiteDeviceDriver.getMove() != 0 || standardInspectSiteDeviceDriver.getMode() != 2) {
+                        continue;
+                    }
+
+                    //判断是否已经有该起点设备的任务,如果有就结束循环
+                    int num1 = WQLObject
+                            .getWQLObject("acs_task")
+                            .query("start_device_code = '" + start_device_code + "'")
+                            .getResultCount();
+                    if (num1 != 0) {
+                        continue;
+                    }
+                    //判断是否有相同终点的任务,有就结束本次循环
+                    int num = WQLObject
+                            .getWQLObject("acs_task")
+                            .query("next_device_code = '" + next_device_code + "'")
+                            .getResultCount();
+                    if (num != 0) {
+                        continue;
+                    }
+  /*                  //判断检测站点是否锁定,如果锁定就结束本次循环
+                    JSONObject jsonObject = runpointwo.query("device_code = '" + next_device_code + "' and islock = '1'").uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(jsonObject)) {
+                        this.execute_log.log("设备:" + devicecode+ "", "", "对应路由设备，" + next_device_code + "已锁定");
+                        continue;
+                    }*/
+                    //创建任务
+                    TaskDto dto = new TaskDto();
+                    String now = DateUtil.now();
+                    dto.setTask_id(IdUtil.simpleUUID());
+                    dto.setCreate_by(this.getDevice().getDevice_code());
+                    dto.setUpdate_by(this.getDevice().getDevice_code());
+                    dto.setVehicle_code(container_code);
+                    dto.setVehicle_type(container_type);
+                    String taskcode = CodeUtil.getNewCode("TASK_NO");
+                    dto.setTask_code("-" + taskcode);
+                    dto.setTask_status("0");
+                    dto.setPriority("101");
+                    dto.setMaterial(this.getDevice().getMaterial_type());
+                    dto.setUpdate_time(now);
+                    dto.setCreate_time(now);
+                    dto.setStart_device_code(start_device_code);
+                    dto.setStart_point_code(start_device_code);
+                    dto.setNext_device_code(next_device_code);
+                    dto.setNext_point_code(next_device_code);
+                    try {
+                        //判断是否已经有该起点设备的任务,如果有就结束循环
+                        int num2 = WQLObject
+                                .getWQLObject("acs_task")
+                                .query("start_device_code = '" + start_device_code + "'")
+                                .getResultCount();
+                        if (num2 != 0) {
+                            continue;
+                        }
+                        //判断是否有相同终点的任务,有就结束本次循环
+                        int num3 = WQLObject
+                                .getWQLObject("acs_task")
+                                .query("next_device_code = '" + next_device_code + "'")
+                                .getResultCount();
+                        if (num3 != 0) {
+                            continue;
+                        }
+                        taskserver.create(dto);
+/*                        //任务创建成功 锁定终点设备
+                        JSONObject map = new JSONObject();
+                        map.put("islock", "true");
+                        map.put("update_by", "auto");
+                        map.put("update_time", DateUtil.now());
+                        runpointwo.update(map, "device_code = '" + next_device_code + "'");*/
+                        flag = true;
+                        break;
+                    } catch (Exception e) {
+                    }
+                }
+            }
+
+            //生成任务成功
+            if (flag) {
+
+                inrequireSucess = true;
+            }
+            return true;
+        }
+    }
+
+    /**
+     * 请求指令
+     *
+     * @param container_code
+     * @param container_type
+     */
+    public synchronized boolean apply_empty_require(String container_code, String container_type) {
+        WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
+        Date date = new Date();
+        Boolean flag = false;
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            //查询所有到这台设备的路由,这台设备为路由的终点
+            List<RouteLineDto> pathLinesByCode = routelineserver.getPathLinesByCode(this.getDevice().getDevice_code(), "normal");
+            StandardEmptyPalletSiteDeviceDriver standardEmptyPalletSiteDeviceDriver;
+            for (int i = 0; i < pathLinesByCode.size(); i++) {
+                //获取每个路由
+                RouteLineDto routeLineDto = pathLinesByCode.get(i);
+                //获取路由的起点
+                String start_device_code = routeLineDto.getDevice_code();
+                //获取路由的终点
+                String next_device_code = routeLineDto.getNext_device_code();
+                //获取起点设备的信息
+                Device route_link_device = deviceAppservice.findDeviceByCode(start_device_code);
+                //判断起点设备驱动是否为堆叠位驱动
+                if (route_link_device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) {
+                    standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) route_link_device.getDeviceDriver();
+                    // TODO 判断堆叠位是否有货,没货就结束本次循环
+                    //判断堆叠位的数量是否大于0,如果=0就结束本次循环
+                    if (standardEmptyPalletSiteDeviceDriver.getMove() != 1 || standardEmptyPalletSiteDeviceDriver.getNumber() == 0) {
+                        continue;
+                    }
+                    //判断是否已经有该起点设备的任务,如果有就结束循环
+                    int num = WQLObject
+                            .getWQLObject("acs_task")
+                            .query("start_device_code = '" + start_device_code + "'")
+                            .getResultCount();
+                    if (num != 0) {
+                        continue;
+                    }
+                    //判断是否已经有到该起点设备的任务,如果有就结束循环
+                    int num1 = WQLObject
+                            .getWQLObject("acs_task")
+                            .query("next_device_code = '" + next_device_code + "'")
+                            .getResultCount();
+                    if (num1 != 0) {
+                        continue;
+                    }
+/*                    //判断起点是否锁定,如果被锁定就结束循环
+                    JSONObject jsonObject = runpointwo.query("device_code = '" + next_device_code + "' and islock = 'true'").uniqueResult(0);
+                    if (ObjectUtil.isNotEmpty(jsonObject)) {
+                        this.execute_log.log("设备:" + devicecode+ "", "", "对应路由设备，" + next_device_code + "已锁定");
+                        continue;
+                    }*/
+                    //创建任务
+                    TaskDto dto = new TaskDto();
+                    String now = DateUtil.now();
+                    dto.setTask_id(IdUtil.simpleUUID());
+                    dto.setCreate_by(this.getDevice().getDevice_code());
+                    dto.setUpdate_by(this.getDevice().getDevice_code());
+                    dto.setVehicle_code(container_code);
+                    dto.setVehicle_type(container_type);
+                    String taskcode = CodeUtil.getNewCode("TASK_NO");
+                    dto.setTask_code("-" + taskcode);
+                    dto.setTask_status("0");
+                    dto.setPriority("101");
+                    dto.setUpdate_time(now);
+                    dto.setCreate_time(now);
+                    dto.setStart_device_code(start_device_code);
+                    dto.setStart_point_code(start_device_code);
+                    dto.setNext_device_code(next_device_code);
+                    dto.setNext_point_code(next_device_code);
+                    dto.setMaterial(route_link_device.getMaterial_type());
+                    try {
+                        //判断是否已经有该起点设备的任务,如果有就结束循环
+                        int num2 = WQLObject
+                                .getWQLObject("acs_task")
+                                .query("start_device_code = '" + start_device_code + "'")
+                                .getResultCount();
+                        if (num2 != 0) {
+                            continue;
+                        }
+                        //判断是否有相同终点的任务,有就结束本次循环
+                        int num3 = WQLObject
+                                .getWQLObject("acs_task")
+                                .query("next_device_code = '" + next_device_code + "'")
+                                .getResultCount();
+                        if (num3 != 0) {
+                            continue;
+                        }
+                        taskserver.create(dto);
+                        //任务创建成功 锁定该终点设备
+                        JSONObject map = new JSONObject();
+                        map.put("islock", "true");
+                        map.put("update_by", "auto");
+                        map.put("update_time", DateUtil.now());
+                        runpointwo.update(map, "device_code = '" + start_device_code + "'");
+                        flag = true;
+                        break;
+                    } catch (Exception e) {
+                    }
+                }
+            }
+
+            //生成任务成功
+            if (flag) {
+                emptyrequireSucess = true;
+            }
+            return true;
+        }
+    }
+
+
+    /**
+     * 请求指令
+     *
+     * @param container_code
+     * @param container_type
+     */
+    public synchronized boolean instruction_require(String container_code, String container_type) {
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            TaskDto dto = new TaskDto();
+            String now = DateUtil.now();
+            dto.setTask_id(IdUtil.simpleUUID());
+            dto.setCreate_by(this.getDevice().getDevice_code());
+            dto.setUpdate_by(this.getDevice().getDevice_code());
+            dto.setStart_point_code(this.getDevice().getDevice_code());
+            dto.setVehicle_code(container_code);
+            dto.setVehicle_type(container_type);
+
+            String taskcode = CodeUtil.getNewCode("TASK_NO");
+            dto.setTask_code("-" + taskcode);
+            dto.setTask_status("0");
+            dto.setPriority("101");
+            RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
+            String next_device_codecode = jo.getNext_device_code();
+            if (StrUtil.isEmpty(next_device_codecode)) {
+                throw new RuntimeException("该设备未找到对应路由");
+            }
+            dto.setNext_point_code(next_device_codecode);
+            dto.setUpdate_time(now);
+            dto.setCreate_time(now);
+
+            WQLObject wo = WQLObject.getWQLObject("acs_task");
+            JSONObject json = JSONObject.fromObject(dto);
+            wo.insert(json);
+            requireSucess = false;
+            return true;
+        }
+    }
+
+
+}

acs/qd/src/views/acs/device/config.vue

@@ -95,6 +95,8 @@ import manipulator_inspect_site_NDC from '@/views/acs/device/driver/manipulator_
 import standard_manipulator_stacking_site from '@/views/acs/device/driver/standard_manipulator_stacking_site'
 import standard_photoelectric_inspect_site from '@/views/acs/device/driver/standard_photoelectric_inspect_site'
 import electric_fence from '@/views/acs/device/driver/electric_fence'
+import standard_inspect_site_smart from '@/views/acs/device/driver/standard_inspect_site_smart'
+import standard_autodoor_smart from '@/views/acs/device/driver/standard_autodoor_smart'
 
 export default {
   name: 'DeviceConfig',
@@ -103,7 +105,7 @@ export default {
     lamp_three_color, standard_storage, special_ordinary_site, standard_scanner, standard_conveyor_control_with_scanner,
     standard_conveyor_control_with_plcscanner, standard_conveyor_control, standard_conveyor_monitor, weighing_site, machines_site, non_line_manipulator_inspect_site,
     non_line_inspect_site, manipulator_inspect_site_NDC, standard_manipulator_stacking_site,
-    standard_photoelectric_inspect_site, electric_fence },
+    standard_photoelectric_inspect_site, electric_fence, standard_inspect_site_smart, standard_autodoor_smart },
   dicts: ['device_type'],
   mixins: [crud],
   data() {

acs/qd/src/views/acs/device/driver/standard_autodoor_smart.vue

@@ -0,0 +1,352 @@
+<template>
+  <!--自动门-->
+  <div>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">设备协议：</span>
+      </div>
+
+      <el-row>
+        <el-col :span="12">
+          OpcServer:
+          <el-select
+            v-model="opc_id"
+            placeholder="无"
+            clearable
+            @change="changeOpc"
+          >
+            <el-option
+              v-for="item in dataOpcservers"
+              :key="item.opc_id"
+              :label="item.opc_name"
+              :value="item.opc_id"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          PLC:
+          <el-select
+            v-model="plc_id"
+            placeholder="无"
+            clearable
+            @change="changePlc"
+          >
+            <el-option
+              v-for="item in dataOpcPlcs"
+              :key="item.plc_id"
+              :label="item.plc_name"
+              :value="item.plc_id"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">输送系统：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="电气调度号" label-width="150px">
+              <el-switch v-model="form.OPCServer" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC读取字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data1"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data1[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishReadEdit(data1[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC写入字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data2"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data2[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishWriteEdit(data2[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbw_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span" />
+        <el-button
+          :loading="false"
+          icon="el-icon-check"
+          size="mini"
+          style="float: right; padding: 6px 9px"
+          type="primary"
+          @click="doSubmit"
+        >保存
+        </el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  queryDriverConfig,
+  updateConfig,
+  testRead,
+  testwrite
+} from '@/api/acs/device/driverConfig'
+import { selectOpcList } from '@/api/acs/device/opc'
+import { selectPlcList } from '@/api/acs/device/opcPlc'
+import { selectListByOpcID } from '@/api/acs/device/opcPlc'
+
+import crud from '@/mixins/crud'
+
+export default {
+  name: 'StandardAutodoor',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      opc_id: '',
+      opc_code: '',
+      configLoading: false,
+      dataOpcservers: [],
+      dataOpcPlcs: [],
+      data1: [],
+      data2: [],
+      form: {
+        inspect_in_stocck: true,
+        ignore_pickup_check: true,
+        ignore_release_check: true,
+        apply_task: true,
+        manual_create_task: true,
+        is_pickup: true,
+        is_release: true
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      // 从父表单获取设备编码
+      this.device_id = this.$props.parentForm.device_id
+      this.device_code = this.$props.parentForm.device_code
+      queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
+        // 给表单赋值，并且属性不能为空
+        if (data.form) {
+          const arr = Object.keys(data.form)
+          // 不为空
+          if (arr.length > 0) {
+            this.form = data.form
+          }
+        }
+
+        // 给表单赋值，并且属性不能为空
+        if (data.parentForm) {
+          const arr = Object.keys(data.parentForm)
+          // 不为空
+          if (arr.length > 0) {
+            this.opc_code = data.parentForm.opc_code
+            this.plc_code = data.parentForm.plc_code
+          }
+        }
+        this.data1 = data.rs
+        this.data2 = data.ws
+        this.sliceItem()
+      })
+      selectPlcList().then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = this.$props.parentForm.opc_plc_id
+      })
+      selectOpcList().then(data => {
+        this.dataOpcservers = data
+        this.opc_id = this.$props.parentForm.opc_server_id
+      })
+    })
+  },
+  methods: {
+    changeOpc(val) {
+      this.dataOpcservers.forEach(item => {
+        if (item.opc_id === val) {
+          this.opc_code = item.opc_code
+        }
+      })
+      selectListByOpcID(val).then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = ''
+        this.plc_code = ''
+        if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
+          this.plc_id = this.dataOpcPlcs[0].plc_id
+          this.plc_code = this.dataOpcPlcs[0].plc_code
+        }
+        this.sliceItem()
+      })
+    },
+    finishReadEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('mode') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.match(/(\S*)\./)[1]
+        // .之后的字符串
+        const afterStr = dbValue.match(/\.(\S*)/)[1]
+        // 取最后数字
+        const endNumber = afterStr.substring(1)
+        // 最后为非数字
+        if (isNaN(parseInt(endNumber))) {
+          return
+        }
+        for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('action') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
+          }
+        }
+      }
+    },
+    changePlc(val) {
+      this.dataOpcPlcs.forEach(item => {
+        if (item.plc_id === val) {
+          this.plc_code = item.plc_code
+          this.sliceItem()
+          return
+        }
+      })
+    },
+    test_read1() {
+      testRead(this.data1, this.opc_id).then(data => {
+        this.data1 = data
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    test_write1() {
+      testwrite(this.data2, this.opc_id).then(data => {
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.configLoading = true
+          // 根据驱动类型判断是否为路由设备
+          const parentForm = this.parentForm
+          parentForm.is_route = true
+          parentForm.plc_id = this.plc_id
+          parentForm.opc_id = this.opc_id
+          updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
+            this.notify('保存成功', 'success')
+            this.configLoading = false
+          }).catch(err => {
+            this.configLoading = false
+            console.log(err.response.data.message)
+          })
+        }
+      })
+    },
+    sliceItem() { // 拼接DB的Item值
+      this.data1.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+      this.data2.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

acs/qd/src/views/acs/device/driver/standard_inspect_site_smart.vue

@@ -0,0 +1,489 @@
+<template>
+  <!--检测站点Smart200-->
+  <div>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">设备协议：</span>
+      </div>
+
+      <el-row>
+        <el-col :span="12">
+          OpcServer:
+          <el-select
+            v-model="opc_id"
+            placeholder="无"
+            clearable
+            @change="changeOpc"
+          >
+            <el-option
+              v-for="item in dataOpcservers"
+              :key="item.opc_id"
+              :label="item.opc_name"
+              :value="item.opc_id"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="12">
+          PLC:
+          <el-select
+            v-model="plc_id"
+            placeholder="无"
+            clearable
+            @change="changePlc"
+          >
+            <el-option
+              v-for="item in dataOpcPlcs"
+              :key="item.plc_id"
+              :label="item.plc_name"
+              :value="item.plc_id"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">输送系统：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="电气调度号" label-width="150px">
+              <el-input v-model="form.OPCServer" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">指令相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检验有货">
+              <el-switch v-model="form.inspect_in_stocck" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="忽视取货校验" label-width="150px">
+              <el-switch v-model="form.ignore_pickup_check" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="忽视放货校验" label-width="150px">
+              <el-switch v-model="form.ignore_release_check" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="呼叫">
+              <el-switch v-model="form.apply_task" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="响应" label-width="150px">
+              <el-switch v-model="form.manual_create_task" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否输入物料" label-width="150px">
+              <el-switch v-model="form.input_material" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="关联设备" prop="device_code">
+              <el-select
+                v-model="form.link_device_code"
+                filterable
+                multiple
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
+              <el-select
+                v-model="form.link_three_lamp"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.device_code"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-tooltip class="item" effect="dark" content="创建设备点位记录有无货信号" placement="bottom-end">
+            <el-form-item label="站点管理" label-width="150px">
+              <el-switch v-model="form.station_manager" />
+            </el-form-item>
+          </el-tooltip>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">AGV相关：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货">
+              <el-switch v-model="form.is_pickup" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="放货">
+              <el-switch v-model="form.is_release" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC读取字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data1"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data1[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishReadEdit(data1[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbr_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span">PLC写入字段：</span>
+      </div>
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
+        <el-table
+          v-loading="false"
+          :data="data2"
+          :max-height="550"
+          size="small"
+          style="width: 100%;margin-bottom: 15px"
+        >
+
+          <el-table-column prop="name" label="用途" />
+          <el-table-column prop="code" label="别名要求" />
+          <el-table-column prop="db" label="DB块">
+            <template slot-scope="scope">
+              <el-input
+                v-model="data2[scope.$index].db"
+                size="mini"
+                class="edit-input"
+                @input="finishWriteEdit(data2[scope.$index])"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="dbw_value">
+            <template slot="header">
+              <el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
+            </template>
+            <template slot-scope="scope">
+              <el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-card>
+
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span class="role-span" />
+        <el-button
+          :loading="false"
+          icon="el-icon-check"
+          size="mini"
+          style="float: right; padding: 6px 9px"
+          type="primary"
+          @click="doSubmit"
+        >保存
+        </el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  queryDriverConfig,
+  updateConfig,
+  testRead,
+  testwrite
+} from '@/api/acs/device/driverConfig'
+import { selectOpcList } from '@/api/acs/device/opc'
+import { selectPlcList } from '@/api/acs/device/opcPlc'
+import { selectListByOpcID } from '@/api/acs/device/opcPlc'
+
+import crud from '@/mixins/crud'
+import deviceCrud from '@/api/acs/device/device'
+
+export default {
+  name: 'StandardInspectSite',
+  mixins: [crud],
+  props: {
+    parentForm: {
+      type: Object,
+      require: true
+    }
+  },
+  data() {
+    return {
+      device_code: '',
+      device_id: '',
+      plc_id: '',
+      plc_code: '',
+      opc_id: '',
+      opc_code: '',
+      configLoading: false,
+      dataOpcservers: [],
+      dataOpcPlcs: [],
+      deviceList: [],
+      data1: [],
+      data2: [],
+      form: {
+        inspect_in_stocck: true,
+        ignore_pickup_check: true,
+        ignore_release_check: true,
+        apply_task: true,
+        link_three_lamp: '',
+        manual_create_task: true,
+        is_pickup: true,
+        is_release: true,
+        link_device_code: []
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      // 从父表单获取设备编码
+      this.device_id = this.$props.parentForm.device_id
+      this.device_code = this.$props.parentForm.device_code
+      queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
+        // 给表单赋值，并且属性不能为空
+        if (data.form) {
+          const arr = Object.keys(data.form)
+          // 不为空
+          if (arr.length > 0) {
+            this.form = data.form
+          }
+        }
+
+        // 给表单赋值，并且属性不能为空
+        if (data.parentForm) {
+          const arr = Object.keys(data.parentForm)
+          // 不为空
+          if (arr.length > 0) {
+            this.opc_code = data.parentForm.opc_code
+            this.plc_code = data.parentForm.plc_code
+          }
+        }
+        this.data1 = data.rs
+        this.data2 = data.ws
+        this.sliceItem()
+      })
+      selectPlcList().then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = this.$props.parentForm.opc_plc_id
+      })
+      selectOpcList().then(data => {
+        this.dataOpcservers = data
+        this.opc_id = this.$props.parentForm.opc_server_id
+      })
+      deviceCrud.selectDeviceList().then(data => {
+        this.deviceList = data
+      })
+    })
+  },
+  methods: {
+    finishReadEdit(data) {
+      debugger
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('mode') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.substring(0, 2)
+        // .之后的字符串
+        const afterStr = dbValue.substring(2)
+        for (const val in this.data1) {
+          if (this.data1[val].code.indexOf('move') !== -1) {
+            this.data1[val].db = beforeStr + (parseInt(afterStr) + 2)
+          }
+          if (this.data1[val].code.indexOf('action') !== -1) {
+            this.data1[val].db = beforeStr + (parseInt(afterStr) + 4)
+          }
+          if (this.data1[val].code.indexOf('error') !== -1) {
+            this.data1[val].db = beforeStr + (parseInt(afterStr) + 6)
+          }
+          if (this.data1[val].code.indexOf('number') !== -1) {
+            this.data1[val].db = beforeStr + (parseInt(afterStr) + 8)
+          }
+          if (this.data1[val].code.indexOf('container_type') !== -1) {
+            this.data1[val].db = beforeStr + (parseInt(afterStr) + 10)
+          }
+          if (this.data1[val].code.indexOf('task') !== -1) {
+            this.data1[val].db = beforeStr + (parseInt(afterStr) + 12)
+          }
+        }
+      }
+    },
+    finishWriteEdit(data) {
+      // 编辑的是code列,并且值包含mode
+      if (data.code.indexOf('to_command') !== -1) {
+        const dbValue = data.db
+        // .之前的字符串
+        const beforeStr = dbValue.substring(0, 2)
+        // .之后的字符串
+        const afterStr = dbValue.substring(2)
+        for (const val in this.data2) {
+          if (this.data2[val].code.indexOf('to_target') !== -1) {
+            this.data2[val].db = beforeStr + (parseInt(afterStr) + 2)
+          }
+          if (this.data2[val].code.indexOf('to_task') !== -1) {
+            this.data2[val].db = beforeStr + (parseInt(afterStr) + 4)
+          }
+        }
+      }
+    },
+    changeOpc(val) {
+      this.dataOpcservers.forEach(item => {
+        if (item.opc_id === val) {
+          this.opc_code = item.opc_code
+        }
+      })
+
+      selectListByOpcID(val).then(data => {
+        this.dataOpcPlcs = data
+        this.plc_id = ''
+        this.plc_code = ''
+        if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
+          this.plc_id = this.dataOpcPlcs[0].plc_id
+          this.plc_code = this.dataOpcPlcs[0].plc_code
+        }
+        this.sliceItem()
+      })
+    },
+    changePlc(val) {
+      this.dataOpcPlcs.forEach(item => {
+        if (item.plc_id === val) {
+          this.plc_code = item.plc_code
+          this.sliceItem()
+          return
+        }
+      })
+    },
+    test_read1() {
+      testRead(this.data1, this.opc_id).then(data => {
+        this.data1 = data
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    test_write1() {
+      testwrite(this.data2, this.opc_id).then(data => {
+        this.notify('操作成功!', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
+    doSubmit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.configLoading = true
+          // 根据驱动类型判断是否为路由设备
+          const parentForm = this.parentForm
+          parentForm.is_route = true
+          parentForm.plc_id = this.plc_id
+          parentForm.opc_id = this.opc_id
+          updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
+            this.notify('保存成功', 'success')
+            this.configLoading = false
+          }).catch(err => {
+            this.configLoading = false
+            console.log(err.response.data.message)
+          })
+        }
+      })
+    },
+    sliceItem() { // 拼接DB的Item值
+      this.data1.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+      this.data2.forEach(item => {
+        const str = item.code
+        // 是否包含.
+        if (str.search('.') !== -1) {
+          // 截取最后一位
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
+        } else {
+          item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java

@@ -15,9 +15,9 @@ import org.nl.wms.sch.tasks.SendMaterialTask;
 import org.nl.wms.st.inbill.service.dto.RegionioDto;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
-import org.nl.wql.core.engine.object.WO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 @Service
 @RequiredArgsConstructor
@@ -56,6 +56,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
         return resultJSON;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public JSONObject confirm(JSONObject param) {
         // 返回值
@@ -121,8 +122,8 @@ public class SendMaterialServiceImpl implements SendMaterialService {
             json.put("bill_status", "20");
             regionIOTable.update(json, "iostorinv_id = " + id);
         } catch (Exception e) {
-            // 报错删除搬运记录（任务已在createTask中删除）
+            // 手动回滚事务
-            regionIOTable.delete("iostorinv_id = " + id);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 
             resultJSON.put("code", "0");
             resultJSON.put("desc", e.getMessage());