新增重新下发堆垛机任务

野心家

2024-11-25 871a5789eedf93d21f16bc7f619c5edb7da70f46

新增重新下发堆垛机任务

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

@@ -247,6 +247,29 @@
        return R.ok();
    }

    @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
    @ManagerAuth(memo = "重新给堆垛机下发任务")
    public R returnWorkingCondition(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
            taskWrk.setWrkSts(11);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
            taskWrk.setWrkSts(2);
            taskWrkService.updateById(taskWrk);
            if(!taskWrkService.updateById(taskWrk)){
                return R.error("更新任务状态失败");
            }
            return R.ok();
        }else{
            return R.error("任务状态不对无法重新给堆垛机下发任务");
        }

    }

    @PostMapping(value = "/taskWrk/cancel/auth")
    @ManagerAuth(memo = "手动取消任务")
    public R cancel(@RequestParam String taskNo) {

 src/main/webapp/views/taskWrk/taskWrk.html

@@ -52,7 +52,8 @@
                                <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
                                    <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
                                    <el-dropdown-menu slot="dropdown">
                                        <el-dropdown-item command="showCommand">查看指令</el-dropdown-item>
<!--                                        <el-dropdown-item command="showCommand">查看指令</el-dropdown-item>-->
                                        <el-dropdown-item command="returnWorkingCondition">重新给堆垛机下发任务</el-dropdown-item>
                                        <el-dropdown-item command="changeCommand">修改</el-dropdown-item>
                                        <el-dropdown-item command="assign">派发</el-dropdown-item>
                                        <el-dropdown-item command="complete">完结</el-dropdown-item>
@@ -205,9 +206,9 @@
                    },
                    handleCommand(command, row) {
                        switch (command) {
                            case "showCommand":
                                //查看指令
                                this.showCommand(row)
                            case "returnWorkingCondition":
                                //重新给堆垛机下发任务
                                this.returnWorkingConditionWrk(row)
                                break;
                            case "changeCommand":
                                //修改指令
@@ -306,6 +307,36 @@
                            }
                        });
                    },
                    returnWorkingConditionWrk(row){
                        //重新给堆垛机下发任务
                        let that = this
                        $.ajax({
                            url: baseUrl + "/taskWrk/returnWorkingCondition/auth",
                            headers: {
                                'token': localStorage.getItem('token')
                            },
                            data: {
                                taskNo: row.taskNo
                            },
                            method: 'POST',
                            success: function(res) {
                                if (res.code == 200) {
                                    that.$message({
                                        message: "取消成功",
                                        type: 'success'
                                    });
                                    that.getTableData()
                                } else if (res.code === 403) {
                                    top.location.href = baseUrl + "/";
                                } else {
                                    that.$message({
                                        message: res.msg,
                                        type: 'error'
                                    });
                                }
                            }
                        });
                    },
                    cancelWrk(row){
                        //取消任务
                        let that = this