#

zwl

昨天 8ce4dcbd701b40165b0dbf365f667932cf2a8916

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

@@ -243,7 +243,7 @@
                        .eq("loc_sts", "O")
                        .eq("frozen", 0)
                        .eq("deleted", 0)
                        .eq("whs_type", rowLastnoType.getType().longValue()));
                        .eq("loc_type1",locTypeDto.getLocType1()));
                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);
@@ -285,7 +285,7 @@
                        .eq("row1", nearRow)
                        .eq("frozen", 0).eq("deleted", 0)
                        .eq("loc_sts", "O")
                        .eq("whs_type", rowLastnoType.getType().longValue()));
                        .eq("loc_type1", locTypeDto.getLocType1()));
                for (LocMast locMast1 : locMasts) {
                    //获取巷道
//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
@@ -343,7 +343,7 @@
        if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "D").eq("frozen", 0).eq("deleted", 0)
                    .ge("row1", sRow).le("row1", eRow).eq("whs_type", rowLastnoType.getType().longValue()));
                    .ge("row1", sRow).le("row1", eRow).eq("loc_type1", locTypeDto.getLocType1()));
            if (!locMasts.isEmpty()) {
                for (LocMast loc : locMasts) {
                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -377,7 +377,7 @@
                    .eq("crn_no", crnNo);
            staDesc = staDescService.selectOne(wrapper);
            if (Cools.isEmpty(staDesc)) {
                log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
                log.error("入库入径不存在，type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
//                throw new CoolException("入库路径不存在");
                crnNo = 0;
            } else {
@@ -404,8 +404,41 @@
            if (!locMasts.isEmpty()) {
                for (LocMast locMast1 : locMasts) {
                    if (basCrnpService.checkSiteError(crnNo, true)) {
                        locMast = locMast1;
                        break;
                        //判断是否为浅库位，浅库位判断深库位是否有货，无货的优先放到深库位中
                        Integer row1 = locMast1.getRow1();
                        Boolean boo=false;
                        if(locMast1.getRow1()==2){
                            row1 = 1;
                            boo=true;
                        }else if(locMast1.getRow1()==3){
                            row1 = 4;
                            boo=true;
                        }
                        if(boo){
                            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                    .eq("row1", row1)
                                    .eq("bay1", locMast1.getBay1())
                                    .eq("lev1", locMast1.getLev1())
                                    .eq("loc_sts", "O"));
                            if(!Cools.isEmpty(locMast2)) {
                                locMast =  locMast2;
                                break;
                            }else {
                                LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                        .eq("row1", row1)
                                        .eq("bay1", locMast1.getBay1())
                                        .eq("lev1", locMast1.getLev1())
                                        .eq("loc_sts", "F"));
                                if(!Cools.isEmpty(locMast3)) {
                                    locMast = locMast1;
                                    break;
                                }
                            }
                        }else {
                            locMast = locMast1;
                            break;
                        }

                    }
                }