Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

zjj

2024-11-13 340b69790a7a2eff1ff5de75f109dc77f4b4008f

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

@@ -149,18 +149,19 @@
                LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_no", shallowLoc));
                if (!Cools.isEmpty(locMast2)) {
                    if (locMast2.getLocSts().equals("F")){
                        tmp = locMast2;
                    if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")){
                        tmp = mast;
                    }
                }
            }else {
                if (!Cools.isEmpty(mast)) {
                    tmp = mast;

                    if (mast.getLocSts().equals("O")){
                        tmp = mast;
                    }
                }
            }
            //预留空库位
            if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
            if (tmp != null) {
                locMast = tmp;
                break;
            }