From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/asrs/service/LocDetlService.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 5bf12ab..fc6fe53 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -15,7 +18,7 @@
LocDetl selectItem(String locNo, String matnr, String batch);
- Page<LocDetl> getStockOut(Page<LocDetl> page);
+ Page<LocDetl> getStockOut(Page<LocDetl> page,String view);
/**
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
@@ -31,7 +34,14 @@
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
+ List<LocDetl> queryStockViewMerge(String locNo);
+
Page<LocDetl> getStockStatis(Page<LocDetl> page);
+ Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page);
+
+ Page<LocDetlAll> getWarningNumPage(Page<LocDetlAll> page);
+
+ Double sumAll();
Double getSumAnfme(String matnr);
@@ -41,9 +51,12 @@
Integer countLocNoNum(String locNo);
+ Integer queryStockViewMergeCount(int row,int lev);
+
// --------------------------------------------------
- List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStock(String matnr, String batch,int owner);
+ List<LocDetl> queryStock2(String matnr, String batch);
Double queryStockAnfme(String matnr, String batch);
@@ -55,4 +68,17 @@
List<LocDetl> unreason();
Double getLocDetlSumQty(String locNo);
+
+ //閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
+ List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
+
+ List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+ List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO);
+
+ int selectAllCount(LocDetlDTO locDetlDTO);
+ int selectAllPymentcount(LocDetlDTO locDetlDTO);
+
+ List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO);
+
+ int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO);
}
--
Gitblit v1.9.1