From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index c62ff89..fc6fe53 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -39,6 +39,8 @@
     Page<LocDetl> getStockStatis(Page<LocDetl> page);
     Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
 
+    Page<LocDetlAll> getWarningNumPage(Page<LocDetlAll> page);
+
     Double sumAll();
 
     Double getSumAnfme(String matnr);
@@ -54,7 +56,7 @@
     // --------------------------------------------------
 
     List<LocDetl> queryStock(String matnr, String batch,int owner);
-    List<LocDetl> queryStock2(String matnr, String batch,int owner);
+    List<LocDetl> queryStock2(String matnr, String batch);
 
     Double queryStockAnfme(String matnr, String batch);
 

--
Gitblit v1.9.1