From ac92d2777fc472ae766e2bd6209c70691fe5dc5b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 16:28:01 +0800
Subject: [PATCH] Merge branch 'mdqdasrs-auto' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 21 ++++++++++++++++++++-
1 files changed, 20 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 8afb979..aae59de 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.plugins.Page;
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;
@@ -33,9 +35,17 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
- List<LocDetl> queryStockViewMerge(String locNo);
+ List<LocDetl> queryStockViewMerge(String locNo,String zpallet,String matnr);
Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ 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);
@@ -51,6 +61,8 @@
List<LocDetl> queryStock(String matnr, String batch,int owner);
List<LocDetl> queryStock2(String matnr, String batch,int owner);
+
+ List<LocDetl> queryStock3(String matnr, String batch,int owner);
Double queryStockAnfme(String matnr, String batch);
@@ -71,4 +83,11 @@
int selectAllCount(LocDetlDTO locDetlDTO);
int selectAllPymentcount(LocDetlDTO locDetlDTO);
+
+ String selectLocNoF(String locNo);
+
+ List<LocDetlAll> selectOwnerAllAnfme();
+
+ List<String> getSameDetl(String matnr, String batch, String grade);
+
}
--
Gitblit v1.9.1