From bcefacbe2e7a5c375b38c70065985498a3e0e3fe Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 01 十一月 2022 09:46:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 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 213eaad..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;
}
@@ -111,6 +118,32 @@
return this.baseMapper.unreason();
}
+ /**
+ * 閫氳繃鐗╂枡浠ｇ爜鑾峰彇搴撳瓨鎬绘暟閲�
+ * @param matnr
+ * @return
+ */
+ @Override
+ public Double selectSumByMatnr(String matnr) {
+ Double aDouble = this.baseMapper.selectSumByMatnr(matnr);
+ if (aDouble == null) {
+ return 0.0;
+ }else {
+ return aDouble;
+
+ }
+ }
+
+ @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