From 61d28206585b8746a9f1982cfe1dfc5deabde91a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 17 六月 2023 09:03:27 +0800
Subject: [PATCH] #库存统计更改为包括立库、平库

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 5bf12ab..77b1739 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
 import com.zy.asrs.entity.result.StockVo;
 
 import java.util.List;
@@ -15,7 +17,7 @@
 
     LocDetl selectItem(String locNo, String matnr, String batch);
 
-    Page<LocDetl> getStockOut(Page<LocDetl> page);
+    Page<LocDetl> getStockOut(Page<LocDetl> page,String view);
 
     /**
      * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
@@ -31,7 +33,12 @@
      */
     List<String> getSameDetlToday(String matnr, Integer start, Integer end);
 
+    List<LocDetl> queryStockViewMerge(String locNo);
+
     Page<LocDetl> getStockStatis(Page<LocDetl> page);
+    Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
+
+    Double sumAll();
 
     Double getSumAnfme(String matnr);
 
@@ -41,9 +48,12 @@
 
     Integer countLocNoNum(String locNo);
 
+    Integer queryStockViewMergeCount(int row,int lev);
+
     // --------------------------------------------------
 
-    List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+    List<LocDetl> queryStock(String matnr, String batch,int owner);
+    List<LocDetl> queryStock2(String matnr, String batch,int owner);
 
     Double queryStockAnfme(String matnr, String batch);
 
@@ -55,4 +65,13 @@
     List<LocDetl> unreason();
 
     Double getLocDetlSumQty(String locNo);
+
+    //閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
+    List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
+
+    List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+    List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO);
+
+    int selectAllCount(LocDetlDTO locDetlDTO);
+    int selectAllPymentcount(LocDetlDTO locDetlDTO);
 }

--
Gitblit v1.9.1