diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
index da077b6c8..9ba4e5c5b 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
@@ -98,7 +98,7 @@ public class EmisWaybillAttachmentController extends EmisBaseController
         List<EmisWaybillAttachment> list=null;
         if(!StringUtils.isEmpty(billCode)){
             EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment();
-            emisWaybillAttachment.setBillCode(billCode);
+            emisWaybillAttachment.setBillCode(WaybillHelper.formatQueryValue(billCode));
             String[] billCodeSortList = emisWaybillAttachment.getBillCode().split(",");
             if(billCodeSortList.length>1){
                 emisWaybillAttachment.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index db9c468df..4735ff3f6 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -283,13 +283,15 @@
             <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 FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  -->
+            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
+                and `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=")">
+                <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
-             </if>
+            </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>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 60e9dc07e..4b1f3df41 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -28,16 +28,20 @@
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
-            <if test="billCode != null  and billCode != ''">
-             and bill_code in
-               <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
-                   #{item}
-               </foreach>
+            <!--
+              and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )
+               -->
 
-               <!--
-               and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )
-                -->
+            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
+                and `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="attachType != null  and attachType != ''"> and FIND_IN_SET(attach_type,#{attachType})</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>