*

L

2 天以前 74a9fe02a84e158e021638d7c46d38670d4f8782

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

@@ -53,10 +53,10 @@
        add(1901);
    }};
    public static final List<Integer> STA_WORK_CU_CAR_THREE  = new ArrayList<Integer>() {{
        add(118);add(120);
        add(118);add(120);add(1901);
    }};
    public static final List<Integer> STA_WORK_CU_CAR_FOUR  = new ArrayList<Integer>() {{
        add(121);add(118);
        add(121);add(118);add(1901);
    }};

    public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
@@ -208,12 +208,15 @@
                        if (wrkMast.getStaNoCar$()<118 || wrkMast.getStaNoCar$()>121){
                            continue;
                        }
                        int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()).or().eq("sta_end", wrkMast.getStaNoCar$()));
                        if (count!=0){
                        int count1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()));
                        int count2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", wrkMast.getStaNoCar$()));
                        if (count1+count2!=0){
                            continue;
                        }
                        int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
                        if (countStart!=0){
                        int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
                        int countStart2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", staNo));
                        int countStart3 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo()));
                        if (countStart1+countStart2+countStart3!=0){
                            continue;
                        }
                        BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
@@ -374,6 +377,24 @@
                                    }
                                }
                                if (staNoOther==1901){
                                    log.info("准备切换"+staNoOther+"站点");
                                    boolean sign1901 = false;
                                    for (Integer staNo1901 : STA_WORK_CU){
                                        BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
                                        if (Cools.isEmpty(basDevp1901)){
                                            log.info("basDevp1901"+staNoOther+"为空");
                                            continue;
                                        }
                                        WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
                                        if (!Cools.isEmpty(wrkMast1901) && wrkMast1901.getStaNo()==1901){
                                            sign1901 = true;
                                            break;
                                        }
                                    }
                                    if (sign1901){
                                        log.info("存在"+staNoOther+"站点任务，跳过");
                                        continue;
                                    }
                                    staNoOther = 122;
                                }
                                int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));