#

LSH

2023-02-13 202ad2684cbaeaafd22df631caf92a22db3d7179

#

 src/main/java/com/zy/common/service/CommonService.java

@@ -127,12 +127,14 @@
        // 目标库位
        LocMast locMast = null;

        crnNo=2;
        if (curRow == 3) {
            curRow = 4;
        } else if (curRow == 4) {
            curRow = 3;
        } else {
            rowCount = 0;
            crnNo=1;
        }

        if (crnNo == 0) {

 src/main/java/com/zy/common/web/WcsController.java

@@ -72,7 +72,9 @@
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            if (countLoc > 0 || countWrk > 0 || countWait > 0) {
                return R.error(CodeRes.EXIST_500);
                if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
                    return R.error(CodeRes.EXIST_500);
                }
            }
        }
        if (Cools.isEmpty(param.getLocType1())){

 src/main/resources/mapper/LocMastMapper.xml

@@ -47,7 +47,7 @@
        where row1=#{row}
        and loc_sts='O'
        <if test="locType1 != null">
            and loc_type1 = #{locType1}
            and loc_type1 != 1
        </if>
        order by lev1 asc,bay1 asc
    </select>