From e7d1dba0af8112ea1a2640bcdb8025ff779b618f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 9 Jan 2026 14:00:59 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-09=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherInbound/controller/OtherInboundController.java        | 3 ++-
 .../modules/otherInbound/service/OtherInboundService.java      | 2 +-
 .../otherInbound/service/impl/OtherInboundServiceImpl.java     | 3 ++-
 src/main/resources/mapper/otherInbound/OtherInboundMapper.xml  | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java b/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
index df10c0c..cfefc91 100644
--- a/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
+++ b/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
@@ -68,6 +68,7 @@ public class OtherInboundController extends AbstractController {
             String buNo = (String) params.get("buNo");
             String warehouseId = (String) params.get("warehouseId");
             String site = (String) params.get("site");
+            String relatedOrderNo = (String) params.get("relatedOrderNo");
 
             if (inboundNo == null || inboundNo.trim().isEmpty()) {
                 return R.error("入库单号不能为空");
@@ -76,7 +77,7 @@ public class OtherInboundController extends AbstractController {
                 return R.error("仓库ID不能为空");
             }
 
-            Map<String, Object> result = otherInboundService.getInboundDetails(inboundNo, buNo, warehouseId, site);
+            Map<String, Object> result = otherInboundService.getInboundDetails(inboundNo, buNo, warehouseId, site, relatedOrderNo);
             if (result == null || result.isEmpty()) {
                 return R.error("未找到入库单详情");
             }
diff --git a/src/main/java/com/gaotao/modules/otherInbound/service/OtherInboundService.java b/src/main/java/com/gaotao/modules/otherInbound/service/OtherInboundService.java
index 6997808..411cbb7 100644
--- a/src/main/java/com/gaotao/modules/otherInbound/service/OtherInboundService.java
+++ b/src/main/java/com/gaotao/modules/otherInbound/service/OtherInboundService.java
@@ -29,7 +29,7 @@ public interface OtherInboundService {
      * @param site 站点
      * @return 入库单详情
      */
-    Map<String, Object> getInboundDetails(String inboundNo, String buNo, String warehouseId, String site);
+    Map<String, Object> getInboundDetails(String inboundNo, String buNo, String warehouseId, String site, String relatedOrderNo);
 
     /**
      * 验证物料与其他入库单是否匹配
diff --git a/src/main/java/com/gaotao/modules/otherInbound/service/impl/OtherInboundServiceImpl.java b/src/main/java/com/gaotao/modules/otherInbound/service/impl/OtherInboundServiceImpl.java
index 5d7301e..12e3ecb 100644
--- a/src/main/java/com/gaotao/modules/otherInbound/service/impl/OtherInboundServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/otherInbound/service/impl/OtherInboundServiceImpl.java
@@ -272,7 +272,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
     }
 
     @Override
-    public Map<String, Object> getInboundDetails(String inboundNo, String buNo, String warehouseId, String site) {
+    public Map<String, Object> getInboundDetails(String inboundNo, String buNo, String warehouseId, String site, String relatedOrderNo) {
         try {
             logger.info("获取其他入库单详情，入库单号: {}, 业务单元: {}, 仓库: {}, 站点: {}", inboundNo, buNo, warehouseId, site);
 
@@ -281,6 +281,7 @@ public class OtherInboundServiceImpl implements OtherInboundService {
             params.put("buNo", buNo);
             params.put("warehouseId", warehouseId);
             params.put("site", site);
+            params.put("relatedOrderNo", relatedOrderNo);
 
             Map<String, Object> details = otherInboundMapper.getInboundDetails(params);
             if (details != null) {
diff --git a/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml b/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml
index 40e72b4..161b8f8 100644
--- a/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml
+++ b/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml
@@ -57,6 +57,7 @@
         h.site = #{site}
         AND h.bu_no = #{buNo}
         AND h.order_no = #{inboundNo}
+        and d.related_order_no = #{relatedOrderNo}
         GROUP BY h.order_no, h.site, h.bu_no, h.required_inbound_date, d.related_order_no, d.related_order_line_no
     </select>