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

---
 .../mapper/productionPicking/ProductionPickingMapper.xml       | 3 ++-
 .../resources/mapper/purchaseReturn/PurchaseReturnMapper.xml   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml b/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml
index 851b523..50d91e3 100644
--- a/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml
+++ b/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml
@@ -20,11 +20,12 @@
             0 AS pickedQty
         from SOIssueNotifyHeader B
         INNER JOIN SOIssueNotifyOrderMaterialList a ON A.SITE = B.SITE AND A.NotifyNo = B.NotifyNo
+        INNER JOIN SOIssueNotifyOrderList D ON A.SITE = D.SITE AND A.NotifyNo = D.NotifyNo AND D.ItemNo = A.ItemNo
         where  a.site = #{site} and b.bu in (select bu_no from AccessBu where username = #{userName})
         AND b.Status = '待出库'
         AND a.warehouse_id = #{warehouseId}
         <if test="searchCode != null and searchCode != ''">
-            AND (b.NotifyNo LIKE CONCAT('%', #{searchCode}, '%') )
+            AND (b.NotifyNo LIKE CONCAT('%', #{searchCode}, '%') or D.SOOrderNo LIKE CONCAT('%', #{searchCode}, '%'))
         </if>
 <!--        <if test="searchCode == null or searchCode == ''">-->
 <!--            AND CONVERT(DATE, b.NotifyDate) = CONVERT(DATE, GETDATE())-->
diff --git a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
index 7e9ba3e..f9a50f8 100644
--- a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
+++ b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
@@ -177,7 +177,7 @@
         <if test="searchCode != null and searchCode != ''">
             AND (
                 h.order_no LIKE CONCAT('%', #{searchCode}, '%')
-                OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
+                OR d.related_order_no LIKE CONCAT('%', #{searchCode}, '%')
             )
         </if>
         GROUP BY h.site, h.order_no, h.bu_no, h.customer_id, C.SupplierName, h.required_outbound_date, D.related_order_no, D.related_order_line_no, D.part_no, D.part_desc