#

1

2025-05-11 aa146b6fad8f892752e832dc874c050e4375451c

#

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -377,6 +377,7 @@
            return R.ok();
        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
            taskWrk.setWrkSts(2);
            taskWrk.setStatus(TaskStatusType.RECEIVE.id);//派发状态
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -52,7 +52,7 @@
    //# 轨道基准点
    private Long trackBenchmark = 1L;
    //  # 避让距离
    private Long avoidDistance = 4000L;
    private Long avoidDistance = 5000L;

    /**
     * 工位1复位信号
@@ -343,6 +343,10 @@
                        log.error("行走超出范围！！！任务异常  联系管理员！！！");
                        return false;
                    }
                    long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
                    if (avoidAbs<51){
                        return false;
                    }
                    rgvTaskProtocolOther.setAvoid(1);
                    rgvTaskProtocolOther.setAvoidingTheDestination(avoid);
                    RgvTaskCache.updateRgvStatus(rgvTaskProtocolOther);
@@ -357,6 +361,10 @@
                    long avoid = targetPosition + rgvProtocol.getCarBodyKunPeng() + avoidDistance + rgvProtocolOther.getCarBodyJiaoMing();
                    if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[0])) {
                        log.error("行走超出范围！！！任务异常  联系管理员！！！");
                        return false;
                    }
                    long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
                    if (avoidAbs<51){
                        return false;
                    }
                    rgvTaskProtocolOther.setAvoid(1);
@@ -374,6 +382,10 @@
                        long avoid = rgvProtocolOther.getRgvPos() - rgvProtocolOther.getCarBodyJiaoMing() - avoidDistance - rgvProtocol.getCarBodyKunPeng();
                        if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[1])) {
                            log.error("行走超出范围！！！任务异常  联系管理员！！！");
                            return false;
                        }
                        long avoidAbs = Math.abs(avoid - rgvProtocol.getRgvPos());
                        if (avoidAbs<51){
                            return false;
                        }
                        rgvTaskProtocol.setAvoid(1);
@@ -396,6 +408,10 @@
                        log.error("行走超出范围！！！任务异常  联系管理员！！！");
                        return false;
                    }
                    long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
                    if (avoidAbs<51){
                        return false;
                    }
                    rgvTaskProtocolOther.setAvoid(1);
                    rgvTaskProtocolOther.setAvoidingTheDestination(avoid);
                    RgvTaskCache.updateRgvStatus(rgvTaskProtocolOther);
@@ -410,6 +426,10 @@
                    long avoid = targetPosition - rgvProtocol.getCarBodyJiaoMing() - avoidDistance - rgvProtocolOther.getCarBodyKunPeng();
                    if (!new TrackRangeUtils().avoidRange(avoid, avoidRange[1])) {
                        log.error("行走超出范围！！！任务异常  联系管理员！！！");
                        return false;
                    }
                    long avoidAbs = Math.abs(avoid - rgvProtocolOther.getRgvPos());
                    if (avoidAbs<51){
                        return false;
                    }
                    rgvTaskProtocolOther.setAvoid(1);
@@ -430,6 +450,10 @@
                            log.error("行走超出范围！！！任务异常  联系管理员！！！");
                            return false;
                        }
                        long avoidAbs = Math.abs(avoid - rgvProtocol.getRgvPos());
                        if (avoidAbs<51){
                            return false;
                        }
                        rgvTaskProtocol.setAvoid(1);
                        rgvTaskProtocol.setAvoidingTheDestination(avoid);
                        RgvTaskCache.updateRgvStatus(rgvTaskProtocol);

 src/main/resources/application-prod.yml

@@ -83,8 +83,8 @@
    rack: 0
    slot: 0
    otherId: 2
    carBodyJiaoMing: 2000
    carBodyKunPeng: 15000
    carBodyJiaoMing: 2800
    carBodyKunPeng: 13500
    #RGV源站点
    rgvInSta[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
@@ -159,8 +159,8 @@
    rack: 0
    slot: 0
    otherId: 1
    carBodyJiaoMing: 2000
    carBodyKunPeng: 15000
    carBodyJiaoMing: 2800
    carBodyKunPeng: 13500
    #RGV源站点
    rgvInSta[0]:
      devpPlcId: ${wcs-slave.devp[0].id}

 src/main/resources/application.yml

@@ -56,7 +56,7 @@
  # 轨道转换为米比例
  trackProportion: 10000
  # 避让距离
  avoidDistance: 5100
  avoidDistance: 4000

wms:
  # 是否开启上报