From c825d67d652cc9fe3f476bab4da9fa6d1b709da7 Mon Sep 17 00:00:00 2001 From: tqs <56479841@qq.com> Date: 星期三, 02 十一月 2022 12:45:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'gitbit/bfasrs' into bfasrs --- src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index 5092c63..5c33af8 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; @Service("locDetlService") @@ -51,6 +52,12 @@ @Override public Page<LocDetl> getStockStatis(Page<LocDetl> page) { page.setRecords(baseMapper.getStockStatis(page.getCondition())); + page.setTotal(baseMapper.getStockStatisCount(page.getCondition())); + return page; + } + @Override + public Page<LocDetl> getStockStatis2(Page<LocDetl> page) { + page.setRecords(baseMapper.getStockStatis2(page.getCondition())); page.setTotal(baseMapper.getStockStatisCount(page.getCondition())); return page; } @@ -127,6 +134,16 @@ } } + @Override + public List<LocDetl> selectGroupPage(Map<String, Object> param, Integer curr, Integer limit) { + return this.baseMapper.selectGroupPage(param); + } + + @Override + public List<LocDetl> selectByLocNo(String locNo) { + return this.baseMapper.selectByLocNo(locNo); + } + @Override public LocDetl selectItem(String locNo, String matnr, String batch) { -- Gitblit v1.9.1