#

zjj

2024-04-12 a33d5ee3bd3907be492001ffba7969b468f86807

#

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

@@ -385,13 +385,7 @@
        return crnControl(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "解锁小车")
    @PostMapping("/lock")
    public R lock(CrnOperatorParam param){
        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
        rgvThread.setPakMk(true);
        return R.ok();
    }


//    @ManagerAuth(memo = "暂停")
//    @PostMapping("/operator/pause")

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

@@ -5,6 +5,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.domain.param.RgvOperatorParam;
import com.zy.asrs.domain.vo.RgvMsgTableVo;
import com.zy.asrs.domain.vo.RgvStateTableVo;
@@ -217,6 +218,14 @@
        return rgvControl(command)? R.ok(): R.error();
    }

    @ManagerAuth(memo = "解锁小车")
    @PostMapping("/lock")
    public R lock(CrnOperatorParam param){
        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
        rgvThread.setPakMk(true);
        return R.ok();
    }

    @ManagerAuth(memo = "任务完成")
    @PostMapping("/operator/taskComplete")
    public R rgvTaskComplete(RgvOperatorParam param){

 src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java

@@ -35,4 +35,6 @@
    // 目标库位-层
    private Short lev;

    private Integer rgvNo;

}

 src/main/java/com/zy/core/MainProcess.java

@@ -45,7 +45,7 @@
                    }

                    // 演示
                    mainService.crnDemoOfLocMove1();
//                    mainService.crnDemoOfLocMove1();
                    //刷新RGV地图
                    mainService.refreshRgvMap();