1号堆垛机摆放逻辑先深后浅改为正常层列排递增

pang.jiabao

2 天以前 6fd823a0e3ef5727a8fa879d8df344d93f1a5717

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

@@ -194,7 +194,12 @@

//            if (wrkMastList.size() == 0) {
                // 取新库位组的第一个库位
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("crn_no", 4).eq("loc_sts", "O"));
            Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("crn_no", 4).eq("loc_sts", "O");
            String model = findLocNoAttributeVo.getModel(); // 当前桶类型
            if (model.equals("IBC")) { // 最上面一层只能放208L
                wrapper.ne("lev1", 11);
            }
            List<LocMast> locMasts = locMastService.selectList(wrapper);
                List<LocMast> collect = locMasts.stream().filter(locMast1 -> locMast1.getRow1() == 9 || locMast1.getRow1() == 11).collect(Collectors.toList());
                List<LocMast> collect1 = locMasts.stream().filter(locMast1 -> locMast1.getRow1() == 10 || locMast1.getRow1() == 12).collect(Collectors.toList()); // 第一个先放这两排
                if (collect.size() - wrkMastList.size() <= 0 && collect1.size()  - wrkMastList.size() <= 0) {
@@ -387,30 +392,35 @@
            for(BasCrnp basCrnp:basCrnpList) {
                Integer crnNo = basCrnp.getCrnNo();
                Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq("loc_sts", 'O')
                        .eq("crn_no", crnNo).orderBy("lev1").orderBy("bay1").orderBy("row1");
                        .eq("crn_no", crnNo);
                // 入库桶型是不是208L
                if (model == null || !model.equals("208L")) {
                    wrapper.ne("lev1", 11);
                }
                if (crnNo == 1) {
                    wrapper.in("row1", 1, 4);
//                if (crnNo == 1) {
//                    wrapper.in("row1", 1, 4);
//                }
                int count = locMastService.selectCount(wrapper);
                if (crnNo == 1 && count <= 4) {
                    continue;
                }
                wrapper.orderBy("lev1").orderBy("bay1").orderBy("row1");
                locMast = locMastService.selectOne(wrapper);
                if (locMast != null) {
                    break;
                }
                // 深库位没有了则获取一个浅库位
                if (crnNo == 1) {
                    locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
                    if (locMast != null) {
                        int count = locMastService.selectCount(wrapper);
                        if (count <= 10) {
                            locMast = null;
                        } else {
                            break;
                        }
                    }
                }
//                if (crnNo == 1) {
//                    locMast = locMastService.selectOne(wrapper.in("row1", 2, 3));
//                    if (locMast != null) {
//                        int count = locMastService.selectCount(wrapper);
//                        if (count <= 10) {
//                            locMast = null;
//                        } else {
//                            break;
//                        }
//                    }
//                }
            }

            if (locMast == null) {