From cffbaec750882dd7f4d112d7c735d247e2a961a7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 10 十一月 2023 13:32:50 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 4214d81..597adbf 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -2,7 +2,10 @@
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
+import com.core.common.R;
 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;
@@ -31,9 +34,13 @@
      */
     List<String> getSameDetlToday(String matnr, Integer start, Integer end);
 
-    List<LocDetl> queryStockViewMerge(String locNo);
+    List<LocDetl> queryStockViewMerge(String locNo,String zpallet,String matnr);
 
     Page<LocDetl> getStockStatis(Page<LocDetl> page);
+    Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
+    Page<LocDetlAll> getOwnerStatisAll(Page<LocDetlAll> page);
+
+    Double sumAll();
 
     Double getSumAnfme(String matnr);
 
@@ -50,6 +57,8 @@
     List<LocDetl> queryStock(String matnr, String batch,int owner);
     List<LocDetl> queryStock2(String matnr, String batch,int owner);
 
+    List<LocDetl> queryStock3(String matnr, String batch,int owner);
+
     Double queryStockAnfme(String matnr, String batch);
 
     List<StockVo> queryStockTotal(StockVo stockVo);
@@ -63,4 +72,12 @@
 
     //閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
     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);
+
+    String selectLocNoF(String locNo);
 }

--
Gitblit v1.9.1