From d3bb49c768d272b9281ecfffe8433b879f28028b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 22 May 2024 07:10:51 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisCommonController.java    |  29 +++-
 .../erp/web/emis/EmisTmsPackController.java   |  16 ++
 .../xdadan/erp/emis/domain/EmisTmsPack.java   |  49 ++++--
 .../erp/emis/domain/EmisTmsPackDtl.java       |  23 +--
 .../service/impl/EmisTmsPackServiceImpl.java  |   3 +
 .../resources/mapper/EmisTmsPackDtlMapper.xml |  80 +++++----
 .../resources/mapper/EmisTmsPackMapper.xml    | 153 +++++++++++++-----
 7 files changed, 268 insertions(+), 85 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index d289a7ba0..72f77b309 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -17,8 +17,9 @@ import com.xdadan.erp.common.annotation.Log;
 import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.core.redis.RedissonService;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
+import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 import com.xdadan.erp.emis.domain.EmisBrand;
 import com.xdadan.erp.emis.domain.EmisPrintTpl;
@@ -29,11 +30,13 @@ import com.xdadan.erp.emis.domain.vo.Reciever;
 import com.xdadan.erp.emis.domain.vo.Sender;
 import com.xdadan.erp.emis.domain.vo.WaybillOrder;
 import com.xdadan.erp.emis.service.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -58,11 +61,14 @@ public class EmisCommonController extends BaseController
     @Autowired
     private IEmisPrintTplService emisPrintTplService;
 
+    @Autowired
+    RedissonService redissonService;
+
 
     /**
      * 获取电子面单单号
      */
-    @PostMapping(value = "/realMatchWaybill")
+    @RequestMapping(value = "/realMatchWaybill")
     public AjaxResult realMatchWaybill()
     {
         try {
@@ -74,6 +80,25 @@ public class EmisCommonController extends BaseController
         }
     }
 
+    /**
+     * 获取合包单号
+     */
+    @RequestMapping(value = "/getPackNo")
+    public AjaxResult getPackNo()
+    {
+        try {
+            String YYYYMMDDHH = "yyyyMMddHH";
+
+            String hbKey= "THB-"+DateUtils.parseDateToStr(YYYYMMDDHH,new Date());
+            Long lockNo = redissonService.addAndGetLong(hbKey,1L);
+            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
+            return AjaxResult.success("获取成功",packNo);
+        }catch (Exception ex){
+            ex.printStackTrace();
+            return AjaxResult.error(ex.getMessage());
+        }
+    }
+
 
     /**
      * 获取解析地址
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java
index befeea8c8..5abbc20e5 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsPackController.java
@@ -13,6 +13,10 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.common.core.redis.RedissonService;
+import com.xdadan.erp.emis.domain.EmisCountry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,6 +52,9 @@ public class EmisTmsPackController extends BaseController
     @Autowired
     private IEmisTmsPackService emisTmsPackService;
 
+    @Autowired
+    RedissonService redissonService;
+
     /**
      * 查询TMS合包列表
      */
@@ -60,6 +67,15 @@ public class EmisTmsPackController extends BaseController
         return getDataTable(list);
     }
 
