From 77122f644a596b95bc4ee5b1bcedaeb8f05e7b33 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 03 六月 2023 12:45:58 +0800
Subject: [PATCH] 地图编辑器增加隐藏显示按钮

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java |   15 +++++++++++++--
 1 files changed, 13 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..45d64ec 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -31,6 +31,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);
 
@@ -54,11 +58,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 +73,9 @@
 
     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);
+
 }

--
Gitblit v1.9.1