From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 12 +++++++++++-
1 files changed, 11 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 597adbf..792495d 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.WrkDetlLogAllViewParam;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
@@ -29,7 +30,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鍟嗗搧缂栧彿
+ * @param matnr 鍟嗗搧缂栧彿鍚屾鏂扮墿鏂�
* @return locNo 搴撲綅鍙�
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
@@ -40,6 +41,10 @@
Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
Page<LocDetlAll> getOwnerStatisAll(Page<LocDetlAll> page);
+ Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParam(Page<WrkDetlLogAllViewParam> page);
+ List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamE(Map<String, Object> map);
+ Page<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnr(Page<WrkDetlLogAllViewParam> page);
+ List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map);
Double sumAll();
Double getSumAnfme(String matnr);
@@ -80,4 +85,9 @@
int selectAllPymentcount(LocDetlDTO locDetlDTO);
String selectLocNoF(String locNo);
+
+ List<LocDetlAll> selectOwnerAllAnfme();
+
+ List<String> getSameDetl(String matnr, String batch, String grade);
+
}
--
Gitblit v1.9.1