#

Junjie

3 天以前 9c5dc8b744446ec2a1ec170b2834b8bb0241982d

#

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

@@ -256,6 +256,7 @@
        if (crnNo == 2 || crnNo == 3) {
            if (crnSearchList >= 2) {
                if (basCrnpService.checkSiteError(1, true)) {
                    boolean flag = true;
                    //尝试找1号弯轨堆垛机库位
                    crnNo = 1;
                    List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
@@ -264,7 +265,19 @@
                    );
                    if(wrkMasts.size() > crnSearchDetectTaskCount){
                        log.error(crnNo + "号堆垛机已达到入库控制上限！！！ 任务数量： {}， 控制数量：{}", wrkMasts.size(), crnSearchDetectTaskCount);
                    }else {
                        flag = false;
                    }

                    List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                            .eq("crn_no", crnNo)
                            .in("io_type", 1, 10, 53, 57, 101, 103, 107, 110)
                    );
                    if (wrkMastsList.size() > applyInTaskTotalCount) {
                        log.error(crnNo + "号堆垛机已达到申请入库时总任务数量上限(入库、出库)！！！ 任务数量： {}， 控制数量：{}", wrkMastsList.size(), applyInTaskTotalCount);
                        flag = false;
                    }

                    if (flag) {
                        List<Integer> nearRowList = new ArrayList<Integer>() {{
                            add(4);
                            add(6);
@@ -297,6 +310,26 @@
                //尝试找1号弯轨堆垛机库位
                crnNo = 1;
                if (basCrnpService.checkSiteError(crnNo, true)) {
                    boolean flag = true;
                    List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                            .eq("crn_no", crnNo)
                            .in("io_type", 1, 10, 53, 57)
                    );
                    if(wrkMasts.size() > crnSearchDetectTaskCount){
                        log.error(crnNo + "号堆垛机已达到入库控制上限！！！ 任务数量： {}， 控制数量：{}", wrkMasts.size(), crnSearchDetectTaskCount);
                        flag = false;
                    }

                    List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                            .eq("crn_no", crnNo)
                            .in("io_type", 1, 10, 53, 57, 101, 103, 107, 110)
                    );
                    if (wrkMastsList.size() > applyInTaskTotalCount) {
                        log.error(crnNo + "号堆垛机已达到申请入库时总任务数量上限(入库、出库)！！！ 任务数量： {}， 控制数量：{}", wrkMastsList.size(), applyInTaskTotalCount);
                        flag = false;
                    }

                    if (flag) {
                    List<Integer> nearRowList = new ArrayList<Integer>() {{
                        add(4);
                        add(6);
@@ -320,6 +353,7 @@
                        }
                    }
                }
                }

                if (nearRow == 0) {
                    throw new CoolException("无可用堆垛机");