*

L

3 天以前 c3617b473555b7b37755f92a04e258f0e55f333d

*

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -397,15 +398,12 @@

    public Integer getStaNoCar$(){
        BasDevpService service = SpringUtils.getBean(BasDevpService.class);
        BasDevp basDevp = service.selectById(this.sourceStaNo);
        BasDevp basDevp = service.selectById(this.staNo);
        if (!Cools.isEmpty(basDevp)){
            Integer devNoCar = basDevp.getDevNo();
            switch (devNoCar){
                case 1901:
                    return 122;
                default:
                    return devNoCar;
            if (basDevp.getDevNo()==1901){
                return 122;
            }
            return basDevp.getDevNo();
        }
        return null;
    }

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

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

@@ -201,17 +201,20 @@
                        if (wrkMast.getStaNoCar$()<118 || wrkMast.getStaNoCar$()>121){
                            continue;
                        }
                        log.info(staNo+"站点准备生成小车任务，进入程序");
                        int count1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNoCar$()));
                        int count2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", wrkMast.getStaNoCar$()));
                        if (count1+count2!=0){
                            continue;
                        }
                        log.info(staNo+"站点，数量1："+count1+",数量2:"+count2);
                        int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
                        int countStart2 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_end", staNo));
                        int countStart3 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo()));
                        if (countStart1+countStart2+countStart3!=0){
                            continue;
                        }
                        log.info(staNo+"站点，数量1："+countStart1+",数量2:"+countStart2+",数量3:"+countStart3);
                        BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNoCar$());
                        if (!basDevpEnd.getAutoing().equals("Y")){
                            continue;
@@ -257,6 +260,7 @@
                        boolean wrkTypeSign = fullKM(wrkMast);
                        if (!Cools.isEmpty(wrkMast)){
                            if (wrkTypeSign) {
                                log.info(staNo+"站点生成小车任务，进入程序;//3：取放");
                                ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放
                                if (result.getCode()==200){
                                    continue;
@@ -267,7 +271,7 @@
                        }
                    }
                }catch (Exception e){
                    log.error("STA_WORK_CU处理失败，当前站点号："+staNo+"异常信息"+e);
                    log.error("STA_WORK_CU处理失败2，当前站点号："+staNo+"异常信息"+e);
                }
            }

@@ -293,6 +297,7 @@
//                                continue;
//                            }
//                        }
                        log.info(staNo+"站点准备切换站点，进入程序");
                        if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
                            continue;
                        }
@@ -337,6 +342,7 @@
                        if (count2!=0){
                            continue;
                        }
                        log.info(staNo+"站点，two数量1："+count1+",数量2:"+count2);
                        int countStart1 = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo));
                        if (countStart1!=0){
                            continue;
@@ -349,6 +355,7 @@
                        if (countStart3!=0){
                            continue;
                        }
                        log.info(staNo+"站点，two数量1："+countStart1+",数量2:"+countStart2+",数量3:"+countStart3);
                        RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
                        if (rgvOneSign.getRgvOneSign()==1){
                            STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO;
@@ -371,16 +378,22 @@
                                    }
                                }
                                if (staNoOther==1901){
                                    log.info("准备切换"+staNoOther+"站点");
                                    boolean sign1901 = false;
                                    for (Integer staNo1901 : STA_WORK_CU){
                                        BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
                                        if (Cools.isEmpty(basDevp1901)){
                                            log.info("basDevp1901"+staNoOther+"为空");
                                            continue;
                                        }
                                        WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
                                        if (wrkMast1901.getStaNo()==1901){
                                        if (!Cools.isEmpty(wrkMast1901) && wrkMast1901.getStaNo()==1901){
                                            sign1901 = true;
                                            break;
                                        }
                                    }
                                    if (sign1901){
                                        log.info("存在"+staNoOther+"站点任务，跳过");
                                        continue;
                                    }
                                    staNoOther = 122;
@@ -406,7 +419,7 @@
                        }
                    }
                }catch (Exception e){
                    log.error("STA_WORK_CU处理失败，当前站点号："+staNo+"异常信息"+e);
                    log.error("STA_WORK_CU处理失败3，当前站点号："+staNo+"异常信息"+e);
                }
            }
        }catch (Exception e){

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

@@ -377,16 +377,22 @@
                                    }
                                }
                                if (staNoOther==1901){
                                    log.info("准备切换"+staNoOther+"站点");
                                    boolean sign1901 = false;
                                    for (Integer staNo1901 : STA_WORK_CU){
                                        BasDevp basDevp1901 = basDevpService.selectById(staNo1901);
                                        if (Cools.isEmpty(basDevp1901)){
                                            log.info("basDevp1901"+staNoOther+"为空");
                                            continue;
                                        }
                                        WrkMast wrkMast1901 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp1901.getWrkNo()));
                                        if (wrkMast1901.getStaNo()==1901){
                                        if (!Cools.isEmpty(wrkMast1901) && wrkMast1901.getStaNo()==1901){
                                            sign1901 = true;
                                            break;
                                        }
                                    }
                                    if (sign1901){
                                        log.info("存在"+staNoOther+"站点任务，跳过");
                                        continue;
                                    }
                                    staNoOther = 122;