四期

zhangc

2025-03-06 fbdad64fe45fa120beb4332e7a3615856d05ab96

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

@@ -579,16 +579,20 @@
                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
                }
            } else {
                List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
                if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
                if (station.endsWith("F4") && locType == 3) {
                    agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
                } else {
                    if (isCurrLev.get()) {
                    List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
                    if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
                        agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
                    } else {
                        agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
                        if (isCurrLev.get()) {
                            agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
                        } else {
                            agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
                        }
                        //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                    }
                    //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
                }
            }

@@ -737,7 +741,8 @@
//                    //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
//                }
//            }
            agvLocMast = agvCommonService.getLocByLocRule(3, 1, code);
            // 预留20个库位
            agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code,false);


            String devNo = agvBasDevp.getDevNo();
@@ -801,7 +806,11 @@
        }

        //寻找相应类型的空货架
        AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, agvBasDevp.getFloor());
        Integer floor = agvBasDevp.getFloor();
        if (floor == 4) {
            floor = 1;
        }
        AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
        if (containerType == 0) {
            //空板自动出库，根据站点类型选择
            agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());