*

L

4 天以前 083659a2e1a8eb245b086d7046ee7d8e61f07a8f

*

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

@@ -56,6 +56,20 @@
    private Integer rgvSts;

    /**
     * 作业态
     */
    @ApiModelProperty(value= "作业态")
    @TableField("rgv_sts1")
    private Integer rgvSts1;

    /**
     * 作业态
     */
    @ApiModelProperty(value= "作业态")
    @TableField("rgv_sts2")
    private Integer rgvSts2;

    /**
     * 任务号
     */
    @ApiModelProperty(value= "任务号")

 src/main/java/com/zy/asrs/task/WrkMastRgvTwoScheduler.java

@@ -56,7 +56,9 @@
        }

        BasRgv basRgv2 = basRgvService.selectById(2);
        if (Cools.isEmpty(basRgv2) || basRgv2.getRgvSts()!=3 || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0){
        if (Cools.isEmpty(basRgv2) || basRgv2.getRgvSts()!=3
                || basRgv2.getRgvSts1()!=0  || basRgv2.getRgvSts2()!=0
                || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0 || basRgv2.getLoaded2()>1){
            return;
        }
        if (Cools.isEmpty(basRgv2.getNowStaNo())){
@@ -103,7 +105,9 @@
            return;
        }
        BasRgv basRgv2 = basRgvService.selectById(2);
        if (basRgv2==null || basRgv2.getRgvSts()!=3 || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0){
        if (basRgv2==null || basRgv2.getRgvSts()!=3
                || basRgv2.getRgvSts1()!=0  || basRgv2.getRgvSts2()!=0
                || basRgv2.getWrkNo1()!=0 || basRgv2.getWrkNo2()!=0){
            rgvTwoSign.setRgvOneSign(0);
            rgvOneSignService.updateById(rgvTwoSign);
            return;

 src/main/resources/mapper/BasRgvMapper.xml

@@ -8,6 +8,8 @@
        <result column="in_enable" property="inEnable" />
        <result column="out_enable" property="outEnable" />
        <result column="rgv_sts" property="rgvSts" />
        <result column="rgv_sts1" property="rgvSts1" />
        <result column="rgv_sts2" property="rgvSts2" />
        <result column="wrk_no1" property="wrkNo1" />
        <result column="wrk_no2" property="wrkNo2" />
        <result column="rgv_err" property="rgvErr" />