diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
index 140f7e49d..a89de6151 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
@@ -33,21 +33,22 @@ import lombok.Data;
 public class EmisSpecialCalcWeight extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
-
     /* 序号 */
     private Long id;
     /* 产品类型代码 */
     private String prodCode;
 
+    /* 所属国家 */
+    private String country;
+    /* 所属线路 */
+    private String transLineCode;
     /* 启用状态 0-启用 1-停用 */
     private Integer status;
     /* 取重方式 */
     private String carryType;
     /* 起始重量 */
-    @JsonFormat(pattern = "00.00", shape = JsonFormat.Shape.STRING)
     private BigDecimal beginWeight;
     /* 结束重量 */
-    @JsonFormat(pattern = "00.00", shape = JsonFormat.Shape.STRING)
     private BigDecimal endWeight;
     /* 起始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -56,12 +57,13 @@ public class EmisSpecialCalcWeight extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endDate;
 
+
     //-------    扩展字段
     // 归属线路
-    private String lineCode;
     private String lineName;
     /* 产品类型名称 */
     private String prodName;
 
+    private String countryName;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
index 933810101..8b3f46c96 100644
--- a/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
@@ -7,6 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="EmisSpecialCalcWeight" id="EmisSpecialCalcWeightResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="prodCode"    column="prod_code"    />
+        <result property="prodName"    column="prod_name"    />
+        <result property="country"    column="country"    />
+        <result property="transLineCode"    column="trans_line_code"    />
         <result property="status"    column="status"    />
         <result property="carryType"    column="carry_type"    />
         <result property="beginWeight"    column="begin_weight"    />
@@ -15,26 +18,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endDate"    column="end_date"    />
 
 
-        <association property="lineCode"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineProdByProdCode"/>
-        <association property="lineName"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByProdCode"/>
+        <association property="lineName"    column="trans_line_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
         <association property="prodName"    column="prod_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProdNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
 
     </resultMap>
 
 
-
     <sql id="selectEmisSpecialCalcWeightVo">
-        select id, prod_code, prod_name, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_special_calc_weight
+        select id, prod_code, prod_name, country, trans_line_code, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_special_calc_weight
     </sql>
 
     <select id="selectEmisSpecialCalcWeightList" parameterType="EmisSpecialCalcWeight" resultMap="EmisSpecialCalcWeightResult">
         <include refid="selectEmisSpecialCalcWeightVo"/>
-        <where>  
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="prodCode != null  and prodCode != ''"> and prod_code=#{prodCode}</if>
+            <if test="prodCode != null  and prodCode != ''"> and prod_code = #{prodCode}</if>
             <if test="prodName != null  and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if>
+            <if test="country != null  and country != ''"> and country = #{country}</if>
+            <if test="transLineCode != null  and transLineCode != ''"> and trans_line_code = #{transLineCode}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="carryType != null  and carryType != ''"> and carry_type=#{carryType} </if>
+            <if test="carryType != null  and carryType != ''"> and carry_type = #{carryType}</if>
             <if test="beginWeight != null "> and begin_weight = #{beginWeight}</if>
             <if test="endWeight != null "> and end_weight = #{endWeight}</if>
             <if test="beginDate != null "> and begin_date = #{beginDate}</if>
@@ -42,16 +47,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
-            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and create_site = #{createSite}</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site = #{updateSite}</if>
         </where>
         order by create_time desc
     </select>
-  
+
     <select id="selectEmisSpecialCalcWeightById" parameterType="Long" resultMap="EmisSpecialCalcWeightResult">
-        select id, prod_code, prod_name, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, prod_code, prod_name, country, trans_line_code, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_special_calc_weight a
         where a.id = #{id}
     </select>
@@ -62,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="prodCode != null and prodCode != ''">prod_code,</if>
             <if test="prodName != null and prodName != ''">prod_name,</if>
+            <if test="country != null and country != ''">country,</if>
+            <if test="transLineCode != null and transLineCode != ''">trans_line_code,</if>
             <if test="status != null">status,</if>
             <if test="carryType != null and carryType != ''">carry_type,</if>
             <if test="beginWeight != null">begin_weight,</if>
@@ -82,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">#{id},</if>
             <if test="prodCode != null and prodCode != ''">#{prodCode},</if>
             <if test="prodName != null and prodName != ''">#{prodName},</if>
+            <if test="country != null and country != ''">#{country},</if>
+            <if test="transLineCode != null and transLineCode != ''">#{transLineCode},</if>
             <if test="status != null">#{status},</if>
             <if test="carryType != null and carryType != ''">#{carryType},</if>
             <if test="beginWeight != null">#{beginWeight},</if>
@@ -105,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="prodCode != null and prodCode != ''">prod_code = #{prodCode},</if>
             <if test="prodName != null and prodName != ''">prod_name = #{prodName},</if>
+            <if test="country != null and country != ''">country = #{country},</if>
+            <if test="transLineCode != null and transLineCode != ''">trans_line_code = #{transLineCode},</if>
             <if test="status != null">status = #{status},</if>
             <if test="carryType != null and carryType != ''">carry_type = #{carryType},</if>
             <if test="beginWeight != null">begin_weight = #{beginWeight},</if>
@@ -126,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <delete id="deleteEmisSpecialCalcWeightById" parameterType="Long">
-        delete from emis_special_calc_weight where id = #{id}
+        update emis_special_calc_weight set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisSpecialCalcWeightByIds" parameterType="String">
-        delete from emis_special_calc_weight where id in 
+        update emis_special_calc_weight set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -154,7 +167,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		limit 1
 	</select>
 
-
-
-
 </mapper>
\ No newline at end of file