优化库位检索逻辑，移除冗余参数

zhangc

2025-01-14 9f0fe04350c019c2ed1655d5b833648788734994

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

@@ -78,7 +78,7 @@
     * 检索库位号
     * @return locNo 检索到的库位号
     */
    public AgvLocMast getLocNo(int type, int floor, boolean isEmpty, boolean isCurrLev, String factory) {
    public AgvLocMast getLocNo(int type, int floor, boolean isEmpty, boolean isCurrLev) {
        // 目标库位
        AgvLocMast locMast = null;
//        if(Cools.isEmpty(agvWaitPakinList)){
@@ -120,16 +120,16 @@
            // 开始查找库位 ==============================>>
            // 四期项目：需要改查找库位逻辑
            // 箱壳入库
            if (type == 3 && factory != null) {
                //优先入库吸塑1楼，在2楼
                locMast = locUtils.getLocNoRuleByFactory(type, isEmpty, factory);
            } else if (type == 6) {
                //半成品箱壳入库，入到吸塑2楼的370个库位里
                locMast = locUtils.getLocNoRuleByFloor(type, floor, isEmpty, 2);
            } else {
                //不动这个逻辑
                locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
            }
//            if (type == 3 && factory != null) {
//                //优先入库吸塑1楼，在2楼
//                locMast = locUtils.getLocNoRuleByFactory(type, isEmpty, factory);
//            } else if (type == 6) {
//                //半成品箱壳入库，入到吸塑2楼的370个库位里
//                locMast = locUtils.getLocNoRuleByFloor(type, floor, isEmpty, 2);
//            } else {
//                //不动这个逻辑
            locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
//            }
            if (locMast != null) {
                return locMast;
            }
@@ -144,35 +144,45 @@
    /*
    库位规则查找
     */
    private AgvLocMast getLocByLocRule(AgvWaitPakin agvWaitPakin, int floor) {
        List<AgvLocRule> agvLocRules = null;
        agvLocRules = agvLocRuleService.selectList(new EntityWrapper<AgvLocRule>()
                .eq("matnr", agvWaitPakin.getMatnr())
                .eq("batch", agvWaitPakin.getModel())
                .eq("floor", floor));
        if (Cools.isEmpty(agvLocRules)) {
            agvLocRules = agvLocRuleService.selectList(new EntityWrapper<AgvLocRule>()
                    .eq("matnr", agvWaitPakin.getMatnr())
                    .eq("floor", floor));
        }
        if (Cools.isEmpty(agvLocRules)) {
            return null;
        }
    public AgvLocMast getLocByLocRule(int type, int floor, String factory) {

        for (AgvLocRule agvLocRule : agvLocRules) {
        try {
            EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
            wrapper.between("row1", agvLocRule.getRowBeg(), agvLocRule.getRowEnd())
                    .between("bay1", agvLocRule.getBayBeg(), agvLocRule.getBayEnd())
                    .between("lev1", agvLocRule.getLevBeg(), agvLocRule.getLevEnd())
                    .eq("floor", floor)
                    .eq("loc_sts", "O");
            AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
            if (!Cools.isEmpty(agvLocMast)) {
                return agvLocMast;
            wrapper.eq("loc_sts", "O").eq("loc_type1", type);
            List<AgvLocMast> agvLocMasts = new ArrayList<>();
            //不是空板优先找2层
            if (Cools.isEmpty(factory)) {
                wrapper.eq("floor", floor).orderBy("lev1", false);
            } else {
                //B是二厂，G是三厂
                switch (factory) {
                    case "B":
                        wrapper.eq("floor", floor).orderBy("lev1", true);
                        break;
                    case "G":
                        wrapper.eq("floor", floor).orderBy("lev1", false);
                        break;
                    default:
                        wrapper.eq("floor", floor).orderBy("lev1", true);
                        break;
                }
            }
        }

        return null;
            //当目标库位是1楼
            if (floor == 1) {
                wrapper.orderBy("loc_no", false);
            }
            agvLocMasts = agvLocMastService.selectList(wrapper);
            for (AgvLocMast agvLocMast : agvLocMasts) {
                AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
                if (agvLocMast1.getLocSts().equals("O")) {
                    return agvLocMast1;
                }
            }
            throw new CoolException("搜索库位时，未找到可入库库位。");
        } catch (Exception e) {
            throw new CoolException("搜索库位时，未找到可入库库位。");
        }
    }

    /*