From e24058037ecd9e05758333296d5fcdd95d94c496 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 07 五月 2022 23:14:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MobileController.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 79d5a80..55dc50c 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -108,7 +108,7 @@ // 鍑哄簱 --------------------------------------------------------------------------------------------------- @RequestMapping("/pakout/query/auth") - @ManagerAuth +// @ManagerAuth public R pakoutQuery(@RequestParam(required = false) String barcode, @RequestParam(required = false) Integer staNo, @RequestParam(required = false) String matnr){ @@ -121,19 +121,15 @@ } if (!Cools.isEmpty(matnr)) { if (!Cools.isEmpty(staNo)) { - List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).eq("wrk_sts", 14L)); - if (!Cools.isEmpty(wrkMasts)) { - WrkMast wrkMast = wrkMasts.get(0); - List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); - return R.ok().add(wrkDetls); - } + List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr); + return R.ok().add(wrkDetls); } } return R.ok(); } @RequestMapping("/pakout/confirm/auth") - @ManagerAuth +// @ManagerAuth @Transactional public R pakoutConfirm(@RequestBody List<WrkDetl> list) { if (Cools.isEmpty(list)) { -- Gitblit v1.9.1