From fd18ec7c07b3d9e77c2cd9fe1ecf9a7f66faa73b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 25 Apr 2024 17:42:49 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   |  92 ++++++++--------
 .../emis/domain/EmisWaybillAttachment.java    |   6 +-
 .../erp/emis/domain/EmisWaybillCargo.java     |  35 +++---
 .../erp/emis/domain/vo/WaybillOrder.java      |   3 +
 .../service/impl/EmisWaybillServiceImpl.java  |  19 +++-
 .../mapper/EmisWaybillAttachmentMapper.xml    |   8 +-
 .../mapper/EmisWaybillCargoMapper.xml         | 103 +++++++++---------
 7 files changed, 146 insertions(+), 120 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index b6b9f810c..dbe50b8f7 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -131,69 +131,71 @@ public class EmisWaybillController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出运单列表列表
-     */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:export')")
-    @Log(title = "运单列表", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, EmisWaybill emisWaybill)
-    {
-        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
-        ExcelUtil<EmisWaybill> util = new ExcelUtil<EmisWaybill>(EmisWaybill.class);
-        util.exportExcel(response, list, "运单列表数据");
-    }
+//    /**
+//     * 导出运单列表列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:export')")
+//    @Log(title = "运单列表", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, EmisWaybill emisWaybill)
+//    {
+//        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
+//        ExcelUtil<EmisWaybill> util = new ExcelUtil<EmisWaybill>(EmisWaybill.class);
+//        util.exportExcel(response, list, "运单列表数据");
+//    }
 
     /**
      * 获取运单列表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:query')")
-    @GetMapping("/getInfoByBillCode")
-    public AjaxResult getInfoByBillCode(String billCode)
-    {
-        return AjaxResult.success(emisWaybillService.selectEmisWaybillByBillCode(billCode));
-    }
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:query')")
+//    @GetMapping("/getInfoByBillCode")
+//    public AjaxResult getInfoByBillCode(String billCode)
+//    {
+//        return AjaxResult.success(emisWaybillService.selectEmisWaybillByBillCode(billCode));
+//    }
 
     /**
      * 获取运单列表详细信息
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(emisWaybillService.selectEmisWaybillById(id));
-    }
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(emisWaybillService.selectEmisWaybillById(id));
+//    }
 
     /**
      * 新增运单列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:add')")
-    @Log(title = "运单列表", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody EmisWaybill emisWaybill)
-    {
-        return toAjax(emisWaybillService.insertEmisWaybill(emisWaybill));
-    }
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:add')")
+//    @Log(title = "运单列表", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody EmisWaybill emisWaybill)
+//    {
+//        return toAjax(emisWaybillService.insertEmisWaybill(emisWaybill));
+//    }
 
     /**
      * 修改运单列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:edit')")
-    @Log(title = "运单列表", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody EmisWaybill emisWaybill)
-    {
-        return toAjax(emisWaybillService.updateEmisWaybill(emisWaybill));
-    }
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:edit')")
+//    @Log(title = "运单列表", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody EmisWaybill emisWaybill)
+//    {
+//        return toAjax(emisWaybillService.updateEmisWaybill(emisWaybill));
+//    }
 
     /**
      * 删除运单列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:remove')")
-    @Log(title = "运单列表", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(emisWaybillService.deleteEmisWaybillByIds(ids));
-    }
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:remove')")
+//    @Log(title = "运单列表", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(emisWaybillService.deleteEmisWaybillByIds(ids));
+//    }
+
+
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
index 28e8d42a4..c23d02ff7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAttachment.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWaybillAttachment.java
  * @author linfso
- * @date 2024-03-01 06:18:21
+ * @date 2024-04-25 09:41:23
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 运单附件 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisWaybillAttachment
  * @Description 运单附件
  * @author linfso
- * @date 2024-03-01 06:18:21
+ * @date 2024-04-25 09:41:23
  */
 @Data
 public class EmisWaybillAttachment extends BaseEntity
@@ -46,6 +46,6 @@ public class EmisWaybillAttachment extends BaseEntity
     /* 文件描述 */
     private String fileDesc;
     /* 排序 */
-    private String orderNum;
+    private Integer orderNum;
 
 }
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 358585ea7..71f7e4274 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
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisWaybillCargo.java
  * @author linfso
- * @date 2024-02-29 08:15:15
+ * @date 2024-04-25 09:18:11
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 运单货物 实体类 </p>
  */
 
@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
 import com.xdadan.erp.common.core.domain.BaseEntity;
 import com.xdadan.erp.common.core.domain.TreeEntity;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -25,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisWaybillCargo
  * @Description 运单货物
  * @author linfso
- * @date 2024-02-29 08:15:15
+ * @date 2024-04-25 09:18:11
  */
- @Data
+@Data
 public class EmisWaybillCargo extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -41,13 +42,13 @@ public class EmisWaybillCargo extends BaseEntity
     /* 货物名称 */
     private String goodsName;
     /* 货物数量 */
-    private String cargoQty;
+    private Integer cargoQty;
     /* 单位 */
     private String unit;
     /* 重量 */
-    private String weight;
+    private BigDecimal weight;
     /* 货物单价 */
-    private String price;
+    private BigDecimal price;
     /* 货物币种 */
     private String currency;
     /* 原产国 */
@@ -69,20 +70,22 @@ public class EmisWaybillCargo extends BaseEntity
     /* 厂家 */
     private String manufacturer;
     /* 毛重 */
-    private String grossWeight;
+    private BigDecimal grossWeight;
     /* 长 */
-    private String length;
+    private BigDecimal length;
     /* 宽 */
-    private String width;
+    private BigDecimal width;
+    /* 高 */
+    private BigDecimal height;
+    /* 体积 */
+    private BigDecimal volume;
     /* 申报价值 */
-    private String declaredValue;
+    private BigDecimal declaredValue;
     /* 申报价值币种 */
     private String declaredValueCurrency;
     /* 条码 */
     private String barcode;
-    /* 高 */
-    private String height;
-    /* 体积 */
-    private String volume;
+    /* 排序 */
+    private Integer orderNum;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 753ea4c7f..1b9ae0ab4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -50,6 +50,9 @@ public class WaybillOrder implements Serializable {
     /* wx openid */
     private String openId;
 
+    /* 寄件客户编号2502021 */
+    private String customerCode;
+
     /* 支付方式 : 现金或月结 */
     private String paymentType;
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index b88738026..61c9245c0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -136,7 +136,6 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
 
 
 
-
     /**
      * 删除运单列表信息
      * 
@@ -205,8 +204,6 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         sender.setCompany(emisWaybill.getSendCompany());
         waybillOrder.setSender(sender);
 
-
-
         // 收费项 // 查询收费项
         List<FeeItem> feeItems = new ArrayList<>();
         EmisWaybillFeeitem queryFeeitem = new EmisWaybillFeeitem();
@@ -373,4 +370,20 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
         return  1;
     }
 
+    public static void main(String[] args) {
+
+        EmisWaybill emisWaybill =new EmisWaybill();
+        emisWaybill.setBillCode("T123123");
+        WaybillOrder waybillOrder = new WaybillOrder();
+
+        // 忽略复制过程中出现的错误
+        CopyOptions options = CopyOptions.create().setIgnoreError(true);
+
+        // 基础信息
+        BeanUtil.copyProperties(emisWaybill,waybillOrder,options);
+
+        System.out.println(waybillOrder.toString());
+
+    }
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index bc9cc9a99..e71c1e25b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -33,7 +33,7 @@
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>
             <if test="fileDesc != null  and fileDesc != ''"> and file_desc like concat('%', #{fileDesc}, '%')</if>
-            <if test="orderNum != null  and orderNum != ''"> and order_num like concat('%', #{orderNum}, '%')</if>
+            <if test="orderNum != null "> and order_num like concat('%', #{orderNum}, '%')</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="createTime != null "> and create_time = #{createTime}</if>
@@ -59,7 +59,7 @@
             <if test="fileName != null and fileName != ''">file_name,</if>
             <if test="fileUrl != null and fileUrl != ''">file_url,</if>
             <if test="fileDesc != null and fileDesc != ''">file_desc,</if>
-            <if test="orderNum != null and orderNum != ''">order_num,</if>
+            <if test="orderNum != null">order_num,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -74,7 +74,7 @@
             <if test="fileName != null and fileName != ''">#{fileName},</if>
             <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
             <if test="fileDesc != null and fileDesc != ''">#{fileDesc},</if>
-            <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+            <if test="orderNum != null">#{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -92,7 +92,7 @@
             <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
             <if test="fileUrl != null and fileUrl != ''">file_url = #{fileUrl},</if>
             <if test="fileDesc != null and fileDesc != ''">file_desc = #{fileDesc},</if>
-            <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
index 04c2f0fdc..ba9f8c6ff 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillCargoMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillCargoMapper">
-    
+
     <resultMap type="EmisWaybillCargo" id="EmisWaybillCargoResult">
         <result property="id"    column="id"    />
         <result property="waybillId"    column="waybill_id"    />
@@ -26,11 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="grossWeight"    column="gross_weight"    />
         <result property="length"    column="length"    />
         <result property="width"    column="width"    />
+        <result property="height"    column="height"    />
+        <result property="volume"    column="volume"    />
         <result property="declaredValue"    column="declared_value"    />
         <result property="declaredValueCurrency"    column="declared_value_currency"    />
         <result property="barcode"    column="barcode"    />
-        <result property="height"    column="height"    />
-        <result property="volume"    column="volume"    />
+        <result property="orderNum"    column="order_num"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -40,20 +41,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisWaybillCargoVo">
-        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, purpose, ingredients, function, goods_model, manufacturer, gross_weight, length, width, declared_value, declared_value_currency, barcode, height, volume, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_cargo
+        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, purpose, ingredients, function, goods_model, manufacturer, gross_weight, length, width, height, volume, declared_value, declared_value_currency, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark from emis_waybill_cargo
     </sql>
 
     <select id="selectEmisWaybillCargoList" parameterType="EmisWaybillCargo" resultMap="EmisWaybillCargoResult">
         <include refid="selectEmisWaybillCargoVo"/>
-        <where>  
+        <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="waybillId != null "> and waybill_id = #{waybillId}</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="cargoQty != null  and cargoQty != ''"> and cargo_qty like concat('%', #{cargoQty}, '%')</if>
+            <if test="cargoQty != null "> and cargo_qty like concat('%', #{cargoQty}, '%')</if>
             <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="weight != null  and weight != ''"> and weight like concat('%', #{weight}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="weight != null "> and weight like concat('%', #{weight}, '%')</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="nationArea != null  and nationArea != ''"> and nation_area like concat('%', #{nationArea}, '%')</if>
             <if test="taxNo != null  and taxNo != ''"> and tax_no like concat('%', #{taxNo}, '%')</if>
@@ -64,14 +65,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="function != null  and function != ''"> and function like concat('%', #{function}, '%')</if>
             <if test="goodsModel != null  and goodsModel != ''"> and goods_model like concat('%', #{goodsModel}, '%')</if>
             <if test="manufacturer != null  and manufacturer != ''"> and manufacturer like concat('%', #{manufacturer}, '%')</if>
-            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight like concat('%', #{grossWeight}, '%')</if>
-            <if test="length != null  and length != ''"> and length like concat('%', #{length}, '%')</if>
-            <if test="width != null  and width != ''"> and width like concat('%', #{width}, '%')</if>
-            <if test="declaredValue != null  and declaredValue != ''"> and declared_value like concat('%', #{declaredValue}, '%')</if>
+            <if test="grossWeight != null "> and gross_weight like concat('%', #{grossWeight}, '%')</if>
+            <if test="length != null "> and length like concat('%', #{length}, '%')</if>
+            <if test="width != null "> and width like concat('%', #{width}, '%')</if>
+            <if test="height != null "> and height like concat('%', #{height}, '%')</if>
+            <if test="volume != null "> and volume like concat('%', #{volume}, '%')</if>
+            <if test="declaredValue != null "> and declared_value like concat('%', #{declaredValue}, '%')</if>
             <if test="declaredValueCurrency != null  and declaredValueCurrency != ''"> and declared_value_currency like concat('%', #{declaredValueCurrency}, '%')</if>
             <if test="barcode != null  and barcode != ''"> and barcode like concat('%', #{barcode}, '%')</if>
-            <if test="height != null  and height != ''"> and height like concat('%', #{height}, '%')</if>
-            <if test="volume != null  and volume != ''"> and volume like concat('%', #{volume}, '%')</if>
+            <if test="orderNum != null "> and order_num = #{orderNum}</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="createTime != null "> and create_time = #{createTime}</if>
@@ -81,13 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-  
+
     <select id="selectEmisWaybillCargoById" parameterType="Long" resultMap="EmisWaybillCargoResult">
-        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, purpose, ingredients, function, goods_model, manufacturer, gross_weight, length, width, declared_value, declared_value_currency, barcode, height, volume, del_flag, create_by, create_time, update_by, update_time, remark 
+        select id, waybill_id, goods_code, goods_name, cargo_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, purpose, ingredients, function, goods_model, manufacturer, gross_weight, length, width, height, volume, declared_value, declared_value_currency, barcode, order_num, del_flag, create_by, create_time, update_by, update_time, remark
         from emis_waybill_cargo a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisWaybillCargo" parameterType="EmisWaybillCargo">
         insert into emis_waybill_cargo
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -95,10 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="waybillId != null">waybill_id,</if>
             <if test="goodsCode != null and goodsCode != ''">goods_code,</if>
             <if test="goodsName != null and goodsName != ''">goods_name,</if>
-            <if test="cargoQty != null and cargoQty != ''">cargo_qty,</if>
+            <if test="cargoQty != null">cargo_qty,</if>
             <if test="unit != null and unit != ''">unit,</if>
-            <if test="weight != null and weight != ''">weight,</if>
-            <if test="price != null and price != ''">price,</if>
+            <if test="weight != null">weight,</if>
+            <if test="price != null">price,</if>
             <if test="currency != null and currency != ''">currency,</if>
             <if test="nationArea != null and nationArea != ''">nation_area,</if>
             <if test="taxNo != null and taxNo != ''">tax_no,</if>
@@ -109,30 +111,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="function != null and function != ''">function,</if>
             <if test="goodsModel != null and goodsModel != ''">goods_model,</if>
             <if test="manufacturer != null and manufacturer != ''">manufacturer,</if>
-            <if test="grossWeight != null and grossWeight != ''">gross_weight,</if>
-            <if test="length != null and length != ''">length,</if>
-            <if test="width != null and width != ''">width,</if>
-            <if test="declaredValue != null and declaredValue != ''">declared_value,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="length != null">length,</if>
+            <if test="width != null">width,</if>
+            <if test="height != null">height,</if>
+            <if test="volume != null">volume,</if>
+            <if test="declaredValue != null">declared_value,</if>
             <if test="declaredValueCurrency != null and declaredValueCurrency != ''">declared_value_currency,</if>
             <if test="barcode != null and barcode != ''">barcode,</if>
-            <if test="height != null and height != ''">height,</if>
-            <if test="volume != null and volume != ''">volume,</if>
+            <if test="orderNum != null">order_num,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
             <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="remark != null and remark != ''">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="waybillId != null">#{waybillId},</if>
             <if test="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
             <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
-            <if test="cargoQty != null and cargoQty != ''">#{cargoQty},</if>
+            <if test="cargoQty != null">#{cargoQty},</if>
             <if test="unit != null and unit != ''">#{unit},</if>
-            <if test="weight != null and weight != ''">#{weight},</if>
-            <if test="price != null and price != ''">#{price},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="price != null">#{price},</if>
             <if test="currency != null and currency != ''">#{currency},</if>
             <if test="nationArea != null and nationArea != ''">#{nationArea},</if>
             <if test="taxNo != null and taxNo != ''">#{taxNo},</if>
@@ -143,21 +146,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="function != null and function != ''">#{function},</if>
             <if test="goodsModel != null and goodsModel != ''">#{goodsModel},</if>
             <if test="manufacturer != null and manufacturer != ''">#{manufacturer},</if>
-            <if test="grossWeight != null and grossWeight != ''">#{grossWeight},</if>
-            <if test="length != null and length != ''">#{length},</if>
-            <if test="width != null and width != ''">#{width},</if>
-            <if test="declaredValue != null and declaredValue != ''">#{declaredValue},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="length != null">#{length},</if>
+            <if test="width != null">#{width},</if>
+            <if test="height != null">#{height},</if>
+            <if test="volume != null">#{volume},</if>
+            <if test="declaredValue != null">#{declaredValue},</if>
             <if test="declaredValueCurrency != null and declaredValueCurrency != ''">#{declaredValueCurrency},</if>
             <if test="barcode != null and barcode != ''">#{barcode},</if>
-            <if test="height != null and height != ''">#{height},</if>
-            <if test="volume != null and volume != ''">#{volume},</if>
+            <if test="orderNum != null">#{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisWaybillCargo" parameterType="EmisWaybillCargo">
@@ -166,10 +170,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="waybillId != null">waybill_id = #{waybillId},</if>
             <if test="goodsCode != null and goodsCode != ''">goods_code = #{goodsCode},</if>
             <if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
-            <if test="cargoQty != null and cargoQty != ''">cargo_qty = #{cargoQty},</if>
+            <if test="cargoQty != null">cargo_qty = #{cargoQty},</if>
             <if test="unit != null and unit != ''">unit = #{unit},</if>
-            <if test="weight != null and weight != ''">weight = #{weight},</if>
-            <if test="price != null and price != ''">price = #{price},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="price != null">price = #{price},</if>
             <if test="currency != null and currency != ''">currency = #{currency},</if>
             <if test="nationArea != null and nationArea != ''">nation_area = #{nationArea},</if>
             <if test="taxNo != null and taxNo != ''">tax_no = #{taxNo},</if>
@@ -180,14 +184,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="function != null and function != ''">function = #{function},</if>
             <if test="goodsModel != null and goodsModel != ''">goods_model = #{goodsModel},</if>
             <if test="manufacturer != null and manufacturer != ''">manufacturer = #{manufacturer},</if>
-            <if test="grossWeight != null and grossWeight != ''">gross_weight = #{grossWeight},</if>
-            <if test="length != null and length != ''">length = #{length},</if>
-            <if test="width != null and width != ''">width = #{width},</if>
-            <if test="declaredValue != null and declaredValue != ''">declared_value = #{declaredValue},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="length != null">length = #{length},</if>
+            <if test="width != null">width = #{width},</if>
+            <if test="height != null">height = #{height},</if>
+            <if test="volume != null">volume = #{volume},</if>
+            <if test="declaredValue != null">declared_value = #{declaredValue},</if>
             <if test="declaredValueCurrency != null and declaredValueCurrency != ''">declared_value_currency = #{declaredValueCurrency},</if>
             <if test="barcode != null and barcode != ''">barcode = #{barcode},</if>
-            <if test="height != null and height != ''">height = #{height},</if>
-            <if test="volume != null and volume != ''">volume = #{volume},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
             <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -203,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisWaybillCargoByIds" parameterType="String">
-        delete from emis_waybill_cargo where id in 
+        delete from emis_waybill_cargo where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>