From 222faaec622c83f10dc0416d2683b974cc5900d4 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 04 二月 2023 15:35:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 6247c31..64b512f 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) {
@@ -79,9 +85,9 @@
     @Override
     public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
         List<LocDetl> result = new ArrayList<>();
-        List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr);
+        List<QueryStockPreDo> preDos = this.baseMapper.queryStockPre(matnr, batch);
         for (QueryStockPreDo preDo : preDos) {
-            List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, preDo.getNo(), preDo.getBay());
+            List<LocDetl> locDetls = this.baseMapper.queryStock(matnr, batch, preDo.getNo(), preDo.getOrderBy(), preDo.getBay());
             result.addAll(locDetls);
         }
         return result;
@@ -133,6 +139,11 @@
         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