#

ytfl

6 天以前 3a8e39870ef23d173e1843d6f2c9f53b3772d204

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

@@ -149,7 +149,7 @@
            }

        } catch (Exception e) {
            log.error("站点={} 未查询到对应的规则", sourceStaNo);
            log.error("站点={} 未查询到对应的规则，{}", sourceStaNo,e.getMessage());
        }
        return null;
    }
@@ -240,7 +240,7 @@
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
                int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
                if (locMasts.size() - crnCountO <= 2) {
                if (locMasts.size() - crnCountO <= 15) {
                    log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                    nearRow = 0;
                    times++;
@@ -293,7 +293,7 @@
                                    .eq("loc_type2", locTypeDto.getLocType2())
                            );
                            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
                            if (locMasts.size() - crnCountO <= 2) {
                            if (locMasts.size() - crnCountO <= 15) {
                                log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                            } else {
                                nearRow = near;
@@ -345,7 +345,7 @@
                                    .eq("loc_type2", locTypeDto.getLocType2())
                            );
                            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
                            if (locMasts.size() - crnCountO <= 2) {
                            if (locMasts.size() - crnCountO <= 15) {
                                log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                            } else {
                                nearRow = near;
@@ -355,9 +355,9 @@
                    }
                }

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