#

yxFwq

2024-12-09 e6336650959c54593dab68c2f6863d44992271b2

#

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -90,14 +90,14 @@
                        if (result.getCode()==200){
                            continue;
                        }else {
                            System.out.println(staNo+"失败！");
                            System.out.println(staNo+"失败1！");
                        }
                    } else {
                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5：满取
                        if (result.getCode()==200){
                            continue;
                        }else {
                            System.out.println(staNo+"失败！");
                            System.out.println(staNo+"失败2！");
                        }
                    }
                }
@@ -123,7 +123,7 @@
                        if (result.getCode()==200) {
                            continue;
                        } else {
                            System.out.println(staNo+"失败！");
                            System.out.println(staNo+"失败3！");
                        }
                }
            }
@@ -193,7 +193,7 @@
                            if (result.getCode()==200){
                                continue;
                            }else {
                                System.out.println(staNo+"失败！");
                                System.out.println(staNo+"失败4！");
                            }
                        }
                    }

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -575,7 +575,7 @@
                }
                if ((curRow - sRow) % 4 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排
                    necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1;     //crnNo     堆垛机号
                    necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo;     //crnNo     堆垛机号
                    necessaryParameters[3] = curRow + 1;    //nearRow  最浅库位排
                } else if ((curRow - sRow + 1) % 4 == 0) {
                    necessaryParameters[1] = curRow;    //curRow   最深库位排

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

@@ -182,8 +182,10 @@
                nearRow = locNecessaryParameters[3];
                if (crnNo>5 || crnNo<3){
                    List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
                    int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).ne("source_sta_no",148));
                    int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).and().ne("source_sta_no",148));
                    if (locMasts.size()-crnCountO<=2){
                        log.error(crnNo+"号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                        nearRow = 0;
                        times++;
                        continue;
                    }
@@ -194,7 +196,8 @@
            }
        }
        if (nearRow == 0) {
            throw new CoolException("无可用堆垛机");
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("无可用堆垛机,无可用空库位");
        }

        boolean signRule1 = false;