#1901

lsh

昨天 a159d70468d238504a2d705b738ca59bff7e7392

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

@@ -46,11 +46,11 @@
    }};

    public static final List<Integer> STA_WORK_CU_CAR = new ArrayList<Integer>() {{
        add(118);
        add(118);add(1901);
    }};

    public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{

        add(1901);
    }};
    public static final List<Integer> STA_WORK_CU_CAR_THREE  = new ArrayList<Integer>() {{
        add(118);
@@ -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{
@@ -267,6 +274,19 @@
                        if(Cools.isEmpty(wrkMast)){
                            continue;
                        }
                        if (wrkMast.getStaNo()==1901){
                            boolean sign1901 = false;
                            List<WrkDetl> wrkDetlList1901 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                            for (WrkDetl wrkDetl : wrkDetlList1901){
                                if (wrkDetl.getBrandArmType$()==999){
                                    sign1901 = true;
                                    break;
                                }
                            }
                            if (sign1901){
                                continue;
                            }
                        }
                        if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
                            continue;
                        }
@@ -274,7 +294,10 @@
                            continue;
                        }
                        Integer wrkMastStaNo = wrkMast.getStaNo();
                        if (wrkMastStaNo<118 || wrkMastStaNo>121){
                        if (wrkMastStaNo==1901){
                            wrkMastStaNo = 122;
                        }
                        if ((wrkMastStaNo<118 || wrkMastStaNo>121) && wrkMastStaNo!=122){
                            continue;
                        }
                        String origin = null;
@@ -326,6 +349,9 @@
                                        }
                                    }
                                }
                                if (staNoOther==1901){
                                    staNoOther = 122;
                                }

                                int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
                                if (countOther!=0){
@@ -335,6 +361,9 @@
                                if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
                                    continue;
                                }
                                if (staNoOther==122){
                                    staNoOther = 1901;
                                }
                                wrkMast.setStaNo(staNoOther);
                                wrkMastService.updateById(wrkMast);
                                log.info("工作号"+wrkMast.getWrkNo()+"修改目标站为:"+staNoOther+";原目标站为:"+wrkMastStaNo);