*

lsh

2025-04-08 ddc9842f99172338bd7606de3c9a8cf520d7a0b4

*

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

@@ -121,10 +121,30 @@

    @RequestMapping(value = "/taskWrk/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            taskWrkService.deleteById(id);
    public R delete(@RequestParam String taskNo){
//         for (Long id : ids){
//            taskWrkService.deleteById(id);
//        }
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (taskWrk == null) {
            return R.error();
        }
        Date now = new Date();
        taskWrk.setMemo("手动强制删除！！！");
        taskWrk.setModiTime(now);
        taskWrk.setModiUser(getUserId());
        if (!taskWrkService.updateById(taskWrk)){
            log.error("删除失败" + taskWrk);
            return R.error("删除失败" + taskWrk);

        }
        if (taskWrkService.saveToHistoryD(taskWrk.getTaskNo()) == 0) {
            log.error("任务档转任务历史档失败" + taskWrk);
            return R.error("任务档转任务历史档失败" + taskWrk);

        }
        //删除任务
        taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
        return R.ok();
    }


 src/main/java/com/zy/asrs/mapper/TaskWrkMapper.java

@@ -37,6 +37,7 @@
    List<TaskWrk> selectToBeHistoryData();

    int saveToHistory(String taskNo);//将任务转历史日志
    int saveToHistoryD(String taskNo);//将任务转历史日志

    List<TaskWrk> selectWorkingTask();//获取工作中的任务


 src/main/java/com/zy/asrs/service/TaskWrkService.java

@@ -29,5 +29,6 @@
    List<TaskWrk> selectToBeHistoryData();

    int saveToHistory(String taskNo);//将任务转历史日志
    int saveToHistoryD(String taskNo);//将任务转历史日志

}

 src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java

@@ -247,4 +247,8 @@
    public int saveToHistory(String taskNo) {
        return this.baseMapper.saveToHistory(taskNo);
    }
    @Override
    public int saveToHistoryD(String taskNo) {
        return this.baseMapper.saveToHistoryD(taskNo);
    }
}

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -125,6 +125,9 @@
    <insert id="saveToHistory">
        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4 or status=6)
    </insert>
    <insert id="saveToHistoryD">
        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo}
    </insert>

    <select id="selectWorkingTask" resultMap="BaseResultMap">
        select * from dbo.wcs_task_wrk

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

@@ -58,6 +58,7 @@
                                <el-dropdown-item command="assign">派发</el-dropdown-item>
                                <el-dropdown-item command="complete">完结</el-dropdown-item>
                                <el-dropdown-item command="cancel">取消</el-dropdown-item>
                                <el-dropdown-item command="delete">删除不上报</el-dropdown-item>
                            </el-dropdown-menu>
                        </el-dropdown>
                    </template>
@@ -85,6 +86,8 @@
                <el-table-column property="crnNo" label="堆垛机号">
                </el-table-column>
                <el-table-column property="ioPri" label="优先级">
                </el-table-column>
                <el-table-column property="memo" label="备注">
                </el-table-column>
            </el-table>

@@ -231,6 +234,10 @@
                        //取消任务
                        this.cancelWrk(row)
                        break;
                    case "delete":
                        //取消任务
                        this.deleteWrk(row)
                        break;
                }
            },
            showCommand(row) {
@@ -343,6 +350,36 @@
                    }
                });
            },
            deleteWrk(row) {
                //取消任务
                let that = this
                $.ajax({
                    url: baseUrl + "/taskWrk/delete/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

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -71,6 +71,8 @@
                        </el-table-column>
                        <el-table-column property="barcode" label="条码">
                        </el-table-column>
                        <el-table-column property="memo" label="备注">
                        </el-table-column>
                    </el-table>

                    <div style="margin-top: 10px;">