From dcb8a227ca5cd01ef760d80a1ca9453bb02a2f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Sat, 1 Nov 2025 15:14:05 +0800
Subject: [PATCH] =?UTF-8?q?agv=E4=BB=BB=E5=8A=A1=E5=A4=A7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/notify/NewIssureMapper.xml          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/notify/NewIssureMapper.xml b/src/main/resources/mapper/notify/NewIssureMapper.xml
index 75a706f..6790f66 100644
--- a/src/main/resources/mapper/notify/NewIssureMapper.xml
+++ b/src/main/resources/mapper/notify/NewIssureMapper.xml
@@ -202,16 +202,24 @@
     <select id="getItemNoByNotifyNoAndOrderNo" resultType="java.math.BigDecimal">
         SELECT top 1 item_no
         FROM SOIssueNotifyOrderList
-        WHERE site = #{site}
-        AND notify_no = #{notifyNo}
-        AND soorder_no = #{productionOrderNo}
+        <where>
+            and site = #{site}
+            AND notify_no = #{notifyNo}
+            <if test="productionOrderNo != null and productionOrderNo != ''">
+                AND soorder_no = #{productionOrderNo}
+            </if>
+        </where>
     </select>
     <select id="getFgPartNoWithNotifyNo" resultType="String">
         SELECT top 1 fgpart_no
         FROM SOIssueNotifyOrderList
-        WHERE site = #{site}
+        <where>
+        and site = #{site}
         AND notify_no = #{notifyNo}
-        AND soorder_no = #{productionOrderNo}
+            <if test="productionOrderNo != null and productionOrderNo != ''">
+                AND soorder_no = #{productionOrderNo}
+            </if>
+        </where>
     </select>
 
     <select id="getFgPartNoWithNotifyNoItemNo" resultType="String">