添加工厂判断逻辑及优化库位查找

zhangc

2024-12-25 aa3476e8ff45d168f0bb9376ed3a114610a65f12

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

@@ -5,10 +5,12 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.LocUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
@@ -27,6 +29,15 @@
    private AgvLocRuleService agvLocRuleService;
    @Autowired
    private AgvLocMastService agvLocMastService;
    @Autowired
    private MatService matService;
    @Autowired
    private LocRuleService locRuleService;
    @Autowired
    AgvBasDevpService agvBasDevpService;

    @Autowired
    private LocUtils locUtils;

    public int getWorkNo(Integer wrkMk) {
        AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -39,24 +50,24 @@
        int sNo = wrkLastno.getSNo();
        int eNo = wrkLastno.getENo();

        workNo = workNo>=eNo ? sNo : workNo+1;
        workNo = workNo >= eNo ? sNo : workNo + 1;

        while (true) {
            AgvWrkMast wrkMast = agvWrkMastService.selectById(workNo);
            if (null != wrkMast) {
                workNo = workNo>=eNo ? sNo : workNo+1;
                workNo = workNo >= eNo ? sNo : workNo + 1;
            } else {
                break;
            }
        }
        if (workNo > 0){
        if (workNo > 0) {
            wrkLastno.setWrkNo(workNo);
            agvWrkLastnoService.updateById(wrkLastno);
        }
        if (workNo == 0) {
            throw new CoolException("生成工作号失败，请联系管理员");
        } else {
            if (agvWrkMastService.selectById(workNo)!=null) {
            if (agvWrkMastService.selectById(workNo) != null) {
                throw new CoolException("生成工作号" + workNo + "在工作档中已存在");
            }
        }
@@ -67,39 +78,67 @@
     * 检索库位号
     * @return locNo 检索到的库位号
     */
    public AgvLocMast getLocNo(List<AgvWaitPakin> agvWaitPakinList, int floor) {
    public AgvLocMast getLocNo(int type, int floor, boolean isEmpty, boolean isCurrLev, String factory) {
        // 目标库位
        AgvLocMast locMast = null;
//        if(Cools.isEmpty(agvWaitPakinList)){
//            return getLocNoRule(type); // 1. 随机库位
//        }

        //库位规则
        locMast = getLocByLocRule(agvWaitPakinList.get(0),floor);
        if(!Cools.isEmpty(locMast)){
            return locMast;
        }

        // 靠近摆放规则 --- 相同订单号, 同天同规格物料
        locMast = getLocByProximityRule();
        if (locMast != null) {
            //找到库位，返回dto
            //return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
        }
//
//        // 靠近摆放规则 --- 空托
//        locMast = getLocNoStep4(staDescId, locTypeDto);
//        if (locMast != null) {
//            //找到库位，返回dto
//            return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
//        //库位规则
//        locMast = getLocByLocRule(agvWaitPakinList.get(0),floor); // 2. 按库位规则搜索
//        if(!Cools.isEmpty(locMast)){
//            return locMast;
//        }
//
//        // 如果没有相近物料，则按规则轮询货架
        // 开始查找库位 ==============================>>
        locMast = getLocNoRule(floor);
        if (locMast != null) {
            return locMast;
//
//        //库位编码规则
//        locMast = getLocByLocCodeRule(agvWaitPakinList.get(0),floor);
//        if(!Cools.isEmpty(locMast)){
//            return locMast;
//        }
//
//        // 靠近摆放规则 --- 相同订单号, 同天同规格物料
//        locMast = getLocByProximityRule();
//        if (locMast != null) {
//            //找到库位，返回dto
//            //return getLocNoStep6(staDescId, sourceStaNo, locMast);//返回dto
//        }
//
//        //根据物料频率搜索库位，频率高则搜索离缓存货架最近库位，频率低则搜索最远库位
//        Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
//        if(Cools.isEmpty(mat.getBeBatch())){
//            mat.setBeBatch(0);
//        }
//        locMast = getLocByFre(mat.getBeBatch(), floor);
//        if (locMast != null) {
//            return locMast;
//        }


        try {
            // 开始查找库位 ==============================>>
            // 四期项目：需要改查找库位逻辑
            // 箱壳入库
            if (type == 3) {
                //优先入库吸塑1楼，在2楼
                locMast = locUtils.getLocNoRuleByFactory(type, factory);
            } else if (type == 6) {
                //半成品箱壳入库，入到吸塑2楼的370个库位里
                locMast = locUtils.getLocNoRuleByFloor(type, floor, 2);
            } else {
                //不动这个逻辑
                locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
            }
            if (locMast != null) {
                return locMast;
            }
        } catch (Exception e) {
            throw new CoolException(floor + "楼；该楼层没有空库位===>" + e.getMessage());
        }

        //找不到库位，抛出异常
        throw new CoolException("该楼层没有空库位");
        throw new CoolException(floor + "楼；该楼层没有空库位");
    }

    /*
@@ -111,16 +150,47 @@
                .eq("matnr", agvWaitPakin.getMatnr())
                .eq("batch", agvWaitPakin.getModel())
                .eq("floor", floor));
        if(Cools.isEmpty(agvLocRules)){
        if (Cools.isEmpty(agvLocRules)) {
            agvLocRules = agvLocRuleService.selectList(new EntityWrapper<AgvLocRule>()
                    .eq("matnr", agvWaitPakin.getMatnr())
                    .eq("floor", floor));
        }
        if(Cools.isEmpty(agvLocRules)){
        if (Cools.isEmpty(agvLocRules)) {
            return null;
        }

        for (AgvLocRule agvLocRule : agvLocRules) {
            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;
            }
        }

        return null;
    }

    /*
    库位规则查找
     */
    private AgvLocMast getLocByLocCodeRule(AgvWaitPakin agvWaitPakin, int floor) {
        /*if(Cools.isEmpty(agvWaitPakin.getBrand())){
            return null;
        }

        //库区
        String other = "agv-" + floor;
        List<LocRule> locRules = locRuleService.findCode(agvWaitPakin.getMatnr(), other);
        if(Cools.isEmpty(locRules)){
            return null;
        }

        for (LocRule agvLocRule : locRules) {
            EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
            wrapper.between("row1",agvLocRule.getRowBeg(),agvLocRule.getRowEnd())
                    .between("bay1",agvLocRule.getBayBeg(),agvLocRule.getBayEnd())
@@ -131,7 +201,7 @@
            if(!Cools.isEmpty(agvLocMast)){
                return agvLocMast;
            }
        }
        }*/

        return null;
    }
@@ -139,19 +209,183 @@
    /*
    靠近摆放规则
     */

    private AgvLocMast getLocByProximityRule(){
    private AgvLocMast getLocByProximityRule() {
        //to do
        return null;
    }

    //随机取一个货位
    private AgvLocMast getLocNoRule(int floor){
        return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
                .eq("floor",floor)
                .eq("loc_sts","O")
                .eq(false,"loc_type2",1));
    /*
    根据物料频率查找
     */
    private AgvLocMast getLocByFre(int fre, int floor) {
        if (floor == 1) {
            if (fre == 1) {
                return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
                        .eq("floor", floor)
                        .eq("loc_sts", "O")
                        .orderBy("bay1", false));
            } else {
                return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
                        .eq("floor", floor)
                        .eq("loc_sts", "O")
                        .orderBy("bay1"));
            }
        }
        if (floor == 3) {
            if (fre == 1) {
                return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
                        .eq("floor", floor)
                        .eq("loc_sts", "O")
                        .orderBy("row1", false));
            } else {
                return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
                        .eq("floor", floor)
                        .eq("loc_sts", "O")
                        .orderBy("row1"));
            }
        }

        throw new CoolException("搜索库位时，楼层出错。");
    }


    //随机取一个货位
    private AgvLocMast getLocNoRule(int type, int floor, boolean isEmpty, boolean isCurrLev) {
        Boolean orderBy = false;
        int levCount = 0;
        int times = 1;
        if (floor == 1 || floor >= 4) {
            if (floor >= 4) {
                floor = 1;
            }
            orderBy = true;
            levCount = 2;
        } else {
            orderBy = false;
            levCount = 1;
        }
        try {
            EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
            wrapper.eq("loc_sts", "O").eq("loc_type1", type);
            List<AgvLocMast> agvLocMasts = new ArrayList<>();
            //不是空板优先找2层
            if (isEmpty) {
                wrapper.eq("floor", floor).eq("lev1", 1);
            } else {
                if (isCurrLev) {
                    wrapper.eq("floor", floor).eq("lev1", 1);
                } else {
                    wrapper.eq("floor", floor).orderBy("lev1", !orderBy);
                }
            }


            //当目标库位是1楼
            if (floor == 1) {
                wrapper.orderBy("loc_no", false);
            }
            agvLocMasts = agvLocMastService.selectList(wrapper);
            //是否当前层
            if (Cools.isEmpty(agvLocMasts) && !isCurrLev) {
                if (times < levCount) {
                    times++;
                    return getLocNoRule(type, floor, isEmpty, isCurrLev);
                }
            }
            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("搜索库位时，未找到可入库库位。");
        }
    }

    /**
     * 检索库位号
     * @return locNo 检索到的库位号
     */
    public AgvBasDevp getDevpNo(int type, int floor) {
        // 目标库位
        AgvBasDevp basDevp = null;

        // 开始查找库位 ==============================>>
        basDevp = getDevpNoRule(type, floor);
        if (basDevp != null) {
            return basDevp;
        }

        //找不到库位，抛出异常
        throw new CoolException("楼层号：" + floor + "；该楼层没有空接驳位");
    }


    /**
     * 检索库位号
     * @return locNo 检索自动接驳位
     */
    public AgvBasDevp getDevpNo(int type, int floor, String auto) {
        // 目标库位
        AgvBasDevp basDevp = null;

        // 开始查找库位 ==============================>>
        basDevp = getDevpNoAuto(type, floor, auto);
        if (basDevp != null) {
            return basDevp;
        }

        //找不到库位，抛出异常
        throw new CoolException("楼层号：" + floor + "；该楼层没有空接驳位");
    }

    /**
     * 检索库位号
     * @return locNo 检索可入接驳位
     */
    public AgvBasDevp getDevpNo(int type, int floor, String auto, String inEable) {
        // 目标库位
        AgvBasDevp basDevp = null;

        // 开始查找库位 ==============================>>
        basDevp = getDevpNoInEable(type, floor, inEable);
        if (basDevp != null) {
            return basDevp;
        }

        //找不到库位，抛出异常
        return basDevp;
    }

    //随机取一个货位
    private AgvBasDevp getDevpNoRule(int type, int floor) {
        return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
                .eq("loc_sts", "O")
                .eq("floor", floor)
                .eq("loc_type1", type)
                .like("dev_no", "DB"));
    }

    //随机取一个货位
    private AgvBasDevp getDevpNoAuto(int type, int floor, String auto) {
        return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
                .eq("loc_sts", "O")
                .eq("floor", floor)
                .eq("loc_type1", type)
                .eq("autoing", auto)
                .like("dev_no", "DB"));
    }

    //随机取一个货位
    private AgvBasDevp getDevpNoInEable(int type, int floor, String inEable) {
        return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
                .eq("loc_sts", "O")
                .eq("floor", floor)
                .eq("loc_type1", type)
                .eq("in_enable", inEable)
                .like("dev_no", "DB"));
    }

}