From 11341e4c1a948b579828b6d45a7d274346f75074 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 14 九月 2023 14:02:29 +0800 Subject: [PATCH] #订单出库有小数时,优先出小数 --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index fc615fd..c5fab80 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -345,6 +345,7 @@ String locNo = String.valueOf(param.get("locNo")); String owner = String.valueOf(param.get("owner")); String matnr = String.valueOf(param.get("matnr")); + String payment = String.valueOf(param.get("payment")); if (!Cools.isEmpty(locNo) && !locNo.equals("null")) { locDetlDTO.setLocNo(locNo); } @@ -353,6 +354,9 @@ } if (!Cools.isEmpty(owner) && !owner.equals("null")) { locDetlDTO.setOwner(owner); + } + if (!Cools.isEmpty(payment) && !payment.equals("null")) { + locDetlDTO.setPayment(payment); } List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO); int count = locDetlService.selectAllPymentcount(locDetlDTO); @@ -398,8 +402,26 @@ Page<LocDetlAll> page = new Page<>(); page.setRecords(list); page.setTotal(count); + if (list.size()==0){ + locDetlDTO.setPageNumber(1); + list = locDetlService.selectAllOwner(locDetlDTO); + count = locDetlService.selectAllCount(locDetlDTO); + page = new Page<>(); + page.setRecords(list); + page.setTotal(count); + } return R.ok(page); } + @RequestMapping(value = "/locDetl/selectLocF") + @ManagerAuth + public R selectLocF(@RequestParam String locNo){ + String s = locDetlService.selectLocNoF(locNo); + if (s.equals("F")){ + return R.error("褰撳墠搴撲綅涓嶆槸绌哄簱浣�"); + } + return R.ok("褰撳墠搴撲綅鏄┖搴撲綅"); + } + } -- Gitblit v1.9.1