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/mapper/LocDetlMapper.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c33ab13..28b280d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -31,6 +33,10 @@
 
     Integer getStockOutPageCount(Map<String, Object> map);
 
+    List<LocDetl> getStockOutPage2(Map<String, Object> map);
+
+    Integer getStockOutPageCount2(Map<String, Object> map);
+
     @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
     int updateLocNo(String newLocNo, String oldLocNo);
 
@@ -40,6 +46,10 @@
     List<LocDetl> getStockStatis(Map<String, Object> map);
 
     Integer getStockStatisCount(Map<String, Object> map);
+
+    List<LocDetlAll> getStockStatisAll(Map<String, Object> map);
+
+    Integer getStockStatisCountAll(Map<String, Object> map);
 
     List<LocDetl> getStockStatisExcel();
 
@@ -54,11 +64,13 @@
 
     // -------------------------------------------------
 
-    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("owner")int owner);
+
+    List<LocDetl> queryStockViewMerge(@Param("locNo")String locNo);
 
     Double queryStockAnfme(String matnr, String batch);
 
-    List<StockVo> queryStockTotal();
+    List<StockVo> queryStockTotal(@Param("matnr")String matnr,@Param("batch")String batch);
 
 
     Integer sum();
@@ -67,4 +79,19 @@
 
     Double selectLocDetlSumQty(String locNo);
 
+    Integer queryStockViewMergeCount(@Param("row")int row,@Param("lev")int lev);
+
+    //閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
+    List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
+
+    List<LocDetl> queryStock2(String matnr, String batch, int owner);
+
+    List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+
+    int selectAllCount(LocDetlDTO locDetlDTO);
+
+    List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO);
+
+    int selectAllPymentcount(LocDetlDTO locDetlDTO);
+    Double sumAll();
 }

--
Gitblit v1.9.1