*

L

4 天以前 6a6ceb0e57285d49c3f9c884e244710c9edf2b7a

*

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

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

    public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
@@ -162,7 +162,7 @@
        }
    }

    @Scheduled(cron = "0/1 * * * * ? ")
    @Scheduled(cron = "0/2 * * * * ? ")
    private void execute2(){
        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
        if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
@@ -330,14 +330,23 @@
                            }
                        }
                        int count1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()));
                        if (count1!=0){
                            continue;
                        }
                        int count2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", wrkMast.getStaNoCar$()));
                        if (count1+count2!=0){
                        if (count2!=0){
                            continue;
                        }
                        int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
                        if (countStart1!=0){
                            continue;
                        }
                        int countStart2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", staNo));
                        if (countStart2!=0){
                            continue;
                        }
                        int countStart3 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo()));
                        if (countStart1+countStart2+countStart3!=0){
                        if (countStart3!=0){
                            continue;
                        }
                        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));

 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>() {{
@@ -377,6 +377,18 @@
                                    }
                                }
                                if (staNoOther==1901){
                                    boolean sign1901 = false;
                                    for (Integer staNo1901 : STA_WORK_CU){
                                        BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
                                        WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
                                        if (wrkMast1901.getStaNo()==1901){
                                            sign1901 = true;
                                            break;
                                        }
                                    }
                                    if (sign1901){
                                        continue;
                                    }
                                    staNoOther = 122;
                                }
                                int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));