Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 3c032079b667013abf1c19c4fe71ec6bef63466e

Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

# Conflicts:
#	src/main/java/com/zy/asrs/controller/MatCodeController.java
#	src/main/java/com/zy/asrs/utils/VersionUtils.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
#	src/main/resources/application.yml

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -56,8 +56,6 @@
        return R.ok();
    }



    /**
     * 添加入库单
     */

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

@@ -60,6 +60,12 @@
    private Integer wrkNo;

    /**
     * 回原点
     */
    @ApiModelProperty(value= "回原点")
    private Integer origin;

    /**
     * 异常码
     */
    @ApiModelProperty(value= "异常码")
@@ -247,6 +253,14 @@
        this.wrkNo = wrkNo;
    }

    public Integer getOrigin() {
        return origin;
    }

    public void setOrigin(Integer origin) {
        this.origin = origin;
    }

    public Long getCrnErr() {
        return crnErr;
    }

 src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java

@@ -56,11 +56,11 @@
                );
                if (wrkMasts.size() > 0) continue;

//                //暂停移库
//                BasCrnp crnp = basCrnpService.selectById(crnNo);
//                if(!Cools.isEmpty(crnp) && crnp.getOrigin()!=0){
//                    continue;
//                }
                //暂停移库
                BasCrnp crnp = basCrnpService.selectById(crnNo);
                if(!Cools.isEmpty(crnp) && crnp.getTankQty()==0){
                    continue;
                }

                List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
                if (null == locMasts) continue;

 src/main/resources/mapper/BasCrnpMapper.xml

@@ -25,7 +25,7 @@
        <result column="emp_in" property="empIn" />
        <result column="tank_qty" property="tankQty" />
        <result column="tank_qty1" property="tankQty1" />

        <result column="origin" property="origin" />
    </resultMap>

</mapper>