From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 11 ++++++++++-
1 files changed, 10 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 cb68d9c..3b298e3 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;
@@ -39,7 +40,7 @@
*/
List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end);
- Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page);
Double getSumAnfme(String matnr);
@@ -53,6 +54,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();
@@ -65,4 +70,8 @@
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