#
Junjie
2025-04-29 f112defecc6b74d633c65181302f34469a2977d1
#
1个文件已修改
85 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -273,40 +273,61 @@
                               @RequestBody TaskCancelParam param,
                               HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.error("参数为空!");
        } else if (Cools.isEmpty(param.getTaskNo())) {
            return R.error("工作号为空!");
        } else if (Cools.isEmpty(param.getIoType())) {
            return R.error("操作类型为空!");
        } else if (Cools.isEmpty(param.getBarcode())) {
            return R.error("托盘码不能为空!");
        }
        R result = null;
        try {
            if (Cools.isEmpty(param)) {
                return R.error("参数为空!");
            } else if (Cools.isEmpty(param.getTaskNo())) {
                return R.error("工作号为空!");
            } else if (Cools.isEmpty(param.getIoType())) {
                return R.error("操作类型为空!");
            } else if (Cools.isEmpty(param.getBarcode())) {
                return R.error("托盘码不能为空!");
            }
        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
                .eq("task_no", param.getTaskNo())
                .eq("io_type", param.getIoType())
                .eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(taskWrk)){
            return R.error("未查到当前任务---" + param);
            TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
                    .eq("task_no", param.getTaskNo())
                    .eq("io_type", param.getIoType())
                    .eq("barcode", param.getBarcode()));
            if (Cools.isEmpty(taskWrk)){
                result =  R.error("未查到当前任务---" + param);
                return result;
            }
            boolean sign =false;
            switch (param.getTaskStatus()) {
                case 1://正常取消
                    if (taskWrk.getStatus() > 1) {
                        result = R.error("任务已开始执行");
                        return result;
                    }
                    break;
                case 2://正常完成
                    if (taskWrk.getStatus() > 1) {
                        result = R.error("任务已开始执行");
                        return result;
                    }
                    sign = true;
                    break;
                default:
                    result = R.error("未知操作");
                    return result;
            }
            result = taskWrkOperate(taskWrk, sign);
            return result;
        } catch (Exception e) {
            e.printStackTrace();
            result = R.error(e.getMessage());
            return R.error(e.getMessage());
        }finally {
            apiLogService.save("wms任务下发接口"
                    ,request.getRemoteAddr()+request.getRequestURI()
                    ,""
                    ,request.getRemoteAddr()
                    ,JSON.toJSONString(param)
                    ,JSON.toJSONString(result)
                    ,true
            );
        }
        boolean sign =false;
        switch (param.getTaskStatus()) {
            case 1://正常取消
                if (taskWrk.getStatus() > 1) {
                    return R.error("任务已开始执行");
                }
                break;
            case 2://正常完成
                if (taskWrk.getStatus() > 1) {
                    return R.error("任务已开始执行");
                }
                sign = true;
                break;
            default:
                return R.error("未知操作");
        }
        return taskWrkOperate(taskWrk, sign);
    }
    //任务操作