From 56a403da6ac577b6f1c1d8b88a3d4e8ff79c3b34 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 1 Apr 2025 09:14:00 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsScanRecordMapper.xml        | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 8c00724bb..4281bbcd4 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -476,17 +476,30 @@
         from emis_tms_scan_record a
         <where>
             del_flag='0'
-            <if test="billCode != null  and billCode != ''">
+            <if test="billCode != null  and billCode != '' and params.billCodeSortList==null ">
+                bill_code=#{billCode}
+            </if>
+
+            <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
                 and bill_code in
                 <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
+
             <if test="blSubBill != null and blSubBill == 1 ">
-                and main_bill_code in
-                <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+
+                <if test="billCode != null  and billCode != '' and params.billCodeSortList==null ">
+                    main_bill_code=#{billCode}
+                </if>
+
+                <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
+                    and main_bill_code in
+                    <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+
             </if>
 
         </where>