Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

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

@@ -42,7 +42,12 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(Task.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));
        }
        if (Cools.isEmpty(orderByField)) {
            wrapper.orderDesc(Arrays.asList("wrk_no"));
        }
        return R.ok(taskService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -85,6 +90,25 @@
        return R.ok();
    }


    @RequestMapping("/task/control")
    @ManagerAuth(memo = "手动处理工作档")
    public R handControlWrkMast(@RequestParam String workNo,
                                @RequestParam Integer type) {
        if (type == 1) {
            taskService.completeWrkMast(workNo, getUserId());
            return R.ok("工作档已完成");
        } else if (type == 2) {
            taskService.cancelWrkMast(workNo, getUserId());
            return R.ok("工作档已取消");
        } else if (type == 3) {
            taskService.pickWrkMast(workNo, getUserId());
            return R.ok("工作档已拣料");
        }
        return R.ok();
    }


    @RequestMapping(value = "/task/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){