From cb1f6d4df311494908b6ca50ac9a7e1fbfd5861f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 04 七月 2024 15:53:09 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 6ab9215..fc6fe53 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -34,6 +37,11 @@
List<LocDetl> queryStockViewMerge(String locNo);
Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
+
+ Page<LocDetlAll> getWarningNumPage(Page<LocDetlAll> page);
+
+ Double sumAll();
Double getSumAnfme(String matnr);
@@ -48,6 +56,7 @@
// --------------------------------------------------
List<LocDetl> queryStock(String matnr, String batch,int owner);
+ List<LocDetl> queryStock2(String matnr, String batch);
Double queryStockAnfme(String matnr, String batch);
@@ -62,4 +71,14 @@
//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
+
+ List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+ List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO);
+
+ int selectAllCount(LocDetlDTO locDetlDTO);
+ int selectAllPymentcount(LocDetlDTO locDetlDTO);
+
+ List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO);
+
+ int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO);
}
--
Gitblit v1.9.1