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 b309742e1..cd2faa5d5 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
@@ -49,6 +49,10 @@ public class EmisTmsCostFee extends BaseEntity
     private String transType;
     /* 运输工具标识号 */
     private String transSignNo;
+    /* 供应商代码 */
+    private String supplierCode;
+    /* 供应商名称 */
+    private String supplierName;
     /* 发件地 */
     private String sendPlace;
     /* 目的地 */
@@ -56,7 +60,7 @@ public class EmisTmsCostFee extends BaseEntity
     /* 成本费 */
     private BigDecimal costFee;
     /* 交易时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tradeDate;
     /* 总票数 */
     private Integer sendPieceSum;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
index 6034de020..f918a145c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeMapper.xml
@@ -12,6 +12,8 @@
         <result property="splitType"    column="split_type"    />
         <result property="transType"    column="trans_type"    />
         <result property="transSignNo"    column="trans_sign_no"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
         <result property="sendPlace"    column="send_place"    />
         <result property="destPlace"    column="dest_place"    />
         <result property="costFee"    column="cost_fee"    />
@@ -36,7 +38,7 @@
     </resultMap>
 
     <sql id="selectEmisTmsCostFeeVo">
-        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee
+        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_cost_fee
     </sql>
 
     <select id="selectEmisTmsCostFeeList" parameterType="EmisTmsCostFee" resultMap="EmisTmsCostFeeResult">
@@ -50,6 +52,8 @@
             <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="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="costFee != null "> and cost_fee = #{costFee}</if>
@@ -93,6 +97,8 @@
            and split_type = #{splitType}
            and trans_type = #{transType}
            and trans_sign_no = #{transSignNo}
+           and supplier_code = #{supplierCode}
+           and supplier_name = #{supplierName}
            and send_place = #{sendPlace}
            and dest_place = #{destPlace}
            and cost_fee = #{costFee}
@@ -126,13 +132,13 @@
 	</select>
 
     <select id="selectEmisTmsCostFeeById" parameterType="Long" resultMap="EmisTmsCostFeeResult">
-        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_cost_fee a
         where a.id = #{id}
     </select>
 
     <select id="selectEmisTmsCostFeeByCostNo" parameterType="Long" resultMap="EmisTmsCostFeeResult">
-        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, cost_no, cost_name, fee_type, split_type, trans_type, trans_sign_no, supplier_code, supplier_name, send_place, dest_place, cost_fee, trade_date, send_piece_sum, piece_number, total_weight, total_volume, bl_confirm_center, real_piece_number, real_total_weight, real_total_volume, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_cost_fee a
         where a.cost_no = #{costNo}
     </select>
@@ -147,6 +153,8 @@
             <if test="splitType != null and splitType != ''">split_type,</if>
             <if test="transType != null and transType != ''">trans_type,</if>
             <if test="transSignNo != null and transSignNo != ''">trans_sign_no,</if>
+            <if test="supplierCode != null and supplierCode != ''">supplier_code,</if>
+            <if test="supplierName != null and supplierName != ''">supplier_name,</if>
             <if test="sendPlace != null and sendPlace != ''">send_place,</if>
             <if test="destPlace != null and destPlace != ''">dest_place,</if>
             <if test="costFee != null">cost_fee,</if>
@@ -185,6 +193,8 @@
             <if test="splitType != null and splitType != ''">#{splitType},</if>
             <if test="transType != null and transType != ''">#{transType},</if>
             <if test="transSignNo != null and transSignNo != ''">#{transSignNo},</if>
+            <if test="supplierCode != null and supplierCode != ''">#{supplierCode},</if>
+            <if test="supplierName != null and supplierName != ''">#{supplierName},</if>
             <if test="sendPlace != null and sendPlace != ''">#{sendPlace},</if>
             <if test="destPlace != null and destPlace != ''">#{destPlace},</if>
             <if test="costFee != null">#{costFee},</if>
@@ -226,6 +236,8 @@
             <if test="splitType != null and splitType != ''">split_type = #{splitType},</if>
             <if test="transType != null and transType != ''">trans_type = #{transType},</if>
             <if test="transSignNo != null and transSignNo != ''">trans_sign_no = #{transSignNo},</if>
+            <if test="supplierCode != null and supplierCode != ''">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null and supplierName != ''">supplier_name = #{supplierName},</if>
             <if test="sendPlace != null and sendPlace != ''">send_place = #{sendPlace},</if>
             <if test="destPlace != null and destPlace != ''">dest_place = #{destPlace},</if>
             <if test="costFee != null">cost_fee = #{costFee},</if>