#

TQS

2023-07-05 5b6c1e9a11639e44a5a830da989ec6ff46bf7000

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -4401,7 +4401,7 @@

            if (null == loc) {
                News.error("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
                return;
//                return;
//                throw new CoolException("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
            }


 src/main/java/com/zy/asrs/utils/Utils.java

@@ -648,20 +648,20 @@
                return false;
            }
        }
        if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
            if (locMast.getLocSts().equals("X")){
                row = selectInSide2(row);
                if (row==0){
                    return true;
                }
                LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
                if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
                    return true;
                }
            } else {
                return true;
            }
        }
//        if (!locMast.getLocSts().equals("F") && !locMast.getLocSts().equals("D") ){
//            if (locMast.getLocSts().equals("X")){
//                row = selectInSide2(row);
//                if (row==0){
//                    return true;
//                }
//                LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", row).eq("bay1", Utils.getBay(locNo)).eq("lev1", Utils.getLev(locNo)));
//                if (!locMast1.getLocSts().equals("F") && !locMast1.getLocSts().equals("D") ){
//                    return true;
//                }
//            } else {
//                return true;
//            }
//        }

        return false;
    }