兼容四期

zhangc

2025-02-11 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d

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

@@ -128,7 +128,11 @@
//                locMast = locUtils.getLocNoRuleByFloor(type, floor, isEmpty, 2);
//            } else {
//                //不动这个逻辑
            locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
            if (type == 6) {
                locMast = locUtils.getLocNoRuleByFloor(type, floor);
            } else {
                locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
            }
//            }
            if (locMast != null) {
                return locMast;
@@ -152,15 +156,15 @@
            List<AgvLocMast> agvLocMasts = new ArrayList<>();
            //不是空板优先找2层
            if (Cools.isEmpty(factory)) {
                wrapper.eq("floor", floor).orderBy("lev1", false);
                wrapper.eq("floor", floor).orderBy("lev1", true);
            } else {
                //B是二厂，G是三厂
                switch (factory) {
                    case "B":
                        wrapper.eq("floor", floor).orderBy("lev1", true);
                        wrapper.eq("floor", floor).orderBy("lev1", false);
                        break;
                    case "G":
                        wrapper.eq("floor", floor).orderBy("lev1", false);
                        wrapper.eq("floor", floor).orderBy("lev1", true);
                        break;
                    default:
                        wrapper.eq("floor", floor).orderBy("lev1", true);