From 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期六, 21 九月 2024 10:32:42 +0800 Subject: [PATCH] 逻辑调整 --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 6eba1f6..a69fc16 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -15,6 +15,7 @@ import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.ManLocDetl; import com.zy.asrs.entity.Mat; +import com.zy.asrs.entity.StockStatisDTO; import com.zy.asrs.mapper.LocDetlMapper; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.ManLocDetlService; @@ -110,6 +111,8 @@ // param.remove("row"); // } // } + Object query_date = param.get("query_date"); + param.remove("query_date"); excludeTrash(param); convert(param, wrapper); allLike(LocDetl.class, param.keySet(), wrapper, condition); @@ -118,6 +121,12 @@ // wrapper.and() // .where("loc_no like '" +row +"%'"); // } + if (query_date!=null){ + if (query_date.toString().contains(" - ")) { + String[] dates = query_date.toString().split(" - "); + wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]); + } + } return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper)); } @@ -232,13 +241,7 @@ public R statis(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param) { - Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class)); - for (LocDetl locDetl : stockStatis.getRecords()) { - Mat mat = matService.selectByMatnr(locDetl.getMatnr()); - if (mat != null) { - locDetl.sync(mat); - } - } + Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class)); return R.ok().add(stockStatis); } -- Gitblit v1.9.1