Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs

野心家

2025-04-01 66942458f7753fe4ddee7c5ed3386d61cff28b24

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

@@ -165,12 +165,12 @@
        return R.ok();
    }

    @PostMapping(value = "/taskWrk/distribute/auth")
    @ManagerAuth(memo = "手动派发任务")
    public R distribute(@RequestParam String taskNo) {
        taskWrkService.distribute(taskNo, getUserId());
        return R.ok();
    }
//    @PostMapping(value = "/taskWrk/distribute/auth")
//    @ManagerAuth(memo = "手动派发任务")
//    public R distribute(@RequestParam String taskNo) {
//        taskWrkService.distribute(taskNo, getUserId());
//        return R.ok();
//    }

    @PostMapping(value = "/taskWrk/complete/auth")
    @ManagerAuth(memo = "手动完成任务")
@@ -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) {