#1

lsh

1 天以前 e128bbc4a9df1491257320884169ba813d461f63

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

@@ -61,7 +61,7 @@
    }};

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

@@ -98,7 +98,7 @@
                        continue;
                    }
                    if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
                        if (!wrkMast.getStaNo().equals(122)){
                        if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){
                            continue;
                        }
                    }
@@ -108,13 +108,14 @@
                    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：取放
                            if (result.getCode()==200){
                                continue;
                            }else {
                            } else {
                                System.out.println(staNo+"失败！");
                            }
                        } else {
@@ -140,9 +141,14 @@
                    if (Cools.isEmpty(wrkMast)){
                        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);

@@ -157,7 +163,7 @@
                    }
                }
            }catch (Exception e){
                log.error("自动补空板STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e);
                log.error("STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e);
            }
        }
    }