#1

dubin

2026-01-06 8416a2ccfedeb54b4244a38b8a53c1c5a5eec6a9

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

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

            //获取设备楼层
            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)
                        .eq("loc_type1",locTypeDto.getLocType1())
                        .eq("loc_type2",locTypeDto.getLocType2())
                        .orderBy("bay1", true)
                        .orderBy("row1",true));
                for (LocMast locMast : locMasts) {
                    String locNo = locMast.getLocNo();
                    //获取通道组
@@ -291,15 +297,15 @@

        if (targetLocMast == null){
            //获取设备楼层
            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) {
            for (Integer lev : locLevList) {
                //相近物料匹配失败，搜索可用空库位组
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true));
                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();
                    //获取通道组