Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

skyouc

4 天以前 4bf0426314e8eb19b632861603206c4c288647bf

 src/main/java/com/zy/asrs/entity/BasDualCrnp.java

@@ -138,9 +138,23 @@
    @TableField("max_out_task")
    private Integer maxOutTask;

    /**
     * 工位1禁止执行列
     */
    @ApiModelProperty(value= "工位1禁止执行列")
    @TableField("disable_station_one_bays")
    private String disableStationOneBays;

    /**
     * 工位2禁止执行列
     */
    @ApiModelProperty(value= "工位2禁止执行列")
    @TableField("disable_station_two_bays")
    private String disableStationTwoBays;

    public BasDualCrnp() {}

    public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask) {
    public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask,String disableStationOneBays,String disableStationTwoBays) {
        this.status = status;
        this.wrkNo = wrkNo;
        this.inEnable = inEnable;
@@ -241,4 +255,26 @@
        return rowList;
    }

    public List<Integer> getDisableStationOneBays$(){
        List<Integer> list = new ArrayList<>();
        if (Cools.isEmpty(this.disableStationOneBays)){
            return list;
        }

        List<Integer> jsonList = JSON.parseArray(this.disableStationOneBays, Integer.class);
        list.addAll(jsonList);
        return list;
    }

    public List<Integer> getDisableStationTwoBays$(){
        List<Integer> list = new ArrayList<>();
        if (Cools.isEmpty(this.disableStationTwoBays)){
            return list;
        }

        List<Integer> jsonList = JSON.parseArray(this.disableStationTwoBays, Integer.class);
        list.addAll(jsonList);
        return list;
    }

}