From d2756e02d9a9644ee20ced7d8d7ef7bf109126af Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 26 十月 2023 16:29:01 +0800 Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs --- src/main/java/com/zy/asrs/controller/MobileController.java | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index bae8839..d23ef8b 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -404,6 +404,42 @@ return R.ok("涓婃灦鎴愬姛"); } + @RequestMapping("/check/waitPakin/auth") + @ManagerAuth(memo = "鏌ヨ鎵樼洏鏄惁缁勬墭") + public R waitPakins(@RequestBody String barcode){ + return R.ok().add(waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode))); + } + + @RequestMapping("/untie/auth") + @ManagerAuth(memo = "瑙g粦") + public R untie(@RequestBody String barcode){ + List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode)); + for (WaitPakin waitPakin : waitPakins) { + if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", barcode))) { + return R.error("瑙g粦澶辫触"); + } + } + return R.ok().add(waitPakins); + } + + /* + 骞冲簱绉诲簱 + */ + @RequestMapping("/node/move/start") + public R nodeMoveStart(@RequestParam String sourceLocNo, @RequestParam String targetLocNo){ + return R.ok(); + } + + + /* + 骞冲簱搴撳尯鎷f枡淇℃伅 + */ + @RequestMapping("/node/order/pakout") + public R nodeOrderPakout(@RequestParam String locType){ + + + return R.ok(); + } } -- Gitblit v1.9.1