From df908abc9be603406c67d1474d160e3144da38cd Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 27 九月 2025 16:40:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk

---
 src/main/java/com/zy/asrs/service/LocDetlService.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 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 e498382..fa7f683 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,10 +3,16 @@
 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);
 
@@ -26,6 +32,11 @@
      */
     List<String> getSameDetlToday(String matnr, Integer start, Integer end);
 
+    /**
+     * 鑾峰彇鐩稿悓瑙勬牸璐х墿
+     */
+    List<String> getSameDetlList(String matnr);
+
     Page<LocDetl> getStockStatis(Page<LocDetl> page);
 
     Double getSumAnfme(String matnr);
@@ -38,8 +49,22 @@
 
     // --------------------------------------------------
 
-    List<LocDetl> queryStock(String matnr, String batch, String orderNo);
+    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);
+
+    LocDetl selectMatnrSpecs(String matnr, String specs, String locNo);
 }

--
Gitblit v1.9.1