From 369a95b2d5ec2d1106b2e454336ae69d2bb171dd Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 20 四月 2022 14:54:13 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MobileController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 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 421c7d2..d5408bd 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -45,6 +45,8 @@ private WrkDetlService wrkDetlService; @Autowired private BasDevpService basDevpService; + @Autowired + private PackService packService; // 缁勬墭 ---------------------------------------------------------------------------------------------------- @@ -81,6 +83,28 @@ return R.ok("缁勬墭鎴愬姛"); } + + @RequestMapping("/pack/get/auth") + @ManagerAuth + public R packGet(@RequestParam String barcode){ + Pack pack = packService.selectByBarcode(barcode); + if (pack == null) { + return R.ok(); + } + if (pack.getSettle() == 1L) { + return R.ok().add(pack); + } + return R.ok("缁勬墭鎴愬姛"); + } + + @RequestMapping("/pack/comb/auth") + @ManagerAuth(memo = "缁勬墭") + public R packComb(@RequestBody CombParam combParam){ + mobileService.comb(combParam, getUserId()); + return R.ok("缁勬墭鎴愬姛"); + } + + // 鐩樼偣 ---------------------------------------------------------------------------------------------------- @RequestMapping("/checkDetl/auth") -- Gitblit v1.9.1