From 6f8cc73c7f986bc89ee1c6fc33c2a7d50cfa6c93 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 08:36:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |   11 +++++++++--
 1 files changed, 9 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..6ab9215 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -15,7 +15,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,6 +31,8 @@
      */
     List<String> getSameDetlToday(String matnr, Integer start, Integer end);
 
+    List<LocDetl> queryStockViewMerge(String locNo);
+
     Page<LocDetl> getStockStatis(Page<LocDetl> page);
 
     Double getSumAnfme(String matnr);
@@ -41,9 +43,11 @@
 
     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);
 
     Double queryStockAnfme(String matnr, String batch);
 
@@ -55,4 +59,7 @@
     List<LocDetl> unreason();
 
     Double getLocDetlSumQty(String locNo);
+
+    //閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
+    List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
 }

--
Gitblit v1.9.1