#1

lsh

1 天以前 809f49807ce5f587fe881cfe4cc3d38d9c1a46a3

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

@@ -60,14 +60,14 @@
    }};

    public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
        add(118);add(122);
        add(118);add(122);add(1907);
    }};


    @Scheduled(cron = "0/1 * * * * ? ")
    private void execute(){
        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
        if (rgvTwoSign.getRgvOneSign()!=0){
        if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
            return;
        }
        List<Integer> integersStaArr = new ArrayList<>();
@@ -91,7 +91,7 @@
                        continue;
                    }
                    if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
                        if (!wrkMast.getStaNo().equals(122)){
                        if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){
                            continue;
                        }
                    }
@@ -101,7 +101,8 @@
                    if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){
                        continue;
                    }
                    boolean wrkTypeSign = fullKM(wrkMast);
//                    boolean wrkTypeSign = fullKM(wrkMast);
                    boolean wrkTypeSign = true;
                    if (!Cools.isEmpty(wrkMast)){
                        if (wrkTypeSign) {
                            ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放
@@ -134,8 +135,14 @@
                        continue;
                    }

                    if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
                        continue;
                    if (staNo==1907){
                        if (wrkMast.getWrkSts()!=2){
                            continue;
                        }
                    } else {
                        if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
                            continue;
                        }
                    }
//                boolean wrkTypeSign = fullKM(wrkMast);

@@ -150,7 +157,7 @@
                    }
                }
            }catch (Exception e){
                log.error("自动补空板STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e);
                log.error("STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e);
            }
        }
    }
@@ -158,7 +165,7 @@
    @Scheduled(cron = "0/1 * * * * ? ")
    private void execute2(){
        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
        if (rgvTwoSign.getRgvOneSign()!=0){
        if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
            return;
        }
        try{