From 9c468fe6e597c5bb70d64872aa94835d49a60036 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 14 九月 2023 09:47:33 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/LocDetlService.java | 22 ++++++++++++++++++++-- 1 files changed, 20 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 47eb851..9d0c188 100644 --- a/src/main/java/com/zy/asrs/service/LocDetlService.java +++ b/src/main/java/com/zy/asrs/service/LocDetlService.java @@ -2,7 +2,10 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; +import com.core.common.R; import com.zy.asrs.entity.LocDetl; +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锛屽垯鍒犻櫎璁板綍 @@ -34,6 +37,9 @@ List<LocDetl> queryStockViewMerge(String locNo); Page<LocDetl> getStockStatis(Page<LocDetl> page); + Page<LocDetlAll> getStockStatisAll(Page<LocDetlAll> page); + + Double sumAll(); Double getSumAnfme(String matnr); @@ -47,7 +53,8 @@ // -------------------------------------------------- - 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,int owner); Double queryStockAnfme(String matnr, String batch); @@ -59,4 +66,15 @@ 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); + + String selectLocNoF(String locNo); } -- Gitblit v1.9.1