1

zhang

15 小时以前 3a49654f51096d4f9f95f4a5e8198e168e38a0c5

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java

@@ -61,6 +61,16 @@
     */
    @ApiModelProperty(value= "优先级")
    private Integer priority;
    /**
     * 取还是放，1取，2放
     */
    @ApiModelProperty(value= "取还是放，1取，2放")
    private Integer askType;
    /**
     * 是否询问站点
     */
    @ApiModelProperty(value= "是否询问站点")
    private String askSta;

    /**
     * 名称
@@ -201,6 +211,24 @@
        this.ioTime = ioTime;
    }

    public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime,Integer askType,String askSta) {
        this.uuid = uuid;
        this.busId = busId;
        this.taskId = taskId;
        this.seqNum = seqNum;
        this.priority = priority;
        this.name = name;
        this.val = val;
        this.code = code;
        this.params = params;
        this.actionType = actionType;
        this.actionSts = actionSts;
        this.agvId = agvId;
        this.ioTime = ioTime;
        this.askType = askType;
        this.askSta = askSta;
    }

    public String getBusId$(){
        BusService service = SpringUtils.getBean(BusService.class);
        Bus bus = service.getById(this.busId);