From 43fa9cb0e6b39ea47b8b670cc5b73c4445c28031 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Wed, 1 Jul 2026 14:12:52 +0800
Subject: [PATCH] =?UTF-8?q?qc=E4=B8=AD=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?partNo=E4=B8=AD=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/impl/SysFileServiceImpl.java  |  2 +-
 src/main/resources/mapper/oss/SysOssDao.xml           | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java
index c26e2afc..cc5b35ca 100644
--- a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java
@@ -110,7 +110,7 @@ public class SysFileServiceImpl implements SysFileService {
 
     @Override
     public List<SysOssEntity> getInspectionFile(SysOssEntity inData) {
-        List<SysOssEntity> files1 = sysOssDao.getSysFileByOrderRef2(inData);
+        List<SysOssEntity> files1 = getSysFileByOrderRef2(inData);
         // mes文件
         List<SysOssEntity> list = sysOssDao.searchPartSopListFather(inData);
         for (SysOssEntity p : list) {
diff --git a/src/main/resources/mapper/oss/SysOssDao.xml b/src/main/resources/mapper/oss/SysOssDao.xml
index a423b082..14cc0ffb 100644
--- a/src/main/resources/mapper/oss/SysOssDao.xml
+++ b/src/main/resources/mapper/oss/SysOssDao.xml
@@ -85,9 +85,14 @@
             <if test="orderRef1 != '' and orderRef1 != null ">
                 and order_ref1 = #{orderRef1}
             </if>
-            <if test="orderRef2 != '' and orderRef2 != null ">
-                and order_ref2 = #{orderRef2}
-            </if>
+            <choose>
+                <when test="orderRef2 != '' and orderRef2 != null and partNo != '' and partNo != null">
+                    and order_ref2 in (#{orderRef2}, #{partNo})
+                </when>
+                <when test="orderRef2 != '' and orderRef2 != null">
+                    and order_ref2 = #{orderRef2}
+                </when>
+            </choose>
             <if test="orderRef3 != '' and orderRef3 != null ">
                 and order_ref3 = #{orderRef3}
             </if>