diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
index 298bb65e0..ce7369eba 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java
@@ -40,7 +40,7 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 批次名称 */
     private String batchName;
     /* 批次时间 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date batchDate;
     /* 所属线路 */
     private String transLineType;
@@ -52,19 +52,18 @@ public class EmisTmsSiteBatch extends BaseEntity
     private String transType;
     /* 起始网点 */
     private String startSiteCode;
-
+    /* 发件国家 */
+    private String sendCountry;
     /* 下一网点 */
     private String nextSiteCode;
     /* 航空单号 */
     private String airBilllNo;
     /* 预计出发时间 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date etd;
     /* 预计到达时间 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date eta;
-    /* 包数 */
-    private Integer packNum;
     /* 车牌号 */
     private String carNo;
     /* 船次号 */
@@ -73,13 +72,13 @@ public class EmisTmsSiteBatch extends BaseEntity
     private String clearanceResStatus;
     /* 报关资料状态 1-清关资料完整 2-清关资料异常 */
     private String declareResStatus;
-
-    /* 发出国家 */
-    private String sendCountry;
     /* 目的国家 */
     private String destCountry;
-
-    /* 总件数 */
+    /* 运输重量 */
+    private BigDecimal transWeight;
+    /* 包裹数 */
+    private Integer packNum;
+    /* 总票数 */
     private Integer totalParcelQty;
     /* 总运单数 */
     private Integer totalWaybillQty;
@@ -90,7 +89,6 @@ public class EmisTmsSiteBatch extends BaseEntity
     /* 操作员 */
     private String opMan;
 
-
 //-- 扩展数据 ------------------------
 
     private String transLineTypeName;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/kefu/RL7moorService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/kefu/RL7moorService.java
index 4bdab5893..fded3135b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/kefu/RL7moorService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/kefu/RL7moorService.java
@@ -99,6 +99,8 @@ public class RL7moorService {
         jObjPost.put("timeStamp",timeStr);
         jObjPost.put("module","webchat");
 
+
+
         log.debug("postUrl==>"+postUrl);
         log.debug("authorizationStr==>"+authorizationStr);
         log.debug("sig==>"+sigStr);
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
index dcc4f34ed..4e7ff5d7a 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
@@ -14,21 +14,20 @@
         <result property="batchType"    column="batch_type"    />
         <result property="transType"    column="trans_type"    />
 
-
         <result property="startSiteCode"    column="start_site_code"    />
+        <result property="sendCountry"    column="send_country"    />
         <result property="nextSiteCode"    column="next_site_code"    />
         <result property="airBilllNo"    column="air_billl_no"    />
         <result property="etd"    column="etd"    />
         <result property="eta"    column="eta"    />
-        <result property="packNum"    column="pack_num"    />
         <result property="carNo"    column="car_no"    />
         <result property="shipNo"    column="ship_no"    />
         <result property="clearanceResStatus"    column="clearance_res_status"    />
         <result property="declareResStatus"    column="declare_res_status"    />
 
-        <result property="sendCountry"    column="send_country"    />
         <result property="destCountry"    column="dest_country"    />
-
+        <result property="transWeight"    column="trans_weight"    />
+        <result property="packNum"    column="pack_num"    />
         <result property="totalParcelQty"    column="total_parcel_qty"    />
         <result property="totalWaybillQty"    column="total_waybill_qty"    />
         <result property="totalVolume"    column="total_volume"    />
@@ -49,7 +48,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, pack_num, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, 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, 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">
@@ -177,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, pack_num, car_no, ship_no, clearance_res_status, declare_res_status, dest_country, dest_country_name, 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, 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>
@@ -185,7 +184,6 @@
     <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>
@@ -199,13 +197,14 @@
             <if test="airBilllNo != null and airBilllNo != ''">air_billl_no,</if>
             <if test="etd != null">etd,</if>
             <if test="eta != null">eta,</if>
-            <if test="packNum != null">pack_num,</if>
             <if test="carNo != null and carNo != ''">car_no,</if>
             <if test="shipNo != null and shipNo != ''">ship_no,</if>
             <if test="clearanceResStatus != null and clearanceResStatus != ''">clearance_res_status,</if>
             <if test="declareResStatus != null and declareResStatus != ''">declare_res_status,</if>
             <if test="destCountry != null and destCountry != ''">dest_country,</if>
             <if test="destCountryName != null and destCountryName != ''">dest_country_name,</if>
+            <if test="transWeight != null">trans_weight,</if>
+            <if test="packNum != null">pack_num,</if>
             <if test="totalParcelQty != null">total_parcel_qty,</if>
             <if test="totalWaybillQty != null">total_waybill_qty,</if>
             <if test="totalVolume != null">total_volume,</if>
@@ -222,7 +221,6 @@
             <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>
@@ -236,13 +234,14 @@
             <if test="airBilllNo != null and airBilllNo != ''">#{airBilllNo},</if>
             <if test="etd != null">#{etd},</if>
             <if test="eta != null">#{eta},</if>
-            <if test="packNum != null">#{packNum},</if>
             <if test="carNo != null and carNo != ''">#{carNo},</if>
             <if test="shipNo != null and shipNo != ''">#{shipNo},</if>
             <if test="clearanceResStatus != null and clearanceResStatus != ''">#{clearanceResStatus},</if>
             <if test="declareResStatus != null and declareResStatus != ''">#{declareResStatus},</if>
             <if test="destCountry != null and destCountry != ''">#{destCountry},</if>
             <if test="destCountryName != null and destCountryName != ''">#{destCountryName},</if>
+            <if test="transWeight != null">#{transWeight},</if>
+            <if test="packNum != null">#{packNum},</if>
             <if test="totalParcelQty != null">#{totalParcelQty},</if>
             <if test="totalWaybillQty != null">#{totalWaybillQty},</if>
             <if test="totalVolume != null">#{totalVolume},</if>
@@ -276,13 +275,14 @@
             <if test="airBilllNo != null and airBilllNo != ''">air_billl_no = #{airBilllNo},</if>
             <if test="etd != null">etd = #{etd},</if>
             <if test="eta != null">eta = #{eta},</if>
-            <if test="packNum != null">pack_num = #{packNum},</if>
             <if test="carNo != null and carNo != ''">car_no = #{carNo},</if>
             <if test="shipNo != null and shipNo != ''">ship_no = #{shipNo},</if>
             <if test="clearanceResStatus != null and clearanceResStatus != ''">clearance_res_status = #{clearanceResStatus},</if>
             <if test="declareResStatus != null and declareResStatus != ''">declare_res_status = #{declareResStatus},</if>
             <if test="destCountry != null and destCountry != ''">dest_country = #{destCountry},</if>
             <if test="destCountryName != null and destCountryName != ''">dest_country_name = #{destCountryName},</if>
+            <if test="transWeight != null">trans_weight = #{transWeight},</if>
+            <if test="packNum != null">pack_num = #{packNum},</if>
             <if test="totalParcelQty != null">total_parcel_qty = #{totalParcelQty},</if>
             <if test="totalWaybillQty != null">total_waybill_qty = #{totalWaybillQty},</if>
             <if test="totalVolume != null">total_volume = #{totalVolume},</if>
@@ -302,11 +302,11 @@
     </update>
 
     <delete id="deleteEmisTmsSiteBatchById" parameterType="Long">
-        delete from emis_tms_site_batch where id = #{id}
+        update emis_tms_site_batch set del_flag='0' where id = #{id}
     </delete>
 
     <delete id="deleteEmisTmsSiteBatchByIds" parameterType="String">
-        delete from emis_tms_site_batch where id in
+        update emis_tms_site_batch set del_flag='0' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>