+    @RequestMapping("/listSimple")
+    @JacksonFilter(include= {"id","packCode","packName","packDate","twoCode"},value= EmisTmsPack.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    public TableDataInfo listSimple(EmisTmsPack emisTmsPack)
+    {
+        startPage();
+        List<EmisTmsPack> list = emisTmsPackService.selectEmisTmsPackList(emisTmsPack);
+        return getDataTable(list);
+    }
+
     /**
      * 导出TMS合包列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
index 2d981c96f..231a6ec29 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPack.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisTmsPack.java
  * @author linfso
- * @date 2024-03-01 08:54:58
+ * @date 2024-05-21 23:08:30
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> TMS合包 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisTmsPack
  * @Description TMS合包
  * @author linfso
- * @date 2024-03-01 08:54:58
+ * @date 2024-05-21 23:08:30
  */
- @Data
+@Data
 public class EmisTmsPack extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -36,14 +36,41 @@ public class EmisTmsPack extends BaseEntity
     /* id */
     private Long id;
     /* 合包号 */
-    private String packCode;
+    private String packNo;
     /* 合包名称 */
     private String packName;
     /* 合包时间 */
-    private String packDate;
-    /* 创建站点代码 */
-    private String createSiteCode;
-    /* 修改站点代码 */
-    private String modifySiteCode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date packDate;
+    /* 目的国家 */
+    private String destCountry;
+    /* 目的国家名称 */
+    private String destCountryName;
+    /* 是否可拆 1-可拆 0-不可拆 */
+    private String blUnpack;
+    /* 下一站 */
+    private String nextStation;
+    /* 下一网点 */
+    private String nextStiteCode;
+    /* 总件数 */
+    private Integer totalParcelQty;
+    /* 总运单数 */
+    private Integer totalWaybillQty;
+    /* 总体积 */
+    private BigDecimal totalVolume;
+    /* 总重量 */
+    private BigDecimal totalWeight;
+    /* 合包状态 1-合包 2-拆包 */
+    private String packStatus;
+    /* 扩展数据 */
+    private String extData;
+    /* ext1 */
+    private String ext1;
+    /* ext2 */
+    private String ext2;
+    /* ext3 */
+    private String ext3;
+    /* ext4 */
+    private String ext4;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
index 048abe0b1..0915f362e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisTmsPackDtl.java
  * @author linfso
- * @date 2024-03-01 08:54:58
+ * @date 2024-05-21 23:09:55
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> TMS合包明细 实体类 </p>
  */
 
@@ -26,20 +26,25 @@ import lombok.Data;
  * @ClassName EmisTmsPackDtl
  * @Description TMS合包明细
  * @author linfso
- * @date 2024-03-01 08:54:58
+ * @date 2024-05-21 23:09:55
  */
- @Data
+@Data
 public class EmisTmsPackDtl extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /* id */
     private Long id;
-    /* 合包id */
-    private Long packId;
-    /* 运单id */
-    private Long waybillId;
+    /* 合包号 */
+    private String packNo;
     /* 运单号 */
     private Long billCode;
+    /* 扫描时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scanDate;
+    /* 扫描状态 1-已扫描 0-未扫描 */
+    private String scanStatus;
+    /* 状态 1-合包 2-拆包  */
+    private String packStatus;
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java
index 9efd1164b..0e4e49497 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsPackServiceImpl.java
@@ -11,6 +11,8 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.xdadan.erp.common.core.redis.RedissonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisTmsPack;
@@ -101,4 +103,5 @@ public class EmisTmsPackServiceImpl implements IEmisTmsPackService
         return emisTmsPackMapper.deleteEmisTmsPackById(id);
     }
 
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
index ad73ac424..e42518795 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackDtlMapper.xml
@@ -1,89 +1,115 @@
 <?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.EmisTmsPackDtlMapper">
-    
+
     <resultMap type="EmisTmsPackDtl" id="EmisTmsPackDtlResult">
         <result property="id"    column="id"    />
-        <result property="packId"    column="pack_id"    />
-        <result property="waybillId"    column="waybill_id"    />
+        <result property="packNo"    column="pack_no"    />
         <result property="billCode"    column="bill_code"    />
+        <result property="scanDate"    column="scan_date"    />
+        <result property="scanStatus"    column="scan_status"    />
+        <result property="packStatus"    column="pack_status"    />
+        <result property="remark"    column="remark"    />
+        <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
     </resultMap>
 
     <sql id="selectEmisTmsPackDtlVo">
-        select id, pack_id, waybill_id, bill_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_pack_dtl
+        select id, pack_no, bill_code, scan_date, scan_status, pack_status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_pack_dtl
     </sql>
 
     <select id="selectEmisTmsPackDtlList" parameterType="EmisTmsPackDtl" resultMap="EmisTmsPackDtlResult">
         <include refid="selectEmisTmsPackDtlVo"/>
-        <where>  
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="packId != null "> and pack_id = #{packId}</if>
-            <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
+            <if test="packNo != null  and packNo != ''"> and pack_no like concat('%', #{packNo}, '%')</if>
             <if test="billCode != null "> and bill_code = #{billCode}</if>
+            <if test="scanDate != null "> and scan_date = #{scanDate}</if>
+            <if test="scanStatus != null  and scanStatus != ''"> and scan_status like concat('%', #{scanStatus}, '%')</if>
+            <if test="packStatus != null  and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if>
+            <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="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="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</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 create_time desc
     </select>
-  
+
     <select id="selectEmisTmsPackDtlById" parameterType="Long" resultMap="EmisTmsPackDtlResult">
-        select id, pack_id, waybill_id, bill_code, del_flag, create_by, create_time, update_by, update_time, remark 
+        select id, pack_no, bill_code, scan_date, scan_status, pack_status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_pack_dtl a
         where a.id = #{id}
     </select>
-        
-    <insert id="insertEmisTmsPackDtl" parameterType="EmisTmsPackDtl">
+
+    <insert id="insertEmisTmsPackDtl" parameterType="EmisTmsPackDtl" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_pack_dtl
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="packId != null">pack_id,</if>
-            <if test="waybillId != null">waybill_id,</if>
+            <if test="packNo != null and packNo != ''">pack_no,</if>
             <if test="billCode != null">bill_code,</if>
+            <if test="scanDate != null">scan_date,</if>
+            <if test="scanStatus != null and scanStatus != ''">scan_status,</if>
+            <if test="packStatus != null and packStatus != ''">pack_status,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id,</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>
+            <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="packId != null">#{packId},</if>
-            <if test="waybillId != null">#{waybillId},</if>
+            <if test="packNo != null and packNo != ''">#{packNo},</if>
             <if test="billCode != null">#{billCode},</if>
+            <if test="scanDate != null">#{scanDate},</if>
+            <if test="scanStatus != null and scanStatus != ''">#{scanStatus},</if>
+            <if test="packStatus != null and packStatus != ''">#{packStatus},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="tenantId != null and tenantId != ''">#{tenantId},</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>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+        </trim>
     </insert>
 
     <update id="updateEmisTmsPackDtl" parameterType="EmisTmsPackDtl">
         update emis_tms_pack_dtl
         <trim prefix="SET" suffixOverrides=",">
-            <if test="packId != null">pack_id = #{packId},</if>
-            <if test="waybillId != null">waybill_id = #{waybillId},</if>
+            <if test="packNo != null and packNo != ''">pack_no = #{packNo},</if>
             <if test="billCode != null">bill_code = #{billCode},</if>
+            <if test="scanDate != null">scan_date = #{scanDate},</if>
+            <if test="scanStatus != null and scanStatus != ''">scan_status = #{scanStatus},</if>
+            <if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</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>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</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>
@@ -93,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisTmsPackDtlByIds" parameterType="String">
-        delete from emis_tms_pack_dtl where id in 
+        delete from emis_tms_pack_dtl where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
index d52bc8162..ce57e7278 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
@@ -1,99 +1,180 @@
 <?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.EmisTmsPackMapper">
-    
+
     <resultMap type="EmisTmsPack" id="EmisTmsPackResult">
         <result property="id"    column="id"    />
-        <result property="packCode"    column="pack_code"    />
+        <result property="packNo"    column="pack_no"    />
         <result property="packName"    column="pack_name"    />
         <result property="packDate"    column="pack_date"    />
-        <result property="createSiteCode"    column="create_site_code"    />
-        <result property="modifySiteCode"    column="modify_site_code"    />
+        <result property="destCountry"    column="dest_country"    />
+        <result property="destCountryName"    column="dest_country_name"    />
+        <result property="blUnpack"    column="bl_unpack"    />
+        <result property="nextStation"    column="next_station"    />
+        <result property="nextStiteCode"    column="next_stite_code"    />
+        <result property="totalParcelQty"    column="total_parcel_qty"    />
+        <result property="totalWaybillQty"    column="total_waybill_qty"    />
+        <result property="totalVolume"    column="total_volume"    />
+        <result property="totalWeight"    column="total_weight"    />
+        <result property="packStatus"    column="pack_status"    />
+        <result property="extData"    column="ext_data"    />
+        <result property="ext1"    column="ext1"    />
+        <result property="ext2"    column="ext2"    />
+        <result property="ext3"    column="ext3"    />
+        <result property="ext4"    column="ext4"    />
+        <result property="remark"    column="remark"    />
+        <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
     </resultMap>
 
     <sql id="selectEmisTmsPackVo">
-        select id, pack_code, pack_name, pack_date, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark from emis_tms_pack
+        select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, next_station, next_stite_code, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, ext1, ext2, ext3, ext4, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_tms_pack
     </sql>
 
     <select id="selectEmisTmsPackList" parameterType="EmisTmsPack" resultMap="EmisTmsPackResult">
         <include refid="selectEmisTmsPackVo"/>
-        <where>  
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="packCode != null  and packCode != ''"> and pack_code like concat('%', #{packCode}, '%')</if>
+            <if test="packNo != null  and packNo != ''"> and pack_no like concat('%', #{packNo}, '%')</if>
             <if test="packName != null  and packName != ''"> and pack_name like concat('%', #{packName}, '%')</if>
-            <if test="packDate != null  and packDate != ''"> and pack_date like concat('%', #{packDate}, '%')</if>
-            <if test="createSiteCode != null  and createSiteCode != ''"> and create_site_code like concat('%', #{createSiteCode}, '%')</if>
-            <if test="modifySiteCode != null  and modifySiteCode != ''"> and modify_site_code like concat('%', #{modifySiteCode}, '%')</if>
+            <if test="packDate != null "> and pack_date like concat('%', #{packDate}, '%')</if>
+            <if test="destCountry != null  and destCountry != ''"> and dest_country like concat('%', #{destCountry}, '%')</if>
+            <if test="destCountryName != null  and destCountryName != ''"> and dest_country_name like concat('%', #{destCountryName}, '%')</if>
+            <if test="blUnpack != null  and blUnpack != ''"> and bl_unpack like concat('%', #{blUnpack}, '%')</if>
+            <if test="nextStation != null  and nextStation != ''"> and next_station like concat('%', #{nextStation}, '%')</if>
+            <if test="nextStiteCode != null  and nextStiteCode != ''"> and next_stite_code like concat('%', #{nextStiteCode}, '%')</if>
+            <if test="totalParcelQty != null "> and total_parcel_qty = #{totalParcelQty}</if>
+            <if test="totalWaybillQty != null "> and total_waybill_qty = #{totalWaybillQty}</if>
+            <if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
+            <if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
+            <if test="packStatus != null  and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if>
+            <if test="extData != null  and extData != ''"> and ext_data like concat('%', #{extData}, '%')</if>
+            <if test="ext1 != null  and ext1 != ''"> and ext1 like concat('%', #{ext1}, '%')</if>
+            <if test="ext2 != null  and ext2 != ''"> and ext2 like concat('%', #{ext2}, '%')</if>
+            <if test="ext3 != null  and ext3 != ''"> and ext3 like concat('%', #{ext3}, '%')</if>
+            <if test="ext4 != null  and ext4 != ''"> and ext4 like concat('%', #{ext4}, '%')</if>
+            <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="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="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</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 create_time desc
     </select>
-  
+
     <select id="selectEmisTmsPackById" parameterType="Long" resultMap="EmisTmsPackResult">
-        select id, pack_code, pack_name, pack_date, create_site_code, modify_site_code, del_flag, create_by, create_time, update_by, update_time, remark 
+        select id, pack_no, pack_name, pack_date, dest_country, dest_country_name, bl_unpack, next_station, next_stite_code, total_parcel_qty, total_waybill_qty, total_volume, total_weight, pack_status, ext_data, ext1, ext2, ext3, ext4, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_pack a
         where a.id = #{id}
     </select>
-        
-    <insert id="insertEmisTmsPack" parameterType="EmisTmsPack">
+
+    <insert id="insertEmisTmsPack" parameterType="EmisTmsPack" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_pack
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
-            <if test="packCode != null and packCode != ''">pack_code,</if>
+            <if test="packNo != null and packNo != ''">pack_no,</if>
             <if test="packName != null and packName != ''">pack_name,</if>
-            <if test="packDate != null and packDate != ''">pack_date,</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code,</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code,</if>
+            <if test="packDate != null">pack_date,</if>
+            <if test="destCountry != null and destCountry != ''">dest_country,</if>
+            <if test="destCountryName != null and destCountryName != ''">dest_country_name,</if>
+            <if test="blUnpack != null and blUnpack != ''">bl_unpack,</if>
+            <if test="nextStation != null and nextStation != ''">next_station,</if>
+            <if test="nextStiteCode != null and nextStiteCode != ''">next_stite_code,</if>
+            <if test="totalParcelQty != null">total_parcel_qty,</if>
+            <if test="totalWaybillQty != null">total_waybill_qty,</if>
+            <if test="totalVolume != null">total_volume,</if>
+            <if test="totalWeight != null">total_weight,</if>
+            <if test="packStatus != null and packStatus != ''">pack_status,</if>
+            <if test="extData != null and extData != ''">ext_data,</if>
+            <if test="ext1 != null and ext1 != ''">ext1,</if>
+            <if test="ext2 != null and ext2 != ''">ext2,</if>
+            <if test="ext3 != null and ext3 != ''">ext3,</if>
+            <if test="ext4 != null and ext4 != ''">ext4,</if>
+            <if test="remark != null and remark != ''">remark,</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id,</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>
+            <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="packCode != null and packCode != ''">#{packCode},</if>
+            <if test="packNo != null and packNo != ''">#{packNo},</if>
             <if test="packName != null and packName != ''">#{packName},</if>
-            <if test="packDate != null and packDate != ''">#{packDate},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">#{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">#{modifySiteCode},</if>
+            <if test="packDate != null">#{packDate},</if>
+            <if test="destCountry != null and destCountry != ''">#{destCountry},</if>
+            <if test="destCountryName != null and destCountryName != ''">#{destCountryName},</if>
+            <if test="blUnpack != null and blUnpack != ''">#{blUnpack},</if>
+            <if test="nextStation != null and nextStation != ''">#{nextStation},</if>
+            <if test="nextStiteCode != null and nextStiteCode != ''">#{nextStiteCode},</if>
+            <if test="totalParcelQty != null">#{totalParcelQty},</if>
+            <if test="totalWaybillQty != null">#{totalWaybillQty},</if>
+            <if test="totalVolume != null">#{totalVolume},</if>
+            <if test="totalWeight != null">#{totalWeight},</if>
+            <if test="packStatus != null and packStatus != ''">#{packStatus},</if>
+            <if test="extData != null and extData != ''">#{extData},</if>
+            <if test="ext1 != null and ext1 != ''">#{ext1},</if>
+            <if test="ext2 != null and ext2 != ''">#{ext2},</if>
+            <if test="ext3 != null and ext3 != ''">#{ext3},</if>
+            <if test="ext4 != null and ext4 != ''">#{ext4},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="tenantId != null and tenantId != ''">#{tenantId},</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>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+        </trim>
     </insert>
 
     <update id="updateEmisTmsPack" parameterType="EmisTmsPack">
         update emis_tms_pack
         <trim prefix="SET" suffixOverrides=",">
-            <if test="packCode != null and packCode != ''">pack_code = #{packCode},</if>
+            <if test="packNo != null and packNo != ''">pack_no = #{packNo},</if>
             <if test="packName != null and packName != ''">pack_name = #{packName},</if>
-            <if test="packDate != null and packDate != ''">pack_date = #{packDate},</if>
-            <if test="createSiteCode != null and createSiteCode != ''">create_site_code = #{createSiteCode},</if>
-            <if test="modifySiteCode != null and modifySiteCode != ''">modify_site_code = #{modifySiteCode},</if>
+            <if test="packDate != null">pack_date = #{packDate},</if>
+            <if test="destCountry != null and destCountry != ''">dest_country = #{destCountry},</if>
+            <if test="destCountryName != null and destCountryName != ''">dest_country_name = #{destCountryName},</if>
+            <if test="blUnpack != null and blUnpack != ''">bl_unpack = #{blUnpack},</if>
+            <if test="nextStation != null and nextStation != ''">next_station = #{nextStation},</if>
+            <if test="nextStiteCode != null and nextStiteCode != ''">next_stite_code = #{nextStiteCode},</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>
+            <if test="totalWeight != null">total_weight = #{totalWeight},</if>
+            <if test="packStatus != null and packStatus != ''">pack_status = #{packStatus},</if>
+            <if test="extData != null and extData != ''">ext_data = #{extData},</if>
+            <if test="ext1 != null and ext1 != ''">ext1 = #{ext1},</if>
+            <if test="ext2 != null and ext2 != ''">ext2 = #{ext2},</if>
+            <if test="ext3 != null and ext3 != ''">ext3 = #{ext3},</if>
+            <if test="ext4 != null and ext4 != ''">ext4 = #{ext4},</if>
+            <if test="remark != null and remark != ''">remark = #{remark},</if>
+            <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</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>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="remark != null and remark != ''">remark = #{remark},</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>
@@ -103,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisTmsPackByIds" parameterType="String">
-        delete from emis_tms_pack where id in 
+        delete from emis_tms_pack where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>