From 307d040ee3590d6dbe478bcae4a285e139d74005 Mon Sep 17 00:00:00 2001 From: Junjie <Junjie@qq.com> Date: 星期日, 12 五月 2024 11:28:09 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index ad11d86..c1bd3db 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -83,7 +83,11 @@ param.remove("modi_time"); } } - return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); + Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)); + if (stockOut.getRecords().size()==0){ + stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class)); + } + return R.ok(stockOut); } @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂 @@ -271,4 +275,13 @@ return R.ok(sum); } + @RequestMapping(value = "/stock/out/list/{locNo}/auth") + @ManagerAuth + public R stockOutList(@PathVariable("locNo") String locNo){ + if (Cools.isEmpty(locNo)){ + return R.error(); + } + return R.ok(locDetlService.selectLocDetl(locNo)); + } + } -- Gitblit v1.9.1