#

zjj

2024-03-25 fdf9554e4022247f38b3a1ff5dd866d9e00d8e35

#

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

@@ -107,6 +107,15 @@
        return rgvControl2(command)?R.ok():R.error();
    }

    @ManagerAuth(memo = "取消急停")
    @PostMapping("/operator/noStop")
    public R rgvNoStop(RgvOperatorParam param){
        RgvCommand command = new RgvCommand();
        command.setRgvNo(param.getRgvNo()); // 堆垛机编号
        command.setNoStop(true);
        return rgvControl2(command)?R.ok():R.error();
    }

    private boolean rgvControl2(RgvCommand command){
        if (command.getRgvNo() == null) {
            throw new CoolException("请选择RGV");

 src/main/java/com/zy/core/model/command/RgvCommand.java

@@ -89,6 +89,7 @@
    private boolean compTask;
    private boolean reset;
    private boolean stop;
    private boolean noStop;

    public void setTaskMode1(Short taskMode1){
        this.taskMode1 = taskMode1;

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

@@ -266,6 +266,9 @@
        else if (command.isReset()) {
            result = siemensNet.Write("DB99.0.4", true);
        }
        else if (command.isNoStop()) {
            result = siemensNet.Write("DB99.0.3", false);
        }

//        if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
//            short commandFinish = 3;  //工位1、2任务同时写入

 src/main/webapp/views/deviceOperate/rgvOperate.html

@@ -58,6 +58,7 @@
                            <br/>
                            <br/>
                            <el-button @click="requestOperate('stop')" type="warning">远程急停</el-button>
                            <el-button @click="requestOperate('noStop')" type="warning">取消急停</el-button>
                            <el-button @click="requestOperate('reset')" type="warning">系统复位</el-button>
                        </div>
                    </div>