From e0caa6730a116f82888cc6fe2c2c2717553d1150 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期二, 13 九月 2022 12:49:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs --- src/main/java/com/zy/asrs/controller/NodeController.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java index 6a0c236..6ae3b3c 100644 --- a/src/main/java/com/zy/asrs/controller/NodeController.java +++ b/src/main/java/com/zy/asrs/controller/NodeController.java @@ -306,8 +306,30 @@ } @RequestMapping("/work/stock/pakout") - @ManagerAuth(memo = "鐢熸垚鎷h揣鍗�") + @ManagerAuth(memo = "鍑哄簱") public R initPakout(@RequestBody List<InitPakoutParam> params) { return nodeService.initPakout(params, getUserId(), getHostId()); } + + @PostMapping(value = "/work/empty/stock") + public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) { + List<Node> allEmptys = nodeService.selectList(new EntityWrapper<Node>() + .eq("type","3")); + return R.ok().add(allEmptys); + } + @RequestMapping("/work/move/start") + @ManagerAuth(memo = "搴撲綅绉昏浆") + public R locMoveStart(@RequestParam String sourceLocNo, + @RequestParam String targetLocNo) { + nodeService.locMove(sourceLocNo, targetLocNo, getUserId()); + return R.ok("绉诲簱鍚姩鎴愬姛"); + } + @RequestMapping(value = "/node/select/{id}/auth") + @ManagerAuth + public R getById(@PathVariable("id") String id) { + Node node = nodeService.selectOne(new EntityWrapper<Node>() + .eq("uuid",id)); + return R.ok(node); + } + } -- Gitblit v1.9.1