From ff6d68f7c7e9fb4fd7b884eb282aa5f9e1a5d0ba Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 16:21:47 +0800
Subject: [PATCH] 初步改完，接下来进行测试
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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..d04a603 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,29 +3,43 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.StockStatisDTO;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.param.StockOutParam;
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);
+ //LocDetl selectItem(String locNo, String matnr, String batch);
+
+ //LocDetl selectItem2(String locNo, String matnr);
+
+ LocDetl selectItem(String locNo, WrkDetl wrkDetl);
+
+ LocDetl selectItem(String locNo, StockOutParam.LocDetl locDetl);
Page<LocDetl> getStockOut(Page<LocDetl> page);
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
*/
- boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
+ boolean updateAnfme(Double anfme, String locNo, WrkDetl wrkDetl);
+ /**
+ * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
+ */
+ boolean updateAnfme(Double anfme, String locNo, LocDetl locDetl);
boolean updateLocNo(String newLocNo, String oldLocNo);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @return locNo 搴撲綅鍙�
*/
@@ -33,13 +47,14 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @param batch 鎵规鍙�
* @return locNo 搴撲綅鍙�
*/
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);
@@ -51,9 +66,13 @@
// --------------------------------------------------
- List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ //List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
- Double queryStockAnfme(String matnr, String batch);
+ List<LocDetl> queryStock(OrderDetl orderDetl);
+
+ //List<LocDetl> queryStockByModel(String model);
+
+ //Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
@@ -64,5 +83,9 @@
Double getLocDetlSumQty(String locNo);
- void updateMatTurn(String matnrOld,String matnr);
+ 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