From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库: 	显示在库信息,入库完成后显示成功入库的包数 	订单出库页面显示剩余待检包数 (PDA) 	未查询到的提示改为显示物料实际状态 	拣货单已完成,单据未完成 ✔ 	单据数量字段显示变更 ✔ 	拣货单按实际操作时间降序排序 ✔ 	拣货单明细导出 ✔ 	拣货单显示创建时间与操作时间 ✔

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 7473a64..fc6fe53 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,16 +3,22 @@
 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;
+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);
 
-    Page<LocDetl> getStockOut(Page<LocDetl> page);
+    Page<LocDetl> getStockOut(Page<LocDetl> page,String view);
 
     /**
      * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
@@ -28,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);
 
@@ -38,17 +51,34 @@
 
     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);
 
-    List<StockVo> queryStockTotal();
+    List<StockVo> queryStockTotal(StockVo stockVo);
 
 
     Integer sum();
 
     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