diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
index e21858ade..3c556178e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCostFeeController.java
@@ -11,6 +11,7 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -67,6 +68,19 @@ public class EmisTmsCostFeeController extends BaseController
     public TableDataInfo list(EmisTmsCostFee emisTmsCostFee)
     {
         startPage();
+
+        if(!StringUtils.isEmpty(emisTmsCostFee.getBillCode())){
+            emisTmsCostFee.setBillCode(WaybillHelper.formatQueryValue(emisTmsCostFee.getBillCode()));
+        }
+
+        if(!StringUtils.isEmpty(emisTmsCostFee.getBatchNo())){
+            emisTmsCostFee.setBatchNo(WaybillHelper.formatQueryValue(emisTmsCostFee.getBatchNo()));
+        }
+
+        if(!StringUtils.isEmpty(emisTmsCostFee.getTransSignNo())){
+            emisTmsCostFee.setTransSignNo(WaybillHelper.formatQueryValue(emisTmsCostFee.getTransSignNo()));
+        }
+
         List<EmisTmsCostFee> list = emisTmsCostFeeService.selectEmisTmsCostFeeList(emisTmsCostFee);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
index 1e5331c07..352e9a57f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsCostFee.java
@@ -116,6 +116,9 @@ public class EmisTmsCostFee extends BaseEntity
     private Date calcDate;
 
     // --- 扩展
+    // 用于根据运单号查询
+    private String billCode;
+
     // 关联单号
     private List<EmisTmsCostFeeRel> billRelList;
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
index e22d3deca..80e21d535 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
@@ -54,17 +54,17 @@
             <if test="id != null "> and id = #{id}</if>
             <if test="costNo != null  and costNo != ''"> and cost_no = #{costNo}</if>
             <if test="costName != null  and costName != ''"> and cost_name like concat('%', #{costName}, '%')</if>
-            <if test="batchNo != null  and batchNo != ''"> and batch_no like concat('%', #{batchNo}, '%')</if>
+            <if test="batchNo != null  and batchNo != ''"> and FIND_IN_SET(batch_no,#{batchNo}) </if>
             <if test="feeType != null  and feeType != ''"> and fee_type = #{feeType}</if>
             <if test="splitType != null  and splitType != ''"> and split_type = #{splitType}</if>
-            <if test="transType != null  and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
-            <if test="transSignNo != null  and transSignNo != ''"> and trans_sign_no like concat('%', #{transSignNo}, '%')</if>
-            <if test="supplierCode != null  and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
+            <if test="transType != null  and transType != ''"> and trans_type=#{transType}</if>
+            <if test="transSignNo != null  and transSignNo != ''"> and FIND_IN_SET(trans_sign_no,#{transSignNo})</if>
+            <if test="supplierCode != null  and supplierCode != ''"> and supplier_code=#{supplierCode} </if>
             <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
-            <if test="sendPlace != null  and sendPlace != ''"> and send_place like concat('%', #{sendPlace}, '%')</if>
-            <if test="destPlace != null  and destPlace != ''"> and dest_place like concat('%', #{destPlace}, '%')</if>
+            <if test="sendPlace != null  and sendPlace != ''"> and send_place=#{sendPlace}</if>
+            <if test="destPlace != null  and destPlace != ''"> and dest_place=#{destPlace}</if>
             <if test="costFee != null "> and cost_fee = #{costFee}</if>
-            <if test="billMonth != null  and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
+            <if test="billMonth != null  and billMonth != ''"> and bill_month=#{billMonth}</if>
             <if test="tradeDate != null "> and trade_date = #{tradeDate}</if>
             <if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if>
             <if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if>
@@ -96,7 +96,7 @@
 
             <if test="params.billCode != null and params.billCode != ''">
                 and exists (
-                    select 1 from emis_tms_cost_fee_rel brel where brel.cost_no=a.cost_no and FIND_IN_SET(brel.bill_code,#{params.billCode})
+                    select 1 from emis_tms_cost_fee_rel etcfl where etcfl.cost_no=a.cost_no and FIND_IN_SET(etcfl.bill_code,#{params.billCode})
                 )
             </if>