From 062323dcda647af8adf1bfce3c80e7a2483af204 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qlasrs-sxk' into qlasrs-sxk

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 44bdd07..dbd1958 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -8,6 +8,7 @@
 import com.zy.asrs.service.LocDetlService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -48,6 +49,10 @@
         return this.baseMapper.selectSameDetlToday(matnr, start, end);
     }
 
+    @Override
+    public List<String> getSameDetlList(String matnr) {
+        return this.baseMapper.getSameDetlList(matnr);
+    }
 
     @Override
     public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
@@ -79,6 +84,11 @@
     @Override
     public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
         return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+    }
+
+    @Override
+    public List<LocDetl> queryStockOther(String matnr, String batch, String orderNo, Set<String> locNos,String locNo) {
+        return this.baseMapper.queryStockOther(matnr, batch, orderNo, locNos,locNo);
     }
 
     @Override
@@ -116,4 +126,12 @@
     public Double getLocDetlSumQty(String locNo) {
         return this.baseMapper.selectLocDetlSumQty(locNo);
     }
+
+    public LocDetl selectByMatnr(String matnr) {
+        return this.baseMapper.selectByMatnr(matnr);
+    }
+    @Override
+    public LocDetl selectMatnrSpecs(String matnr, String specs, String locNo) {
+        return this.baseMapper.selectMatnrSpecs(matnr, specs, locNo);
+    }
 }

--
Gitblit v1.9.1