From b54da02fabfbddbee5e274a16a5a7d675258b390 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 4 Aug 2024 09:31:57 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisTmsScanRecordController.java    | 4 ----
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml    | 6 +++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 1c2827881..c7e9c76e7 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -263,10 +263,6 @@ public class EmisTmsScanRecordController extends EmisBaseController
 
         List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord);
 
-
-
-
-
         return getDataTable(list);
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 99ad5be0f..e7f0b6fea 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -801,8 +801,12 @@
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
             <if test="id != null "> and a.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 bill_code like concat('%', #{billCode}, '%') )
+            </if>
 
             <if test="custOrderId != null  and custOrderId != ''"> and cust_order_id=#{custOrderId}</if>
             <if test="billCodeSub != null  and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>