#

Junjie

2 天以前 89f87a7d39da1bdb4846e332d7d7370e2e908f5c

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

@@ -203,6 +203,9 @@
        }


        Config crnSearchDetectTaskCountConfig = configService.selectConfigByCode("crnSearchDetectTaskCount");
        int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());

        Config crnSearchListConfig = configService.selectConfigByCode("123CrnSearchList");
        int crnSearchList = Integer.parseInt(crnSearchListConfig.getValue());

@@ -212,6 +215,15 @@
            curRow = locNecessaryParameters[1];
            crnNo = locNecessaryParameters[2];
            if (basCrnpService.checkSiteError(crnNo, 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);
                    continue;
                }

                rowCount = locNecessaryParameters[0];
                nearRow = locNecessaryParameters[3];
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
@@ -235,26 +247,34 @@
                //尝试找1号弯轨堆垛机库位
                crnNo = 1;
                if (basCrnpService.checkSiteError(crnNo, true)) {
                    List<Integer> nearRowList = new ArrayList<Integer>() {{
                        add(4);
                        add(6);
                        add(3);
                        add(1);
                    }};
                    for (Integer near : nearRowList) {
                        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("row1", near)
                                .eq("loc_sts", "O")
                                .eq("whs_type", rowLastnoType.getType().longValue())
                                .eq("loc_type1", locTypeDto.getLocType1())
                                .eq("loc_type2", locTypeDto.getLocType2())
                        );
                        int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
                        if (locMasts.size() - crnCountO <= 2) {
                            log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                        } else {
                            nearRow = near;
                            break;
                    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);
                    }else {
                        List<Integer> nearRowList = new ArrayList<Integer>() {{
                            add(4);
                            add(6);
                            add(3);
                            add(1);
                        }};
                        for (Integer near : nearRowList) {
                            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("row1", near)
                                    .eq("loc_sts", "O")
                                    .eq("whs_type", rowLastnoType.getType().longValue())
                                    .eq("loc_type1", locTypeDto.getLocType1())
                                    .eq("loc_type2", locTypeDto.getLocType2())
                            );
                            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
                            if (locMasts.size() - crnCountO <= 2) {
                                log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                            } else {
                                nearRow = near;
                                break;
                            }
                        }
                    }
                }
@@ -293,9 +313,10 @@
                if (nearRow == 0) {
                    throw new CoolException("无可用堆垛机");
                }
            } else {
                throw new CoolException("无可用堆垛机");
            }
//            else {
//                throw new CoolException("无可用堆垛机");
//            }
        }

        boolean signRule1 = false;
@@ -443,40 +464,22 @@
        StaDesc staDesc = null;
        BasDevp staNo = null;


        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
            // 获取目标站
            wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", staDescId)
                    .eq("stn_no", sourceStaNo)
                    .eq("crn_no", crnNo);
            staDesc = staDescService.selectOne(wrapper);
            if (Cools.isEmpty(staDesc)) {
                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
//                throw new CoolException("入库路径不存在");
                crnNo = 0;
            } else {
                staNo = basDevpService.selectById(staDesc.getCrnStn());
                if (!staNo.getAutoing().equals("Y")) {
                    log.error("目标站" + staDesc.getCrnStn() + "不可用");
//                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
                    crnNo = 0;
                }
                startupDto.setStaNo(staNo.getDevNo());
            }

            // 更新库位排号
            if (Cools.isEmpty(locMast)) {
                rowLastno.setCurrentRow(curRow);
                rowLastnoService.updateById(rowLastno);
            }
        }

        // 开始查找库位 ==============================>>

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).ne("inv_wh",1)
                    .orderBy("lev1", true).orderBy("bay1", true));
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -552,7 +555,7 @@
//                locTypeDto.setLocType1((short)i);
//                return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
//            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{},{}", JSON.toJSONString(locTypeDto), times,moveCrnNo);
            throw new CoolException("没有空库位");
        }

@@ -567,18 +570,40 @@
        //针对1号堆垛机打的补丁，防止找到库位时，找到最浅库位
        String deepLoc2 = Utils.getDeepLoc2(slaveProperties, locMast.getLocNo());
        if (!Cools.isEmpty(deepLoc2)) {
            LocMast locMastNew = locMastService.selectOne(new EntityWrapper<LocMast>()
            LocMast locMastNew = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no",locMast.getCrnNo())
                    .eq("loc_no", deepLoc2).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
            if (!Cools.isEmpty(locMastNew)) {
                locMast = locMastNew;
            }
        }



            // 获取目标站
            wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", staDescId)
                    .eq("stn_no", sourceStaNo)
                    .eq("crn_no", locMast.getCrnNo());
            staDesc = staDescService.selectOne(wrapper);
            if (Cools.isEmpty(staDesc)) {
                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
//                throw new CoolException("入库路径不存在");
                crnNo = 0;
            } else {
                staNo = basDevpService.selectById(staDesc.getCrnStn());
                if (!staNo.getAutoing().equals("Y")) {
                    log.error("目标站" + staDesc.getCrnStn() + "不可用");
//                throw new CoolException("目标站"+staDesc.getCrnStn()+"不可用");
                    crnNo = 0;
                }
                startupDto.setStaNo(staNo.getDevNo());
        }
        String locNo = locMast.getLocNo();
        // 生成工作号
        int workNo = getWorkNo(0);
        // 返回dto
        startupDto.setWorkNo(workNo);
        startupDto.setCrnNo(crnNo);
        startupDto.setCrnNo(locMast.getCrnNo());
        startupDto.setSourceStaNo(sourceStaNo);
        startupDto.setLocNo(locNo);
        return startupDto;
@@ -960,6 +985,8 @@
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
                    .orderBy("lev1", true).orderBy("bay1", true));//最浅库位
            //System.out.println(nearRow);
            //System.out.println(curRow);
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;