From c78a960e4b93f5074cbed9cda38a0aba103bbec4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 02 二月 2023 10:57:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 5092c63..2488944 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")
@@ -54,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) {
@@ -80,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;
@@ -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