#1901

lsh

昨天 a159d70468d238504a2d705b738ca59bff7e7392

#1901

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -505,4 +505,13 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }

}

 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java

@@ -512,4 +512,13 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }

}

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -237,4 +237,13 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }

}

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -404,6 +404,15 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -398,5 +398,14 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }


}

 src/main/java/com/zy/asrs/entity/WrkDetlSingle.java

@@ -479,5 +479,14 @@
        return this.brand;
    }

    public int getBrandArmType$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return basBoxType.getArmType();
        }
        return 999;
    }


}

 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);
@@ -343,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;
                        }
@@ -350,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;
@@ -402,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){
@@ -411,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);

 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);
@@ -274,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;
                        }
@@ -281,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;
@@ -333,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){
@@ -342,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);

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

@@ -47,11 +47,10 @@
//        add(116);add(117);

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

    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(118);add(120);
@@ -282,6 +281,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;
                        }
@@ -289,7 +301,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;
@@ -355,7 +370,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){
                                    continue;
@@ -369,6 +386,9 @@
                                        continue;
                                    }
                                }
                                if (staNoOther==122){
                                    staNoOther = 1901;
                                }
                                wrkMast.setStaNo(staNoOther);
                                wrkMastService.updateById(wrkMast);
                                log.info("工作号"+wrkMast.getWrkNo()+"修改目标站为:"+staNoOther+";原目标站为:"+wrkMastStaNo);