From 3695eb9fa6062ef00e685835cf384c02e60f7b17 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 20 十二月 2024 13:39:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |    7 +++++--
 1 files changed, 5 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 b08fe2a..47cdf55 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -51,14 +51,17 @@
 
     // --------------------------------------------------
 
-    List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+    List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
+    List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
+    List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
+    List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp);
 
     Double queryStockAnfme(String matnr, String batch);
 
     List<StockVo> queryStockTotal();
 
 
-    Integer sum();
+    Double sum();
 
     List<LocDetl> unreason();
 

--
Gitblit v1.9.1