diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
index 76bad37b3..460bd8e2a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisGoods.java
@@ -36,7 +36,7 @@ public class EmisGoods extends BaseEntity
     /* 序号 */
     private Long id;
     /* 货物编号 */
-    private String goodsSn;
+    private String goodsCode;
     /* 货物名称 */
     private String goodsName;
     /* 货物英文名称 */
@@ -49,42 +49,44 @@ public class EmisGoods extends BaseEntity
     private String goodsModel;
     /* 条码 */
     private String barcode;
-    /* 原产国 */
-    private String orginalNation;
+    /* 原产地 */
+    private String nationArea;
     /* 图片地址 */
     private String picUrl;
-    /* 归属客户 */
-    private String ownerId;
+    /* 归属客户代码 */
+    private String ownerCode;
     /* 是否实物 0-否 1-是 */
     private Integer isRealGoods;
     /* 是否大类 0-否 1-是 */
     private Integer isBigCat;
-    /* 品牌编号 */
-    private String brandId;
     /* 品牌名称 */
     private String brand;
-    /* 单净重 */
-    private String netWeight;
+    /* 材质 */
+    private String material;
     /* 单毛重 */
-    private String grossWeight;
+    private BigDecimal grossWeight;
+    /* 单净重 */
+    private BigDecimal netWeight;
     /* 单件体积 */
     private String singleVolume;
     /* 单件长 */
-    private Double singleLength;
+    private BigDecimal singleLength;
     /* 单件宽 */
-    private Double singleWidth;
+    private BigDecimal singleWidth;
     /* 单件高 */
-    private Double singleHeight;
+    private BigDecimal singleHeight;
     /* 箱件数 */
     private Integer pkgPcs;
     /* 箱体积 */
-    private String pkgVolume;
+    private BigDecimal pkgVolume;
     /* 箱长 */
-    private Double pkgLength;
+    private BigDecimal pkgLength;
     /* 箱宽 */
-    private Double pkgWidth;
+    private BigDecimal pkgWidth;
     /* 箱高 */
-    private Double pkgHeight;
+    private BigDecimal pkgHeight;
+    /* 行邮税号 */
+    private String taxNo;
     /* 海关编码 */
     private String hsCode;
     /* 商检编号 */
@@ -96,9 +98,9 @@ public class EmisGoods extends BaseEntity
     /* 法2 */
     private String unit2;
     /* 价格 */
-    private String price;
+    private BigDecimal price;
     /* 币种 */
-    private String currencyType;
+    private String currency;
     /* 适用标准国别 */
     private String ruleNation;
     /* 生产企业 */
@@ -141,5 +143,9 @@ public class EmisGoods extends BaseEntity
     private String portCode;
     /* 排序 */
     private Integer orderNum;
+    /* 创建站点 */
+    private String createSite;
+    /* 更新站点 */
+    private String updateSite;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
index 063e0eabe..f3ea1d965 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
@@ -31,6 +31,7 @@ import lombok.Data;
 @Data
 public class EmisWaybillCargo extends BaseEntity
 {
+
     private static final long serialVersionUID = 1L;
 
     /* id */
diff --git a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
index e96d29817..55695d981 100644
--- a/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisGoodsMapper.xml
@@ -6,22 +6,22 @@
 
     <resultMap type="EmisGoods" id="EmisGoodsResult">
         <result property="id"    column="id"    />
-        <result property="goodsSn"    column="goods_sn"    />
+        <result property="goodsCode"    column="goods_code"    />
         <result property="goodsName"    column="goods_name"    />
         <result property="goodsNameEn"    column="goods_name_en"    />
         <result property="goodsCat"    column="goods_cat"    />
         <result property="goodsType"    column="goods_type"    />
         <result property="goodsModel"    column="goods_model"    />
         <result property="barcode"    column="barcode"    />
-        <result property="orginalNation"    column="orginal_nation"    />
+        <result property="nationArea"    column="nation_area"    />
         <result property="picUrl"    column="pic_url"    />
-        <result property="ownerId"    column="owner_id"    />
+        <result property="ownerCode"    column="owner_code"    />
         <result property="isRealGoods"    column="is_real_goods"    />
         <result property="isBigCat"    column="is_big_cat"    />
-        <result property="brandId"    column="brand_id"    />
         <result property="brand"    column="brand"    />
-        <result property="netWeight"    column="net_weight"    />
+        <result property="material"    column="material"    />
         <result property="grossWeight"    column="gross_weight"    />
+        <result property="netWeight"    column="net_weight"    />
         <result property="singleVolume"    column="single_volume"    />
         <result property="singleLength"    column="single_length"    />
         <result property="singleWidth"    column="single_width"    />
@@ -31,13 +31,14 @@
         <result property="pkgLength"    column="pkg_length"    />
         <result property="pkgWidth"    column="pkg_width"    />
         <result property="pkgHeight"    column="pkg_height"    />
+        <result property="taxNo"    column="tax_no"    />
         <result property="hsCode"    column="hs_code"    />
         <result property="isCode"    column="is_code"    />
         <result property="unit"    column="unit"    />
         <result property="unit1"    column="unit1"    />
         <result property="unit2"    column="unit2"    />
         <result property="price"    column="price"    />
-        <result property="currencyType"    column="currency_type"    />
+        <result property="currency"    column="currency"    />
         <result property="ruleNation"    column="rule_nation"    />
         <result property="manufEnterprise"    column="manuf_enterprise"    />
         <result property="ebcCode"    column="ebc_code"    />
@@ -66,48 +67,51 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
     </resultMap>
 
     <sql id="selectEmisGoodsVo">
-        select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, pic_url, owner_id, is_real_goods, is_big_cat, brand_id, brand, net_weight, gross_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, hs_code, is_code, unit, unit1, unit2, price, currency_type, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_goods
+        select id, goods_code, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, nation_area, pic_url, owner_code, is_real_goods, is_big_cat, brand, material, gross_weight, net_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, tax_no, hs_code, is_code, unit, unit1, unit2, price, currency, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_goods
     </sql>
 
     <select id="selectEmisGoodsList" parameterType="EmisGoods" resultMap="EmisGoodsResult">
         <include refid="selectEmisGoodsVo"/>
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="goodsSn != null  and goodsSn != ''"> and goods_sn like concat('%', #{goodsSn}, '%')</if>
+            <if test="goodsCode != null  and goodsCode != ''"> and goods_code like concat('%', #{goodsCode}, '%')</if>
             <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
             <if test="goodsNameEn != null  and goodsNameEn != ''"> and goods_name_en like concat('%', #{goodsNameEn}, '%')</if>
             <if test="goodsCat != null  and goodsCat != ''"> and goods_cat like concat('%', #{goodsCat}, '%')</if>
             <if test="goodsType != null  and goodsType != ''"> and goods_type like concat('%', #{goodsType}, '%')</if>
             <if test="goodsModel != null  and goodsModel != ''"> and goods_model like concat('%', #{goodsModel}, '%')</if>
             <if test="barcode != null  and barcode != ''"> and barcode like concat('%', #{barcode}, '%')</if>
-            <if test="orginalNation != null  and orginalNation != ''"> and orginal_nation like concat('%', #{orginalNation}, '%')</if>
+            <if test="nationArea != null  and nationArea != ''"> and nation_area like concat('%', #{nationArea}, '%')</if>
             <if test="picUrl != null  and picUrl != ''"> and pic_url like concat('%', #{picUrl}, '%')</if>
-            <if test="ownerId != null  and ownerId != ''"> and owner_id like concat('%', #{ownerId}, '%')</if>
+            <if test="ownerCode != null  and ownerCode != ''"> and owner_code like concat('%', #{ownerCode}, '%')</if>
             <if test="isRealGoods != null "> and is_real_goods = #{isRealGoods}</if>
             <if test="isBigCat != null "> and is_big_cat = #{isBigCat}</if>
-            <if test="brandId != null  and brandId != ''"> and brand_id like concat('%', #{brandId}, '%')</if>
             <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
-            <if test="netWeight != null  and netWeight != ''"> and net_weight like concat('%', #{netWeight}, '%')</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight like concat('%', #{grossWeight}, '%')</if>
+            <if test="material != null  and material != ''"> and material like concat('%', #{material}, '%')</if>
+            <if test="grossWeight != null "> and gross_weight like concat('%', #{grossWeight}, '%')</if>
+            <if test="netWeight != null "> and net_weight like concat('%', #{netWeight}, '%')</if>
             <if test="singleVolume != null  and singleVolume != ''"> and single_volume like concat('%', #{singleVolume}, '%')</if>
             <if test="singleLength != null "> and single_length = #{singleLength}</if>
             <if test="singleWidth != null "> and single_width = #{singleWidth}</if>
             <if test="singleHeight != null "> and single_height = #{singleHeight}</if>
             <if test="pkgPcs != null "> and pkg_pcs = #{pkgPcs}</if>
-            <if test="pkgVolume != null  and pkgVolume != ''"> and pkg_volume like concat('%', #{pkgVolume}, '%')</if>
+            <if test="pkgVolume != null "> and pkg_volume like concat('%', #{pkgVolume}, '%')</if>
             <if test="pkgLength != null "> and pkg_length = #{pkgLength}</if>
             <if test="pkgWidth != null "> and pkg_width = #{pkgWidth}</if>
             <if test="pkgHeight != null "> and pkg_height = #{pkgHeight}</if>
+            <if test="taxNo != null  and taxNo != ''"> and tax_no like concat('%', #{taxNo}, '%')</if>
             <if test="hsCode != null  and hsCode != ''"> and hs_code like concat('%', #{hsCode}, '%')</if>
             <if test="isCode != null  and isCode != ''"> and is_code like concat('%', #{isCode}, '%')</if>
             <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
             <if test="unit1 != null  and unit1 != ''"> and unit1 like concat('%', #{unit1}, '%')</if>
             <if test="unit2 != null  and unit2 != ''"> and unit2 like concat('%', #{unit2}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
-            <if test="currencyType != null  and currencyType != ''"> and currency_type like concat('%', #{currencyType}, '%')</if>
+            <if test="price != null "> and price like concat('%', #{price}, '%')</if>
+            <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
             <if test="ruleNation != null  and ruleNation != ''"> and rule_nation like concat('%', #{ruleNation}, '%')</if>
             <if test="manufEnterprise != null  and manufEnterprise != ''"> and manuf_enterprise like concat('%', #{manufEnterprise}, '%')</if>
             <if test="ebcCode != null  and ebcCode != ''"> and ebc_code like concat('%', #{ebcCode}, '%')</if>
@@ -136,12 +140,14 @@
             <if test="createTime != null "> and create_time = #{createTime}</if>
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
-        order by order_num desc,create_time desc
+        order by create_time desc
     </select>
 
     <select id="selectEmisGoodsById" parameterType="Long" resultMap="EmisGoodsResult">
-        select id, goods_sn, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, orginal_nation, pic_url, owner_id, is_real_goods, is_big_cat, brand_id, brand, net_weight, gross_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, hs_code, is_code, unit, unit1, unit2, price, currency_type, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
+        select id, goods_code, goods_name, goods_name_en, goods_cat, goods_type, goods_model, barcode, nation_area, pic_url, owner_code, is_real_goods, is_big_cat, brand, material, gross_weight, net_weight, single_volume, single_length, single_width, single_height, pkg_pcs, pkg_volume, pkg_length, pkg_width, pkg_height, tax_no, hs_code, is_code, unit, unit1, unit2, price, currency, rule_nation, manuf_enterprise, ebc_code, ciq_code, function, ingredients, purpose, product_validity, cebp_mode, supplier, serial_number, status, status_message, goods_sn2, goods_no2, lic_no, material_path, pd, sale_url, port_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_goods a
         where a.id = #{id}
     </select>
@@ -150,38 +156,39 @@
         insert into emis_goods
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="goodsSn != null and goodsSn != ''">goods_sn,</if>
+            <if test="goodsCode != null and goodsCode != ''">goods_code,</if>
             <if test="goodsName != null and goodsName != ''">goods_name,</if>
             <if test="goodsNameEn != null and goodsNameEn != ''">goods_name_en,</if>
             <if test="goodsCat != null and goodsCat != ''">goods_cat,</if>
             <if test="goodsType != null and goodsType != ''">goods_type,</if>
             <if test="goodsModel != null and goodsModel != ''">goods_model,</if>
             <if test="barcode != null and barcode != ''">barcode,</if>
-            <if test="orginalNation != null and orginalNation != ''">orginal_nation,</if>
+            <if test="nationArea != null and nationArea != ''">nation_area,</if>
             <if test="picUrl != null and picUrl != ''">pic_url,</if>
-            <if test="ownerId != null and ownerId != ''">owner_id,</if>
+            <if test="ownerCode != null and ownerCode != ''">owner_code,</if>
             <if test="isRealGoods != null">is_real_goods,</if>
             <if test="isBigCat != null">is_big_cat,</if>
-            <if test="brandId != null and brandId != ''">brand_id,</if>
             <if test="brand != null and brand != ''">brand,</if>
-            <if test="netWeight != null and netWeight != ''">net_weight,</if>
-            <if test="grossWeight != null and grossWeight != ''">gross_weight,</if>
+            <if test="material != null and material != ''">material,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="netWeight != null">net_weight,</if>
             <if test="singleVolume != null and singleVolume != ''">single_volume,</if>
             <if test="singleLength != null">single_length,</if>
             <if test="singleWidth != null">single_width,</if>
             <if test="singleHeight != null">single_height,</if>
             <if test="pkgPcs != null">pkg_pcs,</if>
-            <if test="pkgVolume != null and pkgVolume != ''">pkg_volume,</if>
+            <if test="pkgVolume != null">pkg_volume,</if>
             <if test="pkgLength != null">pkg_length,</if>
             <if test="pkgWidth != null">pkg_width,</if>
             <if test="pkgHeight != null">pkg_height,</if>
+            <if test="taxNo != null and taxNo != ''">tax_no,</if>
             <if test="hsCode != null and hsCode != ''">hs_code,</if>
             <if test="isCode != null and isCode != ''">is_code,</if>
             <if test="unit != null and unit != ''">unit,</if>
             <if test="unit1 != null and unit1 != ''">unit1,</if>
             <if test="unit2 != null and unit2 != ''">unit2,</if>
-            <if test="price != null and price != ''">price,</if>
-            <if test="currencyType != null and currencyType != ''">currency_type,</if>
+            <if test="price != null">price,</if>
+            <if test="currency != null and currency != ''">currency,</if>
             <if test="ruleNation != null and ruleNation != ''">rule_nation,</if>
             <if test="manufEnterprise != null and manufEnterprise != ''">manuf_enterprise,</if>
             <if test="ebcCode != null and ebcCode != ''">ebc_code,</if>
@@ -210,41 +217,44 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="createSite != null and createSite != ''">create_site,</if>
+            <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="goodsSn != null and goodsSn != ''">#{goodsSn},</if>
+            <if test="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
             <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
             <if test="goodsNameEn != null and goodsNameEn != ''">#{goodsNameEn},</if>
             <if test="goodsCat != null and goodsCat != ''">#{goodsCat},</if>
             <if test="goodsType != null and goodsType != ''">#{goodsType},</if>
             <if test="goodsModel != null and goodsModel != ''">#{goodsModel},</if>
             <if test="barcode != null and barcode != ''">#{barcode},</if>
-            <if test="orginalNation != null and orginalNation != ''">#{orginalNation},</if>
+            <if test="nationArea != null and nationArea != ''">#{nationArea},</if>
             <if test="picUrl != null and picUrl != ''">#{picUrl},</if>
-            <if test="ownerId != null and ownerId != ''">#{ownerId},</if>
+            <if test="ownerCode != null and ownerCode != ''">#{ownerCode},</if>
             <if test="isRealGoods != null">#{isRealGoods},</if>
             <if test="isBigCat != null">#{isBigCat},</if>
-            <if test="brandId != null and brandId != ''">#{brandId},</if>
             <if test="brand != null and brand != ''">#{brand},</if>
-            <if test="netWeight != null and netWeight != ''">#{netWeight},</if>
-            <if test="grossWeight != null and grossWeight != ''">#{grossWeight},</if>
+            <if test="material != null and material != ''">#{material},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="netWeight != null">#{netWeight},</if>
             <if test="singleVolume != null and singleVolume != ''">#{singleVolume},</if>
             <if test="singleLength != null">#{singleLength},</if>
             <if test="singleWidth != null">#{singleWidth},</if>
             <if test="singleHeight != null">#{singleHeight},</if>
             <if test="pkgPcs != null">#{pkgPcs},</if>
-            <if test="pkgVolume != null and pkgVolume != ''">#{pkgVolume},</if>
+            <if test="pkgVolume != null">#{pkgVolume},</if>
             <if test="pkgLength != null">#{pkgLength},</if>
             <if test="pkgWidth != null">#{pkgWidth},</if>
             <if test="pkgHeight != null">#{pkgHeight},</if>
+            <if test="taxNo != null and taxNo != ''">#{taxNo},</if>
             <if test="hsCode != null and hsCode != ''">#{hsCode},</if>
             <if test="isCode != null and isCode != ''">#{isCode},</if>
             <if test="unit != null and unit != ''">#{unit},</if>
             <if test="unit1 != null and unit1 != ''">#{unit1},</if>
             <if test="unit2 != null and unit2 != ''">#{unit2},</if>
-            <if test="price != null and price != ''">#{price},</if>
-            <if test="currencyType != null and currencyType != ''">#{currencyType},</if>
+            <if test="price != null">#{price},</if>
+            <if test="currency != null and currency != ''">#{currency},</if>
             <if test="ruleNation != null and ruleNation != ''">#{ruleNation},</if>
             <if test="manufEnterprise != null and manufEnterprise != ''">#{manufEnterprise},</if>
             <if test="ebcCode != null and ebcCode != ''">#{ebcCode},</if>
@@ -273,44 +283,47 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
         </trim>
     </insert>
 
     <update id="updateEmisGoods" parameterType="EmisGoods">
         update emis_goods
         <trim prefix="SET" suffixOverrides=",">
-            <if test="goodsSn != null and goodsSn != ''">goods_sn = #{goodsSn},</if>
+            <if test="goodsCode != null and goodsCode != ''">goods_code = #{goodsCode},</if>
             <if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
             <if test="goodsNameEn != null and goodsNameEn != ''">goods_name_en = #{goodsNameEn},</if>
             <if test="goodsCat != null and goodsCat != ''">goods_cat = #{goodsCat},</if>
             <if test="goodsType != null and goodsType != ''">goods_type = #{goodsType},</if>
             <if test="goodsModel != null and goodsModel != ''">goods_model = #{goodsModel},</if>
             <if test="barcode != null and barcode != ''">barcode = #{barcode},</if>
-            <if test="orginalNation != null and orginalNation != ''">orginal_nation = #{orginalNation},</if>
+            <if test="nationArea != null and nationArea != ''">nation_area = #{nationArea},</if>
             <if test="picUrl != null and picUrl != ''">pic_url = #{picUrl},</if>
-            <if test="ownerId != null and ownerId != ''">owner_id = #{ownerId},</if>
+            <if test="ownerCode != null and ownerCode != ''">owner_code = #{ownerCode},</if>
             <if test="isRealGoods != null">is_real_goods = #{isRealGoods},</if>
             <if test="isBigCat != null">is_big_cat = #{isBigCat},</if>
-            <if test="brandId != null and brandId != ''">brand_id = #{brandId},</if>
             <if test="brand != null and brand != ''">brand = #{brand},</if>
-            <if test="netWeight != null and netWeight != ''">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null and grossWeight != ''">gross_weight = #{grossWeight},</if>
+            <if test="material != null and material != ''">material = #{material},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
             <if test="singleVolume != null and singleVolume != ''">single_volume = #{singleVolume},</if>
             <if test="singleLength != null">single_length = #{singleLength},</if>
             <if test="singleWidth != null">single_width = #{singleWidth},</if>
             <if test="singleHeight != null">single_height = #{singleHeight},</if>
             <if test="pkgPcs != null">pkg_pcs = #{pkgPcs},</if>
-            <if test="pkgVolume != null and pkgVolume != ''">pkg_volume = #{pkgVolume},</if>
+            <if test="pkgVolume != null">pkg_volume = #{pkgVolume},</if>
             <if test="pkgLength != null">pkg_length = #{pkgLength},</if>
             <if test="pkgWidth != null">pkg_width = #{pkgWidth},</if>
             <if test="pkgHeight != null">pkg_height = #{pkgHeight},</if>
+            <if test="taxNo != null and taxNo != ''">tax_no = #{taxNo},</if>
             <if test="hsCode != null and hsCode != ''">hs_code = #{hsCode},</if>
             <if test="isCode != null and isCode != ''">is_code = #{isCode},</if>
             <if test="unit != null and unit != ''">unit = #{unit},</if>
             <if test="unit1 != null and unit1 != ''">unit1 = #{unit1},</if>
             <if test="unit2 != null and unit2 != ''">unit2 = #{unit2},</if>
-            <if test="price != null and price != ''">price = #{price},</if>
-            <if test="currencyType != null and currencyType != ''">currency_type = #{currencyType},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="currency != null and currency != ''">currency = #{currency},</if>
             <if test="ruleNation != null and ruleNation != ''">rule_nation = #{ruleNation},</if>
             <if test="manufEnterprise != null and manufEnterprise != ''">manuf_enterprise = #{manufEnterprise},</if>
             <if test="ebcCode != null and ebcCode != ''">ebc_code = #{ebcCode},</if>
@@ -339,6 +352,8 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
         </trim>
         where id = #{id}
     </update>