#改造

cpT

2025-06-27 5796d43a6bedd35edb3c04b73c8aae43cae1a29c

#改造

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

@@ -101,6 +101,23 @@
        return R.ok("任务清空成功");
    }

    @PostMapping("/run/del2")//Take  Put  Walk
    @ManagerAuth(memo = "清除作业启动中")
    public R rgvRunDel2(@RequestParam(defaultValue = "0")  Integer rgvNo
    ) {
        if (rgvNo==null || rgvNo==0){
            return R.error("请选择小车");
        }
        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo);
        try {
            rgvThread.setWrkSign();
        } catch (Exception e) {
            return R.error("清除作业启动中失败"+e.getMessage());
        }

        return R.ok("任务清空成功");
    }

    @PostMapping("/run/walk")//Take  Put  Walk
    @ManagerAuth(memo = "小车行走")
    public R rgvRunWalk(@RequestParam(defaultValue = "0")  Integer rgvNo,

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

@@ -6,4 +6,6 @@

    void close();

    void setWrkSign();

}

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

@@ -60,4 +60,12 @@

    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
    }

}

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

@@ -468,4 +468,12 @@

    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
    }

}

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

@@ -1341,6 +1341,14 @@
    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
        this.wrkSign = 0;
    }

    public void setDelRgvTask() {
        delRgvTask = true;
    }

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

@@ -205,4 +205,12 @@
        return true;
    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
    }

}

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

@@ -495,4 +495,12 @@
        isRunning = false;
    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
    }

}

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

@@ -624,4 +624,12 @@
//
//    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
    }

}

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

@@ -59,7 +59,8 @@
                            <el-button @click="requestOperate('TakeAndPut')" type="primary">取放货</el-button>
                            <el-button @click="requestOperate('walk')" type="warning">行走</el-button>
                            <el-button @click="requestOperate('del')" type="warning">任务清空</el-button>
                            <el-button @click="requestOperate('delRgvTask')" type="warning">小车强制复位（运行时不要操作,需要配合按钮）</el-button>
                            <el-button @click="requestOperate('del2')" type="warning">清除作业启动中</el-button>
                            <el-button @click="requestOperate('delRgvTask')" type="warning">清空wcs下发数据（运行数据需要硬件复位9S）</el-button>
                        </div>
                    </div>
                </el-card>