自动化立体仓库 - WMS系统
pang.jiabao
9 天以前 5144715ea4f275375c439cc3fe59253202425198
1号堆垛机摆放逻辑先深后浅改为正常层列排递增
1个文件已修改
30 ■■■■■ 已修改文件
src/main/java/com/zy/common/service/CommonService.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/service/CommonService.java
@@ -397,25 +397,29 @@
                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;
                }
                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) {