From bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期二, 26 九月 2023 15:08:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6 --- src/main/java/com/zy/asrs/controller/MobileController.java | 11 +++++++++++ 1 files changed, 11 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 9f3ebe1..01c6d20 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -1,6 +1,7 @@ package com.zy.asrs.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.annotations.ManagerAuth; import com.core.common.Cools; import com.core.common.R; @@ -402,4 +403,14 @@ mobileService.adjustNew(combParam, Boolean.TRUE, getUserId()); return R.ok("琛ヨ揣鎴愬姛"); } + + @RequestMapping("/pick/auth") + @ManagerAuth(memo = "鎷f枡") + public synchronized R pickAuth(@RequestBody String barcode){ + WrkMast wrkMast = wrkMastService.selectByBarcode(barcode); + List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); + //WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode)); + //List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); + return R.ok().add(wrkDetls); + } } -- Gitblit v1.9.1