From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 26 十二月 2024 13:50:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs --- src/main/java/com/zy/asrs/controller/NodeController.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java index 06abf93..6ae3b3c 100644 --- a/src/main/java/com/zy/asrs/controller/NodeController.java +++ b/src/main/java/com/zy/asrs/controller/NodeController.java @@ -15,6 +15,7 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.ManLocDetl; import com.zy.asrs.entity.Node; +import com.zy.asrs.entity.param.InitPakoutParam; import com.zy.asrs.entity.param.PakinParam; import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.NodeService; @@ -304,4 +305,31 @@ return nodeService.stockPakin(number, getUserId(), getHostId()); } + @RequestMapping("/work/stock/pakout") + @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