From 0d549f0bb889983d2c6ab569a1304ac0c3fba6f6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 05 十二月 2022 14:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylyasrs' into hylyasrs

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 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 94be71a..ce05fcb 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,25 +3,61 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.StockVo;
+import org.apache.ibatis.annotations.Param;
 
 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);
 
     /**
      * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
      */
-    boolean updateAnfme(Double anfme, String locNo, String matnr);
+    boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
 
     boolean updateLocNo(String newLocNo, String oldLocNo);
 
     /**
      * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
-     * @param matnr 鐗╂枡鍙�
+     * @param matnr 鍟嗗搧缂栧彿
      * @return locNo 搴撲綅鍙�
      */
-    List<String> getSameDetlToday(String matnr);
+    List<String> getSameDetlToday(String matnr, Integer start, Integer end);
 
+    Page<LocDetl> getStockStatis(Page<LocDetl> page);
+
+    Double getSumAnfme(String matnr);
+
+    List<LocDetl> selectPakoutByRule(String matnr);
+
+    List<LocDetl> getAsrsLocDetl(String matnr);
+
+    Integer countLocNoNum(String locNo);
+
+    // --------------------------------------------------
+
+    List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+
+    List<LocDetl> queryStockOther(String matnr, String batch, String orderNo, Set<String> locNos,String locNo);
+
+
+    Double queryStockAnfme(String matnr, String batch);
+
+    List<StockVo> queryStockTotal();
+
+
+    Integer sum();
+
+    List<LocDetl> unreason();
+
+    Double getLocDetlSumQty(String locNo);
+    LocDetl selectByMatnr(String matnr);
 }

--
Gitblit v1.9.1