From 5e966ab720ffff2bd0fe55ffda7263606923732d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 02 二月 2023 10:58:03 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 3bee2dc..2488944 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -55,6 +55,12 @@
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;
+ }
@Override
public Double getSumAnfme(String matnr) {
@@ -81,7 +87,7 @@
List<LocDetl> result = new ArrayList<>();
List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
for (QueryStockPreDo preDo : preDos) {
- List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getBay());
+ List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
result.addAll(locDetls);
}
return result;
--
Gitblit v1.9.1