#1

dubin

2025-12-17 96c5a749f14c3dea75ff774e5eed2921ba0f2555

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

@@ -214,14 +214,14 @@
            //相近物料匹配失败，搜索可用空库位组

            //获取设备楼层
            List<Integer> levList = basCrnpService.getLevList();
            Collections.shuffle(levList);
//            List<Integer> levList = basCrnpService.getLevList();
//            Collections.shuffle(levList);

            List<Integer> locLevList = locMastService.getLevList();
            levList.addAll(locLevList);
//            levList.addAll(locLevList);

            for (Integer lev : levList) {
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true));
            for (Integer lev : locLevList) {
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
                for (LocMast locMast : locMasts) {
                    String locNo = locMast.getLocNo();
                    //获取通道组
@@ -265,7 +265,80 @@

    //搜索空托盘库位
    public LocMast searchEmptyPallet(LocTypeDto locTypeDto){
        return new LocMast();
        LocMast targetLocMast = null;
        List<LocMast> locMastsD = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
        for (LocMast locMast : locMastsD) {
            String locNo = locMast.getLocNo();
            //获取通道组
            List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
            for (Integer row : locGroupDesc) {
                String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                LocMast deepLoc = locMastService.selectById(deepLocNo);
                if (deepLoc == null){
                    continue;
                }

                if (deepLoc.getLocSts().equals("F")){
                    continue;
                }else if (deepLoc.getLocSts().equals("O")){
                    targetLocMast = deepLoc;
                    break;
                }else {
                    break;
                }
            }
        }

        if (targetLocMast == null){
            //获取设备楼层
//            List<Integer> levList = basCrnpService.getLevList();
//            Collections.shuffle(levList);

            List<Integer> locLevList = locMastService.getLevList();
//            levList.addAll(locLevList);

            for (Integer lev : locLevList) {
                //相近物料匹配失败，搜索可用空库位组
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
                for (LocMast locMast : locMasts) {
                    String locNo = locMast.getLocNo();
                    //获取通道组
                    List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);

                    boolean flag = true;
                    for (Integer row : locGroupDesc) {
                        String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        if (deepLoc == null){
                            continue;
                        }

                        if (!deepLoc.getLocSts().equals("O")){
                            flag = false;
                            break;
                        }
                    }

                    if (flag){
                        for (Integer row : locGroupDesc) {
                            String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                            LocMast deepLoc = locMastService.selectById(deepLocNo);
                            if (deepLoc == null){
                                continue;
                            }

                            targetLocMast = deepLoc;
                            break;
                        }
                        break;
                    }
                }
                if (targetLocMast != null){
                    break;
                }
            }
        }
        return targetLocMast;
    }

    /**