From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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 ef6ee1f..a874270 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -6,8 +6,12 @@
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
public interface LocDetlService extends IService<LocDetl> {
+
+ Page<LocDetl> getPage(Page<LocDetl> page);
LocDetl selectItem(String locNo, String matnr, String batch);
@@ -27,6 +31,14 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
+ /**
+ * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ * @param matnr 鍟嗗搧缂栧彿
+ * @param batch 鎵规鍙�
+ * @return locNo 搴撲綅鍙�
+ */
+ List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end);
+
Page<LocDetl> getStockStatis(Page<LocDetl> page);
Double getSumAnfme(String matnr);
@@ -39,10 +51,25 @@
// --------------------------------------------------
- List<LocDetl> queryStock(String matnr, String batch, String orderNo);
+ 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();
+
+ Double sum();
+
+ List<LocDetl> unreason();
+
+ Double getLocDetlSumQty(String locNo);
+
+ void updateMatTurn(String matnrOld,String matnr);
+
+ List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo);
+
+ List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo);
}
--
Gitblit v1.9.1