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 |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index cd3db83..ce05fcb 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,17 +3,25 @@
 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);
 
@@ -30,4 +38,26 @@
 
     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