From 0355ffdf65a1d3ac6202dbddd5b49f726b39bbad Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 二月 2025 08:31:01 +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..a874270 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,String temp1,String temp2);
+    List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
+    List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
+    List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
 
     Double queryStockAnfme(String matnr, String batch);
 
     List<StockVo> queryStockTotal();
 
 
-    Integer sum();
+    Double sum();
 
     List<LocDetl> unreason();
 

--
Gitblit v1.9.1