修复库位类型字段错误并优化工作档状态检查逻辑

zhangc

2024-12-06 03b0ea7369dcba72b560ec80f941f9d29ff7b9a5

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

@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
@@ -73,7 +74,7 @@
     * 检索库位号
     * @return locNo 检索到的库位号
     */
    public AgvLocMast getLocNo(int type, int floor) {
    public AgvLocMast getLocNo(int type, int floor,boolean isEmpty,boolean isCurrLev) {
        // 目标库位
        AgvLocMast locMast = null;
//        if(Cools.isEmpty(agvWaitPakinList)){
@@ -113,16 +114,16 @@

        try{
            // 开始查找库位 ==============================>>
            locMast = getLocNoRule(type,floor);
            locMast = getLocNoRule(type,floor,isEmpty,isCurrLev);
            if (locMast != null) {
                return locMast;
            }
        }catch (Exception e){
            throw new CoolException("楼层号："+floor+"；该楼层没有空库位===>"+e.getMessage());
            throw new CoolException(floor+"楼；该楼层没有空库位===>"+e.getMessage());
        }

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

    /*
@@ -233,12 +234,48 @@
    }

    //随机取一个货位
    private AgvLocMast getLocNoRule(int type,int floor){
    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{
            List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
                    .eq("loc_sts", "O")
                    .eq("floor", floor)
                    .eq("loc_type1", type));
            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")){