From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 0023ecf..7bdd881 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.StockStatisDTO;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -14,6 +15,8 @@
Page<LocDetl> getPage(Page<LocDetl> page);
LocDetl selectItem(String locNo, String matnr, String batch);
+
+ LocDetl selectItem2(String locNo, String matnr);
Page<LocDetl> getStockOut(Page<LocDetl> page);
@@ -31,7 +34,15 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
- Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ /**
+ * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ * @param matnr 鍟嗗搧缂栧彿
+ * @param batch 鎵规鍙�
+ * @return locNo 搴撲綅鍙�
+ */
+ List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end);
+
+ Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page);
Double getSumAnfme(String matnr);
@@ -45,6 +56,10 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStock(String sPgNO);
+
+ List<LocDetl> queryStockByModel(String model);
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
@@ -55,4 +70,10 @@
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