#1901

lsh

昨天 a159d70468d238504a2d705b738ca59bff7e7392

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

@@ -51,7 +51,7 @@
    }};

    public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
        add(120);add(121);
        add(1901);
    }};
    public static final List<Integer> STA_WORK_CU_CAR_THREE  = new ArrayList<Integer>() {{
        add(120);
@@ -61,12 +61,16 @@
    }};

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


    @Scheduled(cron = "0/1 * * * * ? ")
    private void execute(){
        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
        if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
            return;
        }
        List<Integer> integersStaArr = new ArrayList<>();
        List<int[]> stalistArr = new ArrayList<>();
        for(Integer staNo : STA_WORK_CU){
@@ -150,13 +154,17 @@
                    }
                }
            }catch (Exception e){
                log.error("自动补空板STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e);
                log.error("STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e);
            }
        }
    }

    @Scheduled(cron = "0/1 * * * * ? ")
    private void execute2(){
        RgvOneSign rgvTwoSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","rgvTwo"));
        if (Cools.isEmpty(rgvTwoSign) || rgvTwoSign.getRgvOneSign()!=0){
            return;
        }
        try{
            List<Integer> integersStaArr = new ArrayList<>();
            List<int[]> stalistArr = new ArrayList<>();
@@ -166,10 +174,7 @@
                        new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("wrk_sts", 11L));
                stalistArr.add(new int[]{staNo, selectCount});
            }

// 按selectCount降序排序（最大的排第一位）
            Collections.sort(stalistArr, (a, b) -> b[1] - a[1]);  // 降序排列
// 如果您需要转为数组（可选）
            Collections.sort(stalistArr, (a, b) -> b[1] - a[1]);
            for (int[] staNowArr : stalistArr){
                integersStaArr.add(staNowArr[0]);
            }
@@ -338,6 +343,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;
                        }
@@ -345,7 +363,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;
@@ -397,6 +418,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){
@@ -406,6 +430,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);