#

gt-fuwuqi

2024-11-05 bbdf70526760e6c4378486b89764493b52e9afd2

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

@@ -369,10 +369,19 @@

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                    .orderBy("lev1",true).orderBy("bay1",true));
            List<LocMast> locMasts = null;
            if (Utils.isNorth(sourceStaNo)){
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow)
                        .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                        .orderBy("lev1",true).orderBy("bay1",false));
            }else {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow)
                        .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                        .orderBy("lev1",true).orderBy("bay1",true));
            }

            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;
@@ -781,6 +790,9 @@
                        continue;
                    }
                    for (LocMast locMastGro1 : locMasts1) {
                        if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
                            break;
                        }
                        if (locMastGro1.getLocSts().equals("O")){
                            locMast = locMastGro1;
                            break;