diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 87b5b9ab9..5b6347b2a 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -151,12 +151,13 @@
         <if test="scanManCode != null  and scanManCode != ''"> and scan_man_code=#{scanManCode}</if>
 
         <if test="params.beginScanDate != null and params.beginScanDate != ''">
-            and scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}
+            and  a.scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}
         </if>
         <if test="params.endScanDate != null and params.endScanDate != ''">
-            and scan_date <![CDATA[ <= ]]>  #{params.endScanDate}
+            and  a.scan_date <![CDATA[ <= ]]>  #{params.endScanDate}
         </if>
 
+
         <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
             and (
                 scan_site_code in (
@@ -196,10 +197,10 @@
 		limit 1
 	</select>
 
-    <!--    获取物流轨迹 -->
+    <!--    根据主单获取物流轨迹 -->
     <select id="selectTraceListByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
         <include refid="selectEmisTmsScanRecordVo"/>
-        where  del_flag='0' and bill_code=#{billCode}
+        where  del_flag='0' and main_bill_code = #{billCode}
         order by create_time desc
     </select>
 
@@ -218,7 +219,7 @@
 
             <if test="id != null "> and id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
-            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
 
             <if test="scanType != null  and scanType != ''"> and scan_type=#{scanType}</if>
             <if test="preOrNextStation != null  and preOrNextStation != ''"> and pre_or_next_station like concat('%', #{preOrNextStation}, '%')</if>
@@ -265,12 +266,14 @@
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
 
+
             <if test="params.beginScanDate != null and params.beginScanDate != ''">
-                    and scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}
+                and  scan_date <![CDATA[ >= ]]>  #{params.beginScanDate}
             </if>
             <if test="params.endScanDate != null and params.endScanDate != ''">
-                    and scan_date <![CDATA[ <= ]]>  #{params.endScanDate}
+                and  scan_date <![CDATA[ <= ]]>  #{params.endScanDate}
             </if>
+
             <if test="params.beginSignDate != null and params.beginSignDate != ''">
                 and sign_date <![CDATA[ >= ]]>  #{params.beginSignDate}
             </if>