diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index 31c54e897..816f192b2 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -49,7 +49,7 @@
     </resultMap>
 
     <sql id="selectEmisTmsSiteBatchVo">
-        select id, batch_no, batch_name, batch_date, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch
+        select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_site_batch
     </sql>
 
     <select id="selectEmisTmsSiteBatchList" parameterType="EmisTmsSiteBatch" resultMap="EmisTmsSiteBatchResult">
@@ -68,6 +68,8 @@
             <if test="sendCountry != null  and sendCountry != ''"> and send_country=#{sendCountry}</if>
             <if test="nextSiteCode != null  and nextSiteCode != ''"> and next_site_code=#{nextSiteCode}</if>
             <if test="airBilllNo != null  and airBilllNo != ''"> and air_billl_no=#{airBilllNo}</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="etd != null "> and etd = #{etd}</if>
             <if test="eta != null "> and eta = #{eta}</if>
             <if test="packNum != null "> and pack_num = #{packNum}</if>
@@ -174,7 +176,7 @@
 	</select>
 
     <select id="selectEmisTmsSiteBatchById" parameterType="Long" resultMap="EmisTmsSiteBatchResult">
-        select id, batch_no, batch_name, batch_date, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, batch_no, batch_name, batch_date, supplier_code, supplier_name, trans_line_type, product_type, batch_type, trans_type, start_site_code, send_country, next_site_code, air_billl_no, etd, eta, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, trans_weight, pack_num, total_parcel_qty, total_waybill_qty, total_volume, total_weight, op_man, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_site_batch a
         where a.id = #{id}
     </select>
@@ -182,9 +184,12 @@
     <insert id="insertEmisTmsSiteBatch" parameterType="EmisTmsSiteBatch" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_site_batch
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="batchNo != null and batchNo != ''">batch_no,</if>
             <if test="batchName != null and batchName != ''">batch_name,</if>
             <if test="batchDate != null">batch_date,</if>
+            <if test="supplierCode != null and supplierCode != ''">supplier_code,</if>
+            <if test="supplierName != null and supplierName != ''">supplier_name,</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type,</if>
             <if test="productType != null and productType != ''">product_type,</if>
             <if test="batchType != null and batchType != ''">batch_type,</if>
@@ -219,9 +224,12 @@
             <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="batchNo != null and batchNo != ''">#{batchNo},</if>
             <if test="batchName != null and batchName != ''">#{batchName},</if>
             <if test="batchDate != null">#{batchDate},</if>
+            <if test="supplierCode != null and supplierCode != ''">#{supplierCode},</if>
+            <if test="supplierName != null and supplierName != ''">#{supplierName},</if>
             <if test="transLineType != null and transLineType != ''">#{transLineType},</if>
             <if test="productType != null and productType != ''">#{productType},</if>
             <if test="batchType != null and batchType != ''">#{batchType},</if>
@@ -263,6 +271,8 @@
             <if test="batchNo != null and batchNo != ''">batch_no = #{batchNo},</if>
             <if test="batchName != null and batchName != ''">batch_name = #{batchName},</if>
             <if test="batchDate != null">batch_date = #{batchDate},</if>
+            <if test="supplierCode != null and supplierCode != ''">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null and supplierName != ''">supplier_name = #{supplierName},</if>
             <if test="transLineType != null and transLineType != ''">trans_line_type = #{transLineType},</if>
             <if test="productType != null and productType != ''">product_type = #{productType},</if>
             <if test="batchType != null and batchType != ''">batch_type = #{batchType},</if>