From f3e048d0700e0a5c2d38fa5afd42eec01b5fab14 Mon Sep 17 00:00:00 2001
From: Quzf <felix.quzf@gmail.com>
Date: Thu, 14 Sep 2017 16:42:07 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2=E8=B5=B7=E7=82=B9=E7=BB=88=E7=82=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=B8=8B=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=90=E4=BB=B7=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=AD=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unlcn/ils/sales/api/dto/OrderSaveDTO.java |  125 +-
 .../unlcn/ils/sales/api/rest/AreaRest.java    |   15 +-
 .../unlcn/ils/sales/backend/bo/OrderBO.java   |  103 +-
 .../ils/sales/backend/bo/OrderSkuBO.java      |   14 +-
 .../ils/sales/backend/bo/OrderToKyleBO.java   |   76 +
 .../backend/constant/AutoConfConstant.java    |   23 +
 .../backend/service/OrderAddrService.java     |    7 +-
 .../backend/service/OrderAddrServiceImpl.java |   47 +-
 .../service/OrderAuditServiceImpl.java        |    7 +
 .../backend/service/OrderServiceImpl.java     |   23 +-
 .../backend/service/OrderSkuServiceImpl.java  |   37 +-
 .../src/main/resources/constant.properties    |    5 +
 .../lib/mybatis-page-plugin-1.0-SNAPSHOT.jar  |  Bin 0 -> 5256 bytes
 .../base/mapper/SaleOrderAddrMapper.java      |   22 +-
 .../sales/base/mapper/SaleOrderMapper.java    |   22 +-
 .../base/mapper/SaleOrderTicketMapper.java    |   96 ++
 .../ils/sales/base/model/OrderViewDAO.java    |   78 +
 .../unlcn/ils/sales/base/model/SaleOrder.java |  349 +++-
 .../ils/sales/base/model/SaleOrderAddr.java   |  160 +-
 .../base/model/SaleOrderAddrExample.java      |  196 ++-
 .../sales/base/model/SaleOrderExample.java    |  496 +++++-
 .../ils/sales/base/model/SaleOrderTicket.java |  558 ++++++
 .../base/model/SaleOrderTicketExample.java    | 1499 +++++++++++++++++
 .../resources/mappers/SaleOrderAddrMapper.xml |  330 ++--
 .../resources/mappers/SaleOrderMapper.xml     |  168 +-
 .../mappers/SaleOrderTicketMapper.xml         |  464 +++++
 .../resources/mappers/SaleOrderViewMapper.xml |   49 +-
 .../resources/mybatis/generatorConfig.xml     |   21 +-
 28 files changed, 4549 insertions(+), 441 deletions(-)
 create mode 100644 ils-sales-base/lib/mybatis-page-plugin-1.0-SNAPSHOT.jar
 create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderTicketMapper.java
 create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicket.java
 create mode 100644 ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicketExample.java
 create mode 100644 ils-sales-base/src/main/resources/mappers/SaleOrderTicketMapper.xml

diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderSaveDTO.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderSaveDTO.java
index cbe40fa..7ff33b3 100644
--- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderSaveDTO.java
+++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/dto/OrderSaveDTO.java
@@ -22,9 +22,35 @@ public class OrderSaveDTO {
     @NotNull(message = "下单人不能为空")
     private Integer userId;
 
+    @ApiModelProperty(value = "提车日期", required = true)
+    @NotBlank(message = "提车日期不能为空")
+    private String pickDate;
+
     @ApiModelProperty(value = "提车时间", required = true)
     @NotBlank(message = "提车时间不能为空")
-    private String pickDate;
+    private String pickTime;
+
+    @ApiModelProperty(value = "是否上门提车", required = true)
+    @NotNull(message = "是否上门提车不能为空")
+    private Integer isPick;
+
+    @ApiModelProperty(value = "是否送车上门", required = true)
+    @NotNull(message = "是否送车上门不能为空")
+    private Integer isDeliv;
+
+    @ApiModelProperty(value = "运输方式（10:大板，20:单板）", required = true)
+    @NotNull(message = "运输方式不能为空")
+    private Integer transportType;
+
+    @ApiModelProperty(value = "是否开票（0:否，1:是）", required = true)
+    @NotNull(message = "是否开票不能为空")
+    private Integer isTicket;
+
+    @ApiModelProperty(value = "发票抬头")
+    private String companyName;
+
+    @ApiModelProperty(value = "纳税人识别码")
+    private String identifyNumber;
 
     @ApiModelProperty(value = "品牌数量", required = true)
     @NotNull(message = "品牌数量不能为空")
@@ -74,12 +100,10 @@ public class OrderSaveDTO {
     @NotBlank(message = "起运地名称不能为空")
     private String departRegionName;
 
-    @ApiModelProperty(value = "发车联系人", required = true)
-    @NotBlank(message = "发车联系人不能为空")
+    @ApiModelProperty(value = "发车联系人")
     private String departContact;
 
-    @ApiModelProperty(value = "发车人联系电话", required = true)
-    @NotBlank(message = "发车人联系电话不能为空")
+    @ApiModelProperty(value = "发车人联系电话")
     private String departPhone;
 
     @ApiModelProperty(value = "目的地编码", required = true)
@@ -90,12 +114,10 @@ public class OrderSaveDTO {
     @NotBlank(message = "目的地名称不能为空")
     private String destRegionName;
 
-    @ApiModelProperty(value = "收车联系人", required = true)
-    @NotBlank(message = "收车联系人不能为空")
+    @ApiModelProperty(value = "收车联系人")
     private String destContact;
 
-    @ApiModelProperty(value = "收车人联系电话", required = true)
-    @NotBlank(message = "收车人联系电话不能为空")
+    @ApiModelProperty(value = "收车人联系电话")
     private String destPhone;
 
     @ApiModelProperty(value = "里程", required = true)
@@ -113,6 +135,10 @@ public class OrderSaveDTO {
 
     // 销售订单标签
     private String orderTagBOS;
+    //  发车详细地址
+    private String departAddr;
+    //  收车详细地址
+    private String destAddr;
 
     public Integer getId() {
         return id;
@@ -330,6 +356,78 @@ public class OrderSaveDTO {
         this.insuranceUnitPrice = insuranceUnitPrice;
     }
 
+    public String getPickTime() {
+        return pickTime;
+    }
+
+    public void setPickTime(String pickTime) {
+        this.pickTime = pickTime;
+    }
+
+    public Integer getIsPick() {
+        return isPick;
+    }
+
+    public void setIsPick(Integer isPick) {
+        this.isPick = isPick;
+    }
+
+    public Integer getIsDeliv() {
+        return isDeliv;
+    }
+
+    public void setIsDeliv(Integer isDeliv) {
+        this.isDeliv = isDeliv;
+    }
+
+    public Integer getTransportType() {
+        return transportType;
+    }
+
+    public void setTransportType(Integer transportType) {
+        this.transportType = transportType;
+    }
+
+    public Integer getIsTicket() {
+        return isTicket;
+    }
+
+    public void setIsTicket(Integer isTicket) {
+        this.isTicket = isTicket;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getIdentifyNumber() {
+        return identifyNumber;
+    }
+
+    public void setIdentifyNumber(String identifyNumber) {
+        this.identifyNumber = identifyNumber;
+    }
+
+    public String getDepartAddr() {
+        return departAddr;
+    }
+
+    public void setDepartAddr(String departAddr) {
+        this.departAddr = departAddr;
+    }
+
+    public String getDestAddr() {
+        return destAddr;
+    }
+
+    public void setDestAddr(String destAddr) {
+        this.destAddr = destAddr;
+    }
+
     @Override
     public String toString() {
         return "OrderSaveDTO{" +
@@ -337,6 +435,13 @@ public class OrderSaveDTO {
                 ", code='" + code + '\'' +
                 ", userId=" + userId +
                 ", pickDate='" + pickDate + '\'' +
+                ", pickTime='" + pickTime + '\'' +
+                ", isPick='" + isPick + '\'' +
+                ", isDeliv='" + isDeliv + '\'' +
+                ", transportType='" + transportType + '\'' +
+                ", isTicket='" + isTicket + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", identifyNumber='" + identifyNumber + '\'' +
                 ", brands=" + brands +
                 ", seriesAmt=" + seriesAmt +
                 ", standardSalePrice=" + standardSalePrice +
@@ -360,6 +465,8 @@ public class OrderSaveDTO {
                 ", lineId=" + lineId +
                 ", orderSkuBOS='" + orderSkuBOS + '\'' +
                 ", orderTagBOS='" + orderTagBOS + '\'' +
+                ", departAddr='" + departAddr + '\'' +
+                ", destAddr='" + destAddr + '\'' +
                 '}';
     }
 }
diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/AreaRest.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/AreaRest.java
index aa81853..3b5d105 100644
--- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/AreaRest.java
+++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/rest/AreaRest.java
@@ -57,18 +57,17 @@ public class AreaRest {
     /**
      * 查询目的地
      *
-     * @param departAreaId 起运地ID
      * @param provinceId 目的地省ID
      * @return
      */
-    @RequestMapping(value = "/destarea/{departAreaId}/{provinceId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/destarea/{provinceId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取目的地区域信息", notes = "获取目的地区域信息", produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiResponses(value = {@ApiResponse(code = 404, message = "destarea not found")})
     public @ResponseBody
-    ResultDTO<Object> destArea(@ApiParam(value = "起运地ID", required = true) @PathVariable(value = "departAreaId") Integer departAreaId, @ApiParam(value = "目的地省ID", required = true) @PathVariable(value = "provinceId") Integer provinceId) {
+    ResultDTO<Object> destArea(@ApiParam(value = "目的地省ID", required = true) @PathVariable(value = "provinceId") Integer provinceId) {
         ResultDTO<Object> result = new ResultDTO<Object>(true, null, "查询目的地区域成功");
         try {
-            result.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition(departAreaId, provinceId)));
+            result.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition(provinceId)));
         } catch (Exception e) {
             LOGGER.error("AreaRest destArea error: {}", e);
             throw new BusinessException(e.getMessage());
@@ -79,17 +78,17 @@ public class AreaRest {
     /**
      * 查询目的地省
      *
-     * @param departAreaId 起运地ID
+     * @param
      * @return
      */
-    @RequestMapping(value = "/provincearea/{departAreaId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/provincearea", method = RequestMethod.GET)
     @ApiOperation(value = "获取目的地省信息", notes = "获取目的地省信息", produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiResponses(value = {@ApiResponse(code = 404, message = "destarea not found")})
     public @ResponseBody
-    ResultDTO<Object> provinceArea(@ApiParam(value = "起运地ID", required = true) @PathVariable(value = "departAreaId") Integer departAreaId) {
+    ResultDTO<Object> provinceArea() {
         ResultDTO<Object> result = new ResultDTO<Object>(true, null, "查询目的地省成功");
         try {
-            result.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition(departAreaId)));
+            result.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition()));
         } catch (Exception e) {
             LOGGER.error("AreaRest provinceArea error: {}", e);
             throw new BusinessException(e.getMessage());
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderBO.java
index 27c0c34..f232e34 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderBO.java
@@ -15,8 +15,24 @@ public class OrderBO {
     private Integer id;
     private String code;
     private Integer userId;
-    @NotNull(message = "提车时间不能为空")
+    @NotNull(message = "提车日期不能为空")
     private Date pickDate;
+
+    @NotBlank(message = "提车时间不能为空")
+    private String pickTime;
+    @NotNull(message = "是否上门提车不能为空")
+    private Integer isPick;
+    @NotNull(message = "是否送车上门不能为空")
+    private Integer isDeliv;
+    @NotNull(message = "运输方式不能为空")
+    private Integer transportType;
+    @NotNull(message = "是否开票不能为空")
+    private Integer isTicket;
+    //"发票抬头"
+    private String companyName;
+    // "纳税人识别码"
+    private String identifyNumber;
+
     @NotNull(message = "商品车品牌个数不能为空")
     private Integer brands;
     @NotNull(message = "商品车数量不能为空")
@@ -64,6 +80,10 @@ public class OrderBO {
 
     // 销售订单标签
     private String orderTagBOS;
+    //  发车详细地址
+    private String departAddr;
+    //  收车详细地址
+    private String destAddr;
 
     public Integer getId() {
         return id;
@@ -281,6 +301,78 @@ public class OrderBO {
         this.insuranceUnitPrice = insuranceUnitPrice;
     }
 
+    public String getPickTime() {
+        return pickTime;
+    }
+
+    public void setPickTime(String pickTime) {
+        this.pickTime = pickTime;
+    }
+
+    public Integer getIsPick() {
+        return isPick;
+    }
+
+    public void setIsPick(Integer isPick) {
+        this.isPick = isPick;
+    }
+
+    public Integer getIsDeliv() {
+        return isDeliv;
+    }
+
+    public void setIsDeliv(Integer isDeliv) {
+        this.isDeliv = isDeliv;
+    }
+
+    public Integer getTransportType() {
+        return transportType;
+    }
+
+    public void setTransportType(Integer transportType) {
+        this.transportType = transportType;
+    }
+
+    public Integer getIsTicket() {
+        return isTicket;
+    }
+
+    public void setIsTicket(Integer isTicket) {
+        this.isTicket = isTicket;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getIdentifyNumber() {
+        return identifyNumber;
+    }
+
+    public void setIdentifyNumber(String identifyNumber) {
+        this.identifyNumber = identifyNumber;
+    }
+
+    public String getDepartAddr() {
+        return departAddr;
+    }
+
+    public void setDepartAddr(String departAddr) {
+        this.departAddr = departAddr;
+    }
+
+    public String getDestAddr() {
+        return destAddr;
+    }
+
+    public void setDestAddr(String destAddr) {
+        this.destAddr = destAddr;
+    }
+
     @Override
     public String toString() {
         return "OrderBO{" +
@@ -288,6 +380,13 @@ public class OrderBO {
                 ", code='" + code + '\'' +
                 ", userId=" + userId +
                 ", pickDate=" + pickDate +
+                ", pickTime='" + pickTime + '\'' +
+                ", isPick='" + isPick + '\'' +
+                ", isDeliv='" + isDeliv + '\'' +
+                ", transportType='" + transportType + '\'' +
+                ", isTicket='" + isTicket + '\'' +
+                ", companyName='" + companyName + '\'' +
+                ", identifyNumber='" + identifyNumber + '\'' +
                 ", brands=" + brands +
                 ", seriesAmt=" + seriesAmt +
                 ", standardSalePrice=" + standardSalePrice +
@@ -311,6 +410,8 @@ public class OrderBO {
                 ", lineId=" + lineId +
                 ", orderSkuBOS='" + orderSkuBOS + '\'' +
                 ", orderTagBOS='" + orderTagBOS + '\'' +
+                ", departAddr='" + departAddr + '\'' +
+                ", destAddr='" + destAddr + '\'' +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderSkuBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderSkuBO.java
index b598da1..cfa4133 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderSkuBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderSkuBO.java
@@ -1,5 +1,7 @@
 package com.unlcn.ils.sales.backend.bo;
 
+import java.util.List;
+
 /**
  * Created by houjianhui on 2017/5/27.
  */
@@ -15,7 +17,7 @@ public class OrderSkuBO {
     private String modelCode;
     private String modelName;
     private Integer amt;
-    private String vin;
+    private List<String> vinList;
 
     public Integer getBrandId() {
         return brandId;
@@ -89,12 +91,12 @@ public class OrderSkuBO {
         this.modelName = modelName;
     }
 
-    public String getVin() {
-        return vin;
+    public List<String> getVinList() {
+        return vinList;
     }
 
-    public void setVin(String vin) {
-        this.vin = vin;
+    public void setVinList(List<String> vinList) {
+        this.vinList = vinList;
     }
 
     public Integer getSaleOrderId() {
@@ -127,7 +129,7 @@ public class OrderSkuBO {
                 ", modelCode='" + modelCode + '\'' +
                 ", modelName='" + modelName + '\'' +
                 ", amt=" + amt +
-                ", vin='" + vin + '\'' +
+                ", vinList='" + vinList + '\'' +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java
index 9708283..b8490f0 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderToKyleBO.java
@@ -34,6 +34,21 @@ public class OrderToKyleBO {
 
     private String comment;
 
+    // 是否开票
+    private Boolean isTicket;
+    // 运输方式
+    private Integer transportType;
+    // 是否上门提车
+    private Boolean isPick;
+    // 是否送车上门
+    private Boolean isDeliv;
+    // 提车详细地址
+    private String departAddr;
+    // 送车详细地址
+    private String destAddr;
+    // 提车时间
+    private String pickTime;
+
     public Integer getUserId() {
         return userId;
     }
@@ -217,7 +232,61 @@ public class OrderToKyleBO {
     public void setComment(String comment) {
         this.comment = comment;
     }
+    public Boolean getIsTicket() {
+        return isTicket;
+    }
+
+    public void setIsTicket(Boolean isTicket) {
+        isTicket = isTicket;
+    }
+
+    public Integer getTransportType() {
+        return transportType;
+    }
+
+    public void setTransportType(Integer transportType) {
+        this.transportType = transportType;
+    }
+
+    public Boolean getIsPick() {
+        return isPick;
+    }
+
+    public void setIsPick(Boolean isPick) {
+        isPick = isPick;
+    }
+
+    public Boolean getIsDeliv() {
+        return isDeliv;
+    }
 
+    public void setIsDeliv(Boolean isDeliv) {
+        isDeliv = isDeliv;
+    }
+
+    public String getDepartAddr() {
+        return departAddr;
+    }
+
+    public void setDepartAddr(String departAddr) {
+        this.departAddr = departAddr;
+    }
+
+    public String getDestAddr() {
+        return destAddr;
+    }
+
+    public void setDestAddr(String destAddr) {
+        this.destAddr = destAddr;
+    }
+
+    public String getPickTime() {
+        return pickTime;
+    }
+
+    public void setPickTime(String pickTime) {
+        this.pickTime = pickTime;
+    }
     @Override
     public String toString() {
         return "OrderToKyleBO{" +
@@ -244,6 +313,13 @@ public class OrderToKyleBO {
                 ", orderStatus=" + orderStatus +
                 ", orderSku='" + orderSku + '\'' +
                 ", comment='" + comment + '\'' +
+                ", isTicket=" + isTicket +
+                ", transportType=" + transportType +
+                ", isPick=" + isPick +
+                ", isDeliv=" + isDeliv +
+                ", departAddr=" + departAddr +
+                ", destAddr=" + destAddr +
+                ", pickTime=" + pickTime +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java
index 6ffe1e4..0a969fc 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/constant/AutoConfConstant.java
@@ -40,6 +40,13 @@ public class AutoConfConstant {
     @Value("${secure.bank.key}")
     private String bankSecureKey;
 
+    @Value("${hyc.operation.url}")
+    private String operation;
+
+    @Value("${hyc.operation.url.timeout}")
+    private Integer operationTime;
+
+
     public String getSc() {
         return sc;
     }
@@ -119,4 +126,20 @@ public class AutoConfConstant {
     public void setBankSecureKey(String bankSecureKey) {
         this.bankSecureKey = bankSecureKey;
     }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public Integer getOperationTime() {
+        return operationTime;
+    }
+
+    public void setOperationTime(Integer operationTime) {
+        this.operationTime = operationTime;
+    }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrService.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrService.java
index 3e22499..7eeac79 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrService.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrService.java
@@ -32,18 +32,17 @@ public interface OrderAddrService {
     /**
      * 查询目的地区域（省）信息
      *
-     * @param startAreaId 启运地ID
+     * @param
      * @return
      * @throws Exception
      */
-    List<AreaBO> listAreaByCondition(Integer startAreaId) throws Exception;
+    List<AreaBO> listAreaByCondition() throws Exception;
 
     /**
      * 根据起运地ID、目的地省ID查询区域信息
      *
-     * @param startAreaId 起运地ID
      * @param endProvinceId 目的地省ID
      * @return
      */
-    List<AreaBO> listAreaByCondition(Integer startAreaId, Integer endProvinceId) throws Exception;
+    List<AreaBO> listAreaByCondition(Integer endProvinceId) throws Exception;
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java
index e1f03e0..5fb1f01 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAddrServiceImpl.java
@@ -66,24 +66,29 @@ public class OrderAddrServiceImpl implements OrderAddrService {
     }
 
     @Override
-    public List<AreaBO> listAreaByCondition(Integer startAreaId) throws Exception {
-        return resolvAreaFormSCResult(null, startAreaId, null, province);
+    public List<AreaBO> listAreaByCondition() throws Exception {
+        return resolvAreaFormSCResult(null, null, null, province);
     }
 
     @Override
-    public List<AreaBO> listAreaByCondition(Integer startAreaId, Integer endProvinceId) throws Exception {
-        return resolvAreaFormSCResult(null, startAreaId, endProvinceId, endArea);
+    public List<AreaBO> listAreaByCondition(Integer endProvinceId) throws Exception {
+        return resolvAreaFormSCResult(null, null, endProvinceId, endArea);
     }
 
     private List<AreaBO> resolvAreaFormSCResult(String key, Integer startAreaId, Integer endProvinceId, String tag) throws Exception {
-        String url = autoConfConstant.getSc();
-        Integer time = autoConfConstant.getScTime();
+//        String url = autoConfConstant.getSc();
+//        Integer time = autoConfConstant.getScTime();
+        String url = autoConfConstant.getOperation();
+        Integer time = autoConfConstant.getOperationTime();
         if (startArea.equals(tag)) {
-            url = url + "/api/network/lnlines/queryStartArea/" + key;
+//            url = url + "/api/network/lnlines/queryStartArea/" + key;
+            url = url + "/api/line/queryStartArea/" + key;
         } else if (province.equals(tag)) {
-            url = url + "/api/network/lnlines/queryEndProvince/" + startAreaId ;
+//            url = url + "/api/network/lnlines/queryEndProvince/" + startAreaId ;
+            url = url + "/api/area/getAllProvince";
         } else if (endArea.equals(tag)) {
-            url = url + "/api/network/lnlines/queryEndArea/" + startAreaId + "/" + endProvinceId;
+//            url = url + "/api/network/lnlines/queryEndArea/" + startAreaId + "/" + endProvinceId;
+            url = url + "/api/area/queryCityByPid/" + endProvinceId;
         }
         String result = HttpRequestUtil.sendHttpGet(url, null, time);
         if (!Objects.equals(result, null)) {
@@ -109,24 +114,24 @@ public class OrderAddrServiceImpl implements OrderAddrService {
         } else if (Objects.equals(bo.getDepartRegionName(), null) || Objects.equals(bo.getDepartRegionName(), "")) {
             LOGGER.info("OrderAddrServiceImpl.save param DepartRegionName must not be null");
             throw new IllegalArgumentException("起运地名称不能为空");
-        } else if (Objects.equals(bo.getDepartContact(), null) || Objects.equals(bo.getDepartContact(), "")) {
-            LOGGER.info("OrderAddrServiceImpl.save param DepartContact must not be null");
-            throw new IllegalArgumentException("发车联系人不能为空");
-        } else if (Objects.equals(bo.getDepartPhone(), null) || Objects.equals(bo.getDepartPhone(), "")) {
-            LOGGER.info("OrderAddrServiceImpl.save param DepartPhone must not be null");
-            throw new IllegalArgumentException("发车人联系电话不能为空");
+//        } else if (Objects.equals(bo.getDepartContact(), null) || Objects.equals(bo.getDepartContact(), "")) {
+//            LOGGER.info("OrderAddrServiceImpl.save param DepartContact must not be null");
+//            throw new IllegalArgumentException("发车联系人不能为空");
+//        } else if (Objects.equals(bo.getDepartPhone(), null) || Objects.equals(bo.getDepartPhone(), "")) {
+//            LOGGER.info("OrderAddrServiceImpl.save param DepartPhone must not be null");
+//            throw new IllegalArgumentException("发车人联系电话不能为空");
         } else if (Objects.equals(bo.getDestRegionCode(), null) || Objects.equals(bo.getDestRegionCode(), "")) {
             LOGGER.info("OrderAddrServiceImpl.save param DestRegionCode must not be null");
             throw new IllegalArgumentException("目的地编码不能为空");
         } else if (Objects.equals(bo.getDestRegionName(), null) || Objects.equals(bo.getDestRegionName(), "")) {
             LOGGER.info("OrderAddrServiceImpl.save param DestRegionName must not be null");
             throw new IllegalArgumentException("目的地名称不能为空");
-        } else if (Objects.equals(bo.getDestContact(), null) || Objects.equals(bo.getDestContact(), "")) {
-            LOGGER.info("OrderAddrServiceImpl.save param DestContact must not be null");
-            throw new IllegalArgumentException("收车联系人不能为空");
-        } else if (Objects.equals(bo.getDestPhone(), null) || Objects.equals(bo.getDestPhone(), "")) {
-            LOGGER.info("OrderAddrServiceImpl.save param DestPhone must not be null");
-            throw new IllegalArgumentException("收车联系人电话不能为空");
+//        } else if (Objects.equals(bo.getDestContact(), null) || Objects.equals(bo.getDestContact(), "")) {
+//            LOGGER.info("OrderAddrServiceImpl.save param DestContact must not be null");
+//            throw new IllegalArgumentException("收车联系人不能为空");
+//        } else if (Objects.equals(bo.getDestPhone(), null) || Objects.equals(bo.getDestPhone(), "")) {
+//            LOGGER.info("OrderAddrServiceImpl.save param DestPhone must not be null");
+//            throw new IllegalArgumentException("收车联系人电话不能为空");
         } else if (Objects.equals(bo.getDistance(), null) || Objects.equals(bo.getDistance(), "")) {
             LOGGER.info("OrderAddrServiceImpl.save param Distance must not be null");
             throw new IllegalArgumentException("里程不能为空");
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
index cf1a582..246f16a 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
@@ -162,6 +162,13 @@ public class OrderAuditServiceImpl implements OrderAuditService {
                bo.setBxCost(val.getInsuranceSalePrice().toString());
                bo.setOrderSku(JSONArray.toJSONString(val.getOrderSkus()));
                bo.setComment(val.getComment());
+               bo.setIsPick(val.getIsPick());
+               bo.setIsDeliv(val.getIsDeliv());
+               bo.setIsTicket(val.getIsTicket());
+               bo.setTransportType(val.getTransportType());
+               bo.setDepartAddr(val.getDepartAddr());
+               bo.setDestAddr(val.getDestAddr());
+               bo.setPickTime(val.getPickTime());
                bos.add(bo);
            });
            return bos;
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index e1fc7d0..449901b 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -13,6 +13,7 @@ import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum;
 import com.unlcn.ils.sales.backend.enums.OrderStatusEnum;
 import com.unlcn.ils.sales.backend.util.UniquenessUtil;
 import com.unlcn.ils.sales.base.mapper.SaleOrderMapper;
+import com.unlcn.ils.sales.base.mapper.SaleOrderTicketMapper;
 import com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper;
 import com.unlcn.ils.sales.base.model.*;
 import org.apache.commons.collections4.CollectionUtils;
@@ -59,6 +60,9 @@ public class OrderServiceImpl implements OrderService {
     @Autowired
     private AutoConfConstant autoConfConstant;
 
+    @Autowired
+    private SaleOrderTicketMapper ticketMapper;
+
     @Override
     public int save(OrderBO bo, BindingResult br) throws Exception {
         LOGGER.info("OrderServiceImpl.save params OrderBO: {}", bo);
@@ -79,6 +83,10 @@ public class OrderServiceImpl implements OrderService {
         // 保存订单信息
         SaleOrder order = new SaleOrder();
         BeanUtils.copyProperties(bo, order);
+        if (bo.getIsPick() ==1){ order.setIsPick(true); }else if(bo.getIsPick() ==0){ order.setIsPick(false); }
+        if (bo.getIsTicket() ==1){ order.setIsTicket(true); }else if(bo.getIsTicket() ==0){ order.setIsTicket(false); }
+        if (bo.getIsDeliv() ==1){ order.setIsDeliv(true); }else if(bo.getIsDeliv() ==0){ order.setIsDeliv(false); }
+
         try {
             orderMapper.insertSelective(order);
         } catch (Exception e) {
@@ -96,6 +104,15 @@ public class OrderServiceImpl implements OrderService {
 
         // 保存销售订单审核信息
         orderAuditService.save(saleOrderId, order.getCode());
+
+        // 保存发票信息
+        if (bo.getIsTicket() == 1){
+            SaleOrderTicket ticket = new SaleOrderTicket();
+            ticket.setOrderId(saleOrderId);
+            ticket.setName(bo.getCompanyName());
+            ticket.setIdentifyNumber(bo.getIdentifyNumber());
+            ticketMapper.insertSelective(ticket);
+        }
         return order.getId();
     }
 
@@ -457,8 +474,10 @@ public class OrderServiceImpl implements OrderService {
      * @throws Exception
      */
     private List<PriceBO> resolvPriceFormSCResult(Integer departRegionId, Integer destRegionId) throws Exception {
-        String url = autoConfConstant.getSc() + "/api/price/channel/sale/queryPrice/" + departRegionId + "/" + destRegionId;
-        Integer time = autoConfConstant.getScTime();
+//        String url = autoConfConstant.getSc() + "/api/price/channel/sale/queryPrice/" + departRegionId + "/" + destRegionId;
+        String url = autoConfConstant.getOperation() + "/api/price/querySalePrice/" + departRegionId + "/" + destRegionId;
+//        Integer time = autoConfConstant.getScTime();
+        Integer time = autoConfConstant.getOperationTime();
         String result = HttpRequestUtil.sendHttpGet(url, null, time);
         if (!Objects.equals(result, null)) {
             JSONObject jsonObject = JSONObject.parseObject(result);
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
index 2070d07..0a0cb32 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
@@ -55,15 +55,28 @@ public class OrderSkuServiceImpl implements OrderSkuService {
 
         skuBOS.stream().forEach(val -> {
             val.setSaleOrderId(saleOrderId);
-            // 保存数据
-            SaleOrderSku sku = new SaleOrderSku();
-            BeanUtils.copyProperties(val, sku);
-
-            try {
-                orderSkuMapper.insertSelective(sku);
-            } catch (Exception e) {
-                LOGGER.error("OrderSkuServiceImpl.save error: {}", e);
-                throw new BusinessException("保存销售订单商品车信息异常");
+            if (val.getVinList() !=null && val.getVinList().size()>0) {
+                val.getVinList().stream().forEach(str -> {
+                    // 保存数据
+                    SaleOrderSku sku = new SaleOrderSku();
+                    BeanUtils.copyProperties(val, sku);
+                    sku.setVin(str);
+                    try {
+                        orderSkuMapper.insertSelective(sku);
+                    } catch (Exception e) {
+                        LOGGER.error("OrderSkuServiceImpl.save error: {}", e);
+                        throw new BusinessException("保存销售订单商品车信息异常");
+                    }
+                });
+            } else {
+                SaleOrderSku sku = new SaleOrderSku();
+                BeanUtils.copyProperties(val, sku);
+                try {
+                    orderSkuMapper.insertSelective(sku);
+                } catch (Exception e) {
+                    LOGGER.error("OrderSkuServiceImpl.save error: {}", e);
+                    throw new BusinessException("保存销售订单商品车信息异常");
+                }
             }
         });
 
@@ -86,8 +99,10 @@ public class OrderSkuServiceImpl implements OrderSkuService {
     }
 
     private List<BrandBO> resolvBrandFormSCResult(String key) throws Exception {
-        String url = autoConfConstant.getSc() + "/api/model/base/cv/queryModel/" + key;
-        Integer time = autoConfConstant.getScTime();
+//        String url = autoConfConstant.getSc() + "/api/model/base/cv/queryModel/" + key;
+        String url = autoConfConstant.getOperation() + "/api/brandSeries/queryBrands/" + key;
+//        Integer time = autoConfConstant.getScTime();
+        Integer time = autoConfConstant.getOperationTime();
         String result = HttpRequestUtil.sendHttpGet(url, null, time);
         if (!Objects.equals(result, null)) {
             JSONObject jsonObject = JSONObject.parseObject(result);
diff --git a/ils-sales-backend/src/main/resources/constant.properties b/ils-sales-backend/src/main/resources/constant.properties
index 1c751de..9001ce8 100644
--- a/ils-sales-backend/src/main/resources/constant.properties
+++ b/ils-sales-backend/src/main/resources/constant.properties
@@ -73,3 +73,8 @@ ils.bms.url.timeout=7200
 
 #整板数量配置
 ils.sale.brands=10
+
+#operation主数据地址
+hyc.operation.url=http://192.168.199.164:8080
+#operation主数据地址请求超时
+hyc.operation.url.timeout=7200
diff --git a/ils-sales-base/lib/mybatis-page-plugin-1.0-SNAPSHOT.jar b/ils-sales-base/lib/mybatis-page-plugin-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5fcf5047804f31c2f388cf79904a043dbc98543e
GIT binary patch
literal 5256
zcmbVQ2{=@J7a!G(oe6^p$-Yar?3%1YmSl}=*~T_w#vWzKlC8p!CE3YNQ(Ej>jIAg;
zg-Ak(j3qwmmG}EvzV~_0JonCho_l`3|2hBVoO6$^=HVk`fIS((Tu}b@@YjuW_g_mz
zA0`CXRz0cvml_FRcvo#zxvdGa`#OC0qWim=7EBwis&YYJSWES@R!93eO(Efzl$t{P
zT^-#I^h92Xy`4hycXsf-^eDjTwc<Mjx_CR=+qyNwNb+WUb8Ld+lRiM3Qtm9Hr5SR#
z6S8vy3}op!x$U$03ET-e(|n8{p|jB4m-JlrHVHZOY(*rk@M2ye!vOdqdI?Pg*f;WL
zUyke=iA3A~aN}o<y*b#^u<<}TdHg{S{9k(ZXe83*588~s(01{$wsJ>c{(xfr0}AEr
zVUKYA0VesjY`v~+jhVY1z@Y$u#6JLA?NaR8fOOUU#wL8(*$RVsXiVxyHwD?b*0#`P
zBMLSnDI;MNxrKSaNs@3xw*nL{$i_)Tnm_OCNuz3K-`F8YBUqiCn3GrSFz-LmcwBEZ
zK;Oxw@bysN(6cX(a>A-V^%-u~AU#iOc6FB4a@ThFJ-@QER^#Q5Ty7Ox8zD|lx|EyF
zz++o=5yoTAG5OGMTZXhWaR~$@8sQ(079Hc9>?Ff4($}mQlIGb|Y1NyJ;NK(P3s&-Z
z6OWn1c#V&4Ev2EW7(PwjT+<{3L{ak_M-4;V$CX4CI(S%bFP(>awGtTZcf6rDcCH8M
zOlXtlLG&kWpb8<+2s5rgXw>pc=(d!=<ne6<qZpk@bKu&z81vdy(t8GFARdTZK=;zi
z_v_0Hgc;bjw|WBu#B6~`u|v(P-TQiNw+10LNXt83r$%s6K(vN`@|42nF@|L+hGh?h
zuc1*$JR#vaQh-2JBQSY|EUj)0vIS6#U*v!)CM?kc6`SKmQWfJCF`;#;jiMu+6gdw)
zu0Z`>>YugG4~Hg<VYOR4p6NuU;Ao<9K;oEEJ0`!hODj)^DZ?_P6Dq>kZ@ACu%81(J
z>9wh&IZK{|(n2MBl|msO`exwde1)chxKo1g*b@&X^AngQSM%>ncS(-+xOBdzrC7Qc
zct;7k?5XFe%p}Q9+E5FV%~aXYYdrNe+?8zM5kg8vs9#&UaRU%Y-Z?z`MXbY(d>wkx
z?qu9J`(-&vC2zxmTkENf)7mbNjZPz;_;WhNIZ>=x^3Okd?)gxbB{%JrP-WfO{%)I$
zEVx+3NrauWJ(2~!CIwBl<GEp#HtwD?Qi4k|y=*+oQr?SpAHM6ITz3Y4j;Hv8Eo2r7
zS>Y^f%C|EH)7HSBg+f2L%hM0V$?2o#s}2R-8AowJkPpN%;s!z(Kx?fi;kr`h=a1by
zH(a=36$$E1QQ0s<)Xp2Ld4!W=pKf;lLrSN7t#`N_E)|f@09QLjb}X<<eUKu$H#{mP
zi~Gn<dPd5-#trMPN7!B(TBh_`-c!`K9JzsK^zs~d;zO-<J;|(HhdGiFoV=lo)BQ1P
zr*2xWt9Cw`$)-E}n$}FZo_XYwZFLJ6TY%HLBQbf3XX+@rB6*fQp%`{KoUFjE7qcDM
z*0G@J2)g-f2<{ou9-ioK=z9Ti<;)w$MdKo73zZb9!U%;qHjTJ2<I=*xk_aniZfuiA
z7*^K}&>w4RAJ;5b4w7E+LAP~8nVRXzr+GGG(`B2?<#TmjM`#()LxTA`HT0u}kW{BJ
zM76q0np+VO(;a#nD_O4QwU9&i3pR33HBA~sKapnHd>mmh$p@*0nKd8{wy0_o7l|R)
zn(pauL9g9jG=f}fd}FY6cqg?_j+QnhC2Vfvq+IdD8v->pxvQim#)U<mKdrtu-T<N2
zomk1T5#Bg&o!2He6}EEQRaWAhElRoh!~}mDmuHK<VS@(LF;a{D#=8ErJrNduF2Ohn
zPiI&{)4`1GoN^Ul+pHi<O&pNJUTO-WNhz%W7U|iN53+}<Oiq@_yWAliO&GAoh78bP
zFLfjoI73al)DrWHB3O$`X6Ez<$>`HLQSM$X1GLVg$yyHs3Qns4P48D|LJd3>ks`_Y
zhR&I_lGx$~A8fIm1b?Be2Y;bGM!gBlz&0quRcz1<PO=qaF9%^IDnu?#o8a?X-*QJt
z-;lU3*wCjQ6*b6iCOhW(uD2|4Ihb7wi<%90edEAXB3%BE-#o@B|8dfLht5}qi{gW^
zFGAY@@v{%(5<`;VeLQ*kANu%O@e<8Aav$Hobnsb);pB+%ZVy1J>~QZKbo%v^)-=21
zvtr`~S(^7o#$1@-oyRjMBBx6>EL}#M+OIBz2*gLnxSeB=NAehGG<J^qlb?JmJi`@4
zYs5EA<*3a7;UdD_v%pzboFHaTtq{0+_`VhxlD+sEm#Vq5bbY;@EuB@{DOXIGqC(0n
z=8Q%Yv3FJv*Mg^`hoBLOg?va>6*!07?8WW)S?igZZFZAMr2lbhj|U%Vk|Xm0BT`o=
zpNBK$)^}d$8+}k%$}!aM25B6!-UuQmQlDimPzVYC80lEoQoo2A(>-UBE9+`=+NUc$
zhPNK}_!=*vHHfbE)#lS=i8JIWxe{X(-c_YJ7kpl%M9Os2o!K&D#z&^BQ1$nqDA{GX
z3oe&by=M62K&Dl2Y~m{3_0-%+ZMBz-T?+ysD;8qISBE}6uk;mi@}@6vLj(o}Cs&6g
z-W=+ZnKgfZ)7C!T6GwEus(tiTniYOAe|qt1z9b%g_?VChCx)++htvPd!qj|TT#T$q
zqfu;p+pLmz#jw?}bAwt_e$bh*-s2xR{h#h6wkB=h+bkyHmsH@bVkF_{AO{^TRl+q^
zUQWbxNWzCzy7fCUx^$jj#H{*Y2C8T;yIM87Dgqgoo1Hn@S6N^p$3X=a<xSN3F_5uE
z?_!WCzk9ueZkb9=VXAwuphQ!%)WqiitEpE<tv<Ng=;%bHziN=qQDF0Cr7z4?u=)fW
z6~EF$Uu*@Gc}c#_5xi7N<-3q$a(ygnY<uH;nJhv#$Y}-&j*Kk3nO2|{aCI*4^du{%
z$@Is!N_=^RNC%39sLc3U|FJ7{+p^0j3~*2{wwmH|nOU8oPmzhS!c(e#`(_1(ZVqh_
z<x)|;sX7sBwP_dI3)Xm5Hm{KGj3UMSBkgJ#b|PW9n9X2F)}6$96-p~#5}}~W7X>*f
zEFpA7sw5ICMM{TfLnK#^`<kcFQ=DMKA=(_X(&=T2u|2bv+9wUQ?$DgS>(F6&mBDE>
zgjLyyAV@EgdX|`yAA0dC+m4CgI{~Nl@MDC{^2ZWjijYH4!M3*(7mVr5@I38J%A~-H
z{*@f4%?H$Be$<&yVX5vui!`6I$8h}bIP8!rsqR2U#C<6QE&jukP<JQpl*)7(rw?nQ
zb4@aHExwruE}lo@V95z7Npf=MJWNrJ6tn?`-Vx0dK?Ro$+^90pepifUcY-LItMhWV
zVVC?kZ}bxjFo}<uM|{yB7!})>(_s7BThT(RURJiC#77%l8Bed#6+TYVzU%>#VB3Md
zveRW)j$`_$v~8&bie|HDedA3(t|xwd3o0I>DHdKto!WTJ+O>ot6{ZPtYP5-O7d1|-
z-!S~ZESy*U9*1XJ7nihoaV+-1yL!n?QuuKz5Yu`~?$y|1$D5}qN*Fn+Vja{YJ?e#?
zz^=pyXz;gX_ZXOQNe9Qk-`xmyW(gjaJYP~-?r%pZUt!KB05ff#7lM_E6D$P`t(jD2
zJn=Ky&ULRJACh&DP`&*$uIdGl_!)|3^f9HpcYtGkmOk)!p3LGApDFlRf3nRx)L)%}
zUmk#%Ej#Jh<b+FBtFVzo$80~xPl*QKbZ$7Q0xb-V6mLFrOF{bPTh--N!;Nsoh@%nr
zrH(hA%8XOL7lxv3CNEWazI3QzK!E+0n|M5-g?&&!*)5~(Eb=sKG#8x(_x$^bPE((w
z(dL3JC)qlYT}DsYdLlmecc|HejEKE#!0ndrW9q7BW=~Qs%+9a9Ui-2cJX&2IDmEZ*
zH<!*!8JwT~)*KEmPwrvQ(+1LC;Fl6Ng{%4VnX5M72}YL<9U}AZ1bm|KZ2?0v)MH~D
zAo|9v=J2i5ZF<;x!Oo%I*Z0)BMemPq6&EW{+k*=E=Td*Ky#62M-O6A1TjekO|0;U1
z{}2AFz!ySU+1m>JRIi6+M=3c}HDqrQ0RWjm06^y75u%VT!rm^<#rj&96cKRsrjf|V
z?K)T48)}9_nt69`q@26!?rUHfITg^P-r%|I-%lda;t|&s&xCxlQ1g}M*<hkd8SrwB
zVWbF~8)JZm2e&~D2`j6Dn$bAry)yg^Ww!8{M-`E%c{7PT9G$7IvOfEz!!Nn>*1R+~
zVwxCjY1}O)Mc<eXKAZQHtw@oe>Xp)->7JS=<A`UE#mi*qF+Mewu8dwa%xjPkwa{WU
zvz~LAuFoGox<&017loAxo(TJN1X&c7W=Y%K9$ivc3Vn{^EL_ECfnRcE-L3Dv?zWt$
z&T?p~otCWfJQq5=AhRpS+TC)EY91`rb>gD`rhDxMdaceO%$JIOS@4DYdnPMJ`E6ee
z$duPTM7Rq1_NbgSWef`z_{Orm{~<pPuejmZqa-xuJ)5pfs-%!biSAHVyAKMOr_=Zt
z<ySzBF(V71<byqdQ5?oT>Op)K#S4p-SXvCXo*`;DlqJe^-toes=OX-EY@=V?8tb&t
z(yD}uAEE%;=!ffOukVpew_O2S>UQ13i4-c^_7C}AGjMp0+tHal@lO3Cmx)wxEsi-c
z>kxLl`SMEKUBtMXTjLb6-xo)aU)=(9CD!nGIVo^l5M^=kuhe)SyA9`Qg9RQPNUju!
z@x9ktdn~bJt?1VE4l3$aCNk)WuV8NP;qB(BTB7~q@ckQb>!@(qwcWiGynDg^{hmUh
zktkcVJHi%28C^}*c!Ck&Rqq8B6&M=I2&Bk)aW6yBGW|hcDZ7h)6lnR2N7b|Or(#E1
zp9XN*ah<L{Q<r~5LN1WaTIc#)Wz`!vTAyPO#dhlAiEf2Zn27f4uZ#ML&%<xGm**C;
zSbKK#5sHhFq^z<rORQgoi?s@0Hg}67h{eAae4hV8tgA_Mi0<(3TNAr3?g|(%zvt}1
zc|L&sx>d2KyeHX#JiGTFVc>6#ivxzAL&shp;k)b&+_C%ky{qthQ@=Z~huK3c{Ds)>
zGW;I5*Jt=HdpP>tU~$l$*pE@aNAL9=4$#WKKp%7=e$TQOC=XbC|G@Gi%I%Z=x-YR$
zmmOI756FJmrTEk8>}7%P0tW2t6jA(befM+1zI{J0?cbf<*%|y9{Bw@@J=tECIIx7C
z@+V9Fm+aR$V}Ae=z^}5#{t(%L_Wy2xzjDaIl>R!B9E|g9cZPo)neS8jPaN4B=OC`=
UY63xfl$5)_!NUMR(zmVtA4nBMvH$=8

literal 0
HcmV?d00001

diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAddrMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAddrMapper.java
index b5eca20..536ae8e 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAddrMapper.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderAddrMapper.java
@@ -10,7 +10,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int countByExample(SaleOrderAddrExample example);
 
@@ -18,7 +18,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int deleteByExample(SaleOrderAddrExample example);
 
@@ -26,7 +26,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int deleteByPrimaryKey(Integer id);
 
@@ -34,7 +34,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int insert(SaleOrderAddr record);
 
@@ -42,7 +42,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int insertSelective(SaleOrderAddr record);
 
@@ -50,7 +50,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     List<SaleOrderAddr> selectByExample(SaleOrderAddrExample example);
 
@@ -58,7 +58,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     SaleOrderAddr selectByPrimaryKey(Integer id);
 
@@ -66,7 +66,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByExampleSelective(@Param("record") SaleOrderAddr record, @Param("example") SaleOrderAddrExample example);
 
@@ -74,7 +74,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByExample(@Param("record") SaleOrderAddr record, @Param("example") SaleOrderAddrExample example);
 
@@ -82,7 +82,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByPrimaryKeySelective(SaleOrderAddr record);
 
@@ -90,7 +90,7 @@ public interface SaleOrderAddrMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByPrimaryKey(SaleOrderAddr record);
 }
\ No newline at end of file
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java
index f430796..0657f34 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java
@@ -10,7 +10,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int countByExample(SaleOrderExample example);
 
@@ -18,7 +18,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int deleteByExample(SaleOrderExample example);
 
@@ -26,7 +26,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int deleteByPrimaryKey(Integer id);
 
@@ -34,7 +34,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int insert(SaleOrder record);
 
@@ -42,7 +42,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int insertSelective(SaleOrder record);
 
@@ -50,7 +50,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     List<SaleOrder> selectByExample(SaleOrderExample example);
 
@@ -58,7 +58,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     SaleOrder selectByPrimaryKey(Integer id);
 
@@ -66,7 +66,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByExampleSelective(@Param("record") SaleOrder record, @Param("example") SaleOrderExample example);
 
@@ -74,7 +74,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByExample(@Param("record") SaleOrder record, @Param("example") SaleOrderExample example);
 
@@ -82,7 +82,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByPrimaryKeySelective(SaleOrder record);
 
@@ -90,7 +90,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     int updateByPrimaryKey(SaleOrder record);
 }
\ No newline at end of file
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderTicketMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderTicketMapper.java
new file mode 100644
index 0000000..9bbc4f6
--- /dev/null
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderTicketMapper.java
@@ -0,0 +1,96 @@
+package com.unlcn.ils.sales.base.mapper;
+
+import com.unlcn.ils.sales.base.model.SaleOrderTicket;
+import com.unlcn.ils.sales.base.model.SaleOrderTicketExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface SaleOrderTicketMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int countByExample(SaleOrderTicketExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int deleteByExample(SaleOrderTicketExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int insert(SaleOrderTicket record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int insertSelective(SaleOrderTicket record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    List<SaleOrderTicket> selectByExample(SaleOrderTicketExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    SaleOrderTicket selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") SaleOrderTicket record, @Param("example") SaleOrderTicketExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int updateByExample(@Param("record") SaleOrderTicket record, @Param("example") SaleOrderTicketExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int updateByPrimaryKeySelective(SaleOrderTicket record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    int updateByPrimaryKey(SaleOrderTicket record);
+}
\ No newline at end of file
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
index c81ec16..d95dfd3 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
@@ -50,6 +50,21 @@ public class OrderViewDAO {
 
     private List<OrderAttachViewDAO> attachs;
 
+    // 是否开票
+    private Boolean isTicket;
+    // 运输方式
+    private Integer transportType;
+    // 是否上门提车
+    private Boolean isPick;
+    // 是否送车上门
+    private Boolean isDeliv;
+    // 提车详细地址
+    private String departAddr;
+    // 送车详细地址
+    private String destAddr;
+    // 提车时间
+    private String pickTime;
+
     public Integer getId() {
         return id;
     }
@@ -314,6 +329,62 @@ public class OrderViewDAO {
         this.attachs = attachs;
     }
 
+    public Boolean getIsTicket() {
+        return isTicket;
+    }
+
+    public void setIsTicket(Boolean isTicket) {
+        isTicket = isTicket;
+    }
+
+    public Integer getTransportType() {
+        return transportType;
+    }
+
+    public void setTransportType(Integer transportType) {
+        this.transportType = transportType;
+    }
+
+    public Boolean getIsPick() {
+        return isPick;
+    }
+
+    public void setIsPick(Boolean isPick) {
+        isPick = isPick;
+    }
+
+    public Boolean getIsDeliv() {
+        return isDeliv;
+    }
+
+    public void setIsDeliv(Boolean isDeliv) {
+        isDeliv = isDeliv;
+    }
+
+    public String getDepartAddr() {
+        return departAddr;
+    }
+
+    public void setDepartAddr(String departAddr) {
+        this.departAddr = departAddr;
+    }
+
+    public String getDestAddr() {
+        return destAddr;
+    }
+
+    public void setDestAddr(String destAddr) {
+        this.destAddr = destAddr;
+    }
+
+    public String getPickTime() {
+        return pickTime;
+    }
+
+    public void setPickTime(String pickTime) {
+        this.pickTime = pickTime;
+    }
+
     @Override
     public String toString() {
         return "OrderViewDAO{" +
@@ -350,6 +421,13 @@ public class OrderViewDAO {
                 ", distance=" + distance +
                 ", orderSkus=" + orderSkus +
                 ", attachs=" + attachs +
+                ", isTicket=" + isTicket +
+                ", transportType=" + transportType +
+                ", isPick=" + isPick +
+                ", isDeliv=" + isDeliv +
+                ", departAddr=" + departAddr +
+                ", destAddr=" + destAddr +
+                ", pickTime=" + pickTime +
                 '}';
     }
 }
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java
index b6c4ca6..161d2c0 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java
@@ -9,7 +9,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.id
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer id;
 
@@ -17,7 +17,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.code
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String code;
 
@@ -25,7 +25,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.user_id
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer userId;
 
@@ -33,15 +33,23 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.pick_date
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Date pickDate;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.pick_time
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String pickTime;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.brands
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer brands;
 
@@ -49,7 +57,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.series_amt
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer seriesAmt;
 
@@ -57,7 +65,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.standard_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal standardSalePrice;
 
@@ -65,7 +73,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.standard_unit_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal standardUnitPrice;
 
@@ -73,7 +81,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.suggest_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal suggestSalePrice;
 
@@ -81,7 +89,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.final_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal finalSalePrice;
 
@@ -89,7 +97,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.final_purchase_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal finalPurchasePrice;
 
@@ -97,7 +105,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.insurance_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal insuranceSalePrice;
 
@@ -105,7 +113,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.insurance_unit_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal insuranceUnitPrice;
 
@@ -113,7 +121,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.order_status
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer orderStatus;
 
@@ -121,7 +129,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.attach_audit_status
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer attachAuditStatus;
 
@@ -129,7 +137,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.comment
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String comment;
 
@@ -137,7 +145,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.delete_mark
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Boolean deleteMark;
 
@@ -145,7 +153,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.gmt_create
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Date gmtCreate;
 
@@ -153,15 +161,63 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.gmt_update
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Date gmtUpdate;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.is_pick
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Boolean isPick;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.is_deliv
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Boolean isDeliv;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.transport_type
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Integer transportType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.is_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Boolean isTicket;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.arrive_date
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Date arriveDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.arrive_time
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String arriveTime;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private static final long serialVersionUID = 1L;
 
@@ -171,7 +227,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.id
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getId() {
         return id;
@@ -183,7 +239,7 @@ public class SaleOrder implements Serializable {
      *
      * @param id the value for sale_order.id
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setId(Integer id) {
         this.id = id;
@@ -195,7 +251,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.code
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getCode() {
         return code;
@@ -207,7 +263,7 @@ public class SaleOrder implements Serializable {
      *
      * @param code the value for sale_order.code
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
@@ -219,7 +275,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.user_id
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getUserId() {
         return userId;
@@ -231,7 +287,7 @@ public class SaleOrder implements Serializable {
      *
      * @param userId the value for sale_order.user_id
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setUserId(Integer userId) {
         this.userId = userId;
@@ -243,7 +299,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.pick_date
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Date getPickDate() {
         return pickDate;
@@ -255,19 +311,43 @@ public class SaleOrder implements Serializable {
      *
      * @param pickDate the value for sale_order.pick_date
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setPickDate(Date pickDate) {
         this.pickDate = pickDate;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.pick_time
+     *
+     * @return the value of sale_order.pick_time
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getPickTime() {
+        return pickTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.pick_time
+     *
+     * @param pickTime the value for sale_order.pick_time
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setPickTime(String pickTime) {
+        this.pickTime = pickTime == null ? null : pickTime.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column sale_order.brands
      *
      * @return the value of sale_order.brands
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getBrands() {
         return brands;
@@ -279,7 +359,7 @@ public class SaleOrder implements Serializable {
      *
      * @param brands the value for sale_order.brands
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setBrands(Integer brands) {
         this.brands = brands;
@@ -291,7 +371,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.series_amt
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getSeriesAmt() {
         return seriesAmt;
@@ -303,7 +383,7 @@ public class SaleOrder implements Serializable {
      *
      * @param seriesAmt the value for sale_order.series_amt
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setSeriesAmt(Integer seriesAmt) {
         this.seriesAmt = seriesAmt;
@@ -315,7 +395,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.standard_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getStandardSalePrice() {
         return standardSalePrice;
@@ -327,7 +407,7 @@ public class SaleOrder implements Serializable {
      *
      * @param standardSalePrice the value for sale_order.standard_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setStandardSalePrice(BigDecimal standardSalePrice) {
         this.standardSalePrice = standardSalePrice;
@@ -339,7 +419,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.standard_unit_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getStandardUnitPrice() {
         return standardUnitPrice;
@@ -351,7 +431,7 @@ public class SaleOrder implements Serializable {
      *
      * @param standardUnitPrice the value for sale_order.standard_unit_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setStandardUnitPrice(BigDecimal standardUnitPrice) {
         this.standardUnitPrice = standardUnitPrice;
@@ -363,7 +443,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.suggest_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getSuggestSalePrice() {
         return suggestSalePrice;
@@ -375,7 +455,7 @@ public class SaleOrder implements Serializable {
      *
      * @param suggestSalePrice the value for sale_order.suggest_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setSuggestSalePrice(BigDecimal suggestSalePrice) {
         this.suggestSalePrice = suggestSalePrice;
@@ -387,7 +467,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.final_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getFinalSalePrice() {
         return finalSalePrice;
@@ -399,7 +479,7 @@ public class SaleOrder implements Serializable {
      *
      * @param finalSalePrice the value for sale_order.final_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setFinalSalePrice(BigDecimal finalSalePrice) {
         this.finalSalePrice = finalSalePrice;
@@ -411,7 +491,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.final_purchase_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getFinalPurchasePrice() {
         return finalPurchasePrice;
@@ -423,7 +503,7 @@ public class SaleOrder implements Serializable {
      *
      * @param finalPurchasePrice the value for sale_order.final_purchase_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setFinalPurchasePrice(BigDecimal finalPurchasePrice) {
         this.finalPurchasePrice = finalPurchasePrice;
@@ -435,7 +515,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.insurance_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getInsuranceSalePrice() {
         return insuranceSalePrice;
@@ -447,7 +527,7 @@ public class SaleOrder implements Serializable {
      *
      * @param insuranceSalePrice the value for sale_order.insurance_sale_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setInsuranceSalePrice(BigDecimal insuranceSalePrice) {
         this.insuranceSalePrice = insuranceSalePrice;
@@ -459,7 +539,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.insurance_unit_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getInsuranceUnitPrice() {
         return insuranceUnitPrice;
@@ -471,7 +551,7 @@ public class SaleOrder implements Serializable {
      *
      * @param insuranceUnitPrice the value for sale_order.insurance_unit_price
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setInsuranceUnitPrice(BigDecimal insuranceUnitPrice) {
         this.insuranceUnitPrice = insuranceUnitPrice;
@@ -483,7 +563,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.order_status
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getOrderStatus() {
         return orderStatus;
@@ -495,7 +575,7 @@ public class SaleOrder implements Serializable {
      *
      * @param orderStatus the value for sale_order.order_status
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setOrderStatus(Integer orderStatus) {
         this.orderStatus = orderStatus;
@@ -507,7 +587,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.attach_audit_status
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getAttachAuditStatus() {
         return attachAuditStatus;
@@ -519,7 +599,7 @@ public class SaleOrder implements Serializable {
      *
      * @param attachAuditStatus the value for sale_order.attach_audit_status
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setAttachAuditStatus(Integer attachAuditStatus) {
         this.attachAuditStatus = attachAuditStatus;
@@ -531,7 +611,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.comment
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getComment() {
         return comment;
@@ -543,7 +623,7 @@ public class SaleOrder implements Serializable {
      *
      * @param comment the value for sale_order.comment
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setComment(String comment) {
         this.comment = comment == null ? null : comment.trim();
@@ -555,7 +635,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.delete_mark
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Boolean getDeleteMark() {
         return deleteMark;
@@ -567,7 +647,7 @@ public class SaleOrder implements Serializable {
      *
      * @param deleteMark the value for sale_order.delete_mark
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDeleteMark(Boolean deleteMark) {
         this.deleteMark = deleteMark;
@@ -579,7 +659,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.gmt_create
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Date getGmtCreate() {
         return gmtCreate;
@@ -591,7 +671,7 @@ public class SaleOrder implements Serializable {
      *
      * @param gmtCreate the value for sale_order.gmt_create
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
@@ -603,7 +683,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.gmt_update
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Date getGmtUpdate() {
         return gmtUpdate;
@@ -615,17 +695,161 @@ public class SaleOrder implements Serializable {
      *
      * @param gmtUpdate the value for sale_order.gmt_update
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setGmtUpdate(Date gmtUpdate) {
         this.gmtUpdate = gmtUpdate;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.is_pick
+     *
+     * @return the value of sale_order.is_pick
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Boolean getIsPick() {
+        return isPick;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.is_pick
+     *
+     * @param isPick the value for sale_order.is_pick
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setIsPick(Boolean isPick) {
+        this.isPick = isPick;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.is_deliv
+     *
+     * @return the value of sale_order.is_deliv
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Boolean getIsDeliv() {
+        return isDeliv;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.is_deliv
+     *
+     * @param isDeliv the value for sale_order.is_deliv
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setIsDeliv(Boolean isDeliv) {
+        this.isDeliv = isDeliv;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.transport_type
+     *
+     * @return the value of sale_order.transport_type
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Integer getTransportType() {
+        return transportType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.transport_type
+     *
+     * @param transportType the value for sale_order.transport_type
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setTransportType(Integer transportType) {
+        this.transportType = transportType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.is_ticket
+     *
+     * @return the value of sale_order.is_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Boolean getIsTicket() {
+        return isTicket;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.is_ticket
+     *
+     * @param isTicket the value for sale_order.is_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setIsTicket(Boolean isTicket) {
+        this.isTicket = isTicket;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.arrive_date
+     *
+     * @return the value of sale_order.arrive_date
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Date getArriveDate() {
+        return arriveDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.arrive_date
+     *
+     * @param arriveDate the value for sale_order.arrive_date
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setArriveDate(Date arriveDate) {
+        this.arriveDate = arriveDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.arrive_time
+     *
+     * @return the value of sale_order.arrive_time
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getArriveTime() {
+        return arriveTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.arrive_time
+     *
+     * @param arriveTime the value for sale_order.arrive_time
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setArriveTime(String arriveTime) {
+        this.arriveTime = arriveTime == null ? null : arriveTime.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     @Override
     public String toString() {
@@ -637,6 +861,7 @@ public class SaleOrder implements Serializable {
         sb.append(", code=").append(code);
         sb.append(", userId=").append(userId);
         sb.append(", pickDate=").append(pickDate);
+        sb.append(", pickTime=").append(pickTime);
         sb.append(", brands=").append(brands);
         sb.append(", seriesAmt=").append(seriesAmt);
         sb.append(", standardSalePrice=").append(standardSalePrice);
@@ -652,6 +877,12 @@ public class SaleOrder implements Serializable {
         sb.append(", deleteMark=").append(deleteMark);
         sb.append(", gmtCreate=").append(gmtCreate);
         sb.append(", gmtUpdate=").append(gmtUpdate);
+        sb.append(", isPick=").append(isPick);
+        sb.append(", isDeliv=").append(isDeliv);
+        sb.append(", transportType=").append(transportType);
+        sb.append(", isTicket=").append(isTicket);
+        sb.append(", arriveDate=").append(arriveDate);
+        sb.append(", arriveTime=").append(arriveTime);
         sb.append("]");
         return sb.toString();
     }
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddr.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddr.java
index 309a0c0..8694a32 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddr.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddr.java
@@ -9,7 +9,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer id;
 
@@ -17,7 +17,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.sale_order_id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer saleOrderId;
 
@@ -25,7 +25,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.line_id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Integer lineId;
 
@@ -33,7 +33,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.depart_region_code
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String departRegionCode;
 
@@ -41,7 +41,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.depart_region_name
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String departRegionName;
 
@@ -49,7 +49,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.depart_contact
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String departContact;
 
@@ -57,15 +57,23 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.depart_phone
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String departPhone;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_addr.depart_addr
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String departAddr;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.dest_region_code
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String destRegionCode;
 
@@ -73,7 +81,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.dest_region_name
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String destRegionName;
 
@@ -81,7 +89,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.dest_contact
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String destContact;
 
@@ -89,15 +97,23 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.dest_phone
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private String destPhone;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_addr.dest_addr
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String destAddr;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.distance
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private BigDecimal distance;
 
@@ -105,7 +121,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.delete_mark
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Boolean deleteMark;
 
@@ -113,7 +129,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.gmt_create
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Date gmtCreate;
 
@@ -121,7 +137,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order_addr.gmt_update
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private Date gmtUpdate;
 
@@ -129,7 +145,7 @@ public class SaleOrderAddr implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     private static final long serialVersionUID = 1L;
 
@@ -139,7 +155,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getId() {
         return id;
@@ -151,7 +167,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param id the value for sale_order_addr.id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setId(Integer id) {
         this.id = id;
@@ -163,7 +179,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.sale_order_id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getSaleOrderId() {
         return saleOrderId;
@@ -175,7 +191,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param saleOrderId the value for sale_order_addr.sale_order_id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setSaleOrderId(Integer saleOrderId) {
         this.saleOrderId = saleOrderId;
@@ -187,7 +203,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.line_id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Integer getLineId() {
         return lineId;
@@ -199,7 +215,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param lineId the value for sale_order_addr.line_id
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setLineId(Integer lineId) {
         this.lineId = lineId;
@@ -211,7 +227,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.depart_region_code
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDepartRegionCode() {
         return departRegionCode;
@@ -223,7 +239,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param departRegionCode the value for sale_order_addr.depart_region_code
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDepartRegionCode(String departRegionCode) {
         this.departRegionCode = departRegionCode == null ? null : departRegionCode.trim();
@@ -235,7 +251,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.depart_region_name
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDepartRegionName() {
         return departRegionName;
@@ -247,7 +263,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param departRegionName the value for sale_order_addr.depart_region_name
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDepartRegionName(String departRegionName) {
         this.departRegionName = departRegionName == null ? null : departRegionName.trim();
@@ -259,7 +275,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.depart_contact
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDepartContact() {
         return departContact;
@@ -271,7 +287,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param departContact the value for sale_order_addr.depart_contact
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDepartContact(String departContact) {
         this.departContact = departContact == null ? null : departContact.trim();
@@ -283,7 +299,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.depart_phone
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDepartPhone() {
         return departPhone;
@@ -295,19 +311,43 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param departPhone the value for sale_order_addr.depart_phone
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDepartPhone(String departPhone) {
         this.departPhone = departPhone == null ? null : departPhone.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_addr.depart_addr
+     *
+     * @return the value of sale_order_addr.depart_addr
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getDepartAddr() {
+        return departAddr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_addr.depart_addr
+     *
+     * @param departAddr the value for sale_order_addr.depart_addr
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setDepartAddr(String departAddr) {
+        this.departAddr = departAddr == null ? null : departAddr.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column sale_order_addr.dest_region_code
      *
      * @return the value of sale_order_addr.dest_region_code
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDestRegionCode() {
         return destRegionCode;
@@ -319,7 +359,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param destRegionCode the value for sale_order_addr.dest_region_code
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDestRegionCode(String destRegionCode) {
         this.destRegionCode = destRegionCode == null ? null : destRegionCode.trim();
@@ -331,7 +371,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.dest_region_name
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDestRegionName() {
         return destRegionName;
@@ -343,7 +383,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param destRegionName the value for sale_order_addr.dest_region_name
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDestRegionName(String destRegionName) {
         this.destRegionName = destRegionName == null ? null : destRegionName.trim();
@@ -355,7 +395,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.dest_contact
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDestContact() {
         return destContact;
@@ -367,7 +407,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param destContact the value for sale_order_addr.dest_contact
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDestContact(String destContact) {
         this.destContact = destContact == null ? null : destContact.trim();
@@ -379,7 +419,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.dest_phone
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getDestPhone() {
         return destPhone;
@@ -391,19 +431,43 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param destPhone the value for sale_order_addr.dest_phone
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDestPhone(String destPhone) {
         this.destPhone = destPhone == null ? null : destPhone.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_addr.dest_addr
+     *
+     * @return the value of sale_order_addr.dest_addr
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getDestAddr() {
+        return destAddr;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_addr.dest_addr
+     *
+     * @param destAddr the value for sale_order_addr.dest_addr
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setDestAddr(String destAddr) {
+        this.destAddr = destAddr == null ? null : destAddr.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column sale_order_addr.distance
      *
      * @return the value of sale_order_addr.distance
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public BigDecimal getDistance() {
         return distance;
@@ -415,7 +479,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param distance the value for sale_order_addr.distance
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDistance(BigDecimal distance) {
         this.distance = distance;
@@ -427,7 +491,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.delete_mark
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Boolean getDeleteMark() {
         return deleteMark;
@@ -439,7 +503,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param deleteMark the value for sale_order_addr.delete_mark
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDeleteMark(Boolean deleteMark) {
         this.deleteMark = deleteMark;
@@ -451,7 +515,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.gmt_create
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Date getGmtCreate() {
         return gmtCreate;
@@ -463,7 +527,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param gmtCreate the value for sale_order_addr.gmt_create
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
@@ -475,7 +539,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @return the value of sale_order_addr.gmt_update
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Date getGmtUpdate() {
         return gmtUpdate;
@@ -487,7 +551,7 @@ public class SaleOrderAddr implements Serializable {
      *
      * @param gmtUpdate the value for sale_order_addr.gmt_update
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setGmtUpdate(Date gmtUpdate) {
         this.gmtUpdate = gmtUpdate;
@@ -497,7 +561,7 @@ public class SaleOrderAddr implements Serializable {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     @Override
     public String toString() {
@@ -512,10 +576,12 @@ public class SaleOrderAddr implements Serializable {
         sb.append(", departRegionName=").append(departRegionName);
         sb.append(", departContact=").append(departContact);
         sb.append(", departPhone=").append(departPhone);
+        sb.append(", departAddr=").append(departAddr);
         sb.append(", destRegionCode=").append(destRegionCode);
         sb.append(", destRegionName=").append(destRegionName);
         sb.append(", destContact=").append(destContact);
         sb.append(", destPhone=").append(destPhone);
+        sb.append(", destAddr=").append(destAddr);
         sb.append(", distance=").append(distance);
         sb.append(", deleteMark=").append(deleteMark);
         sb.append(", gmtCreate=").append(gmtCreate);
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddrExample.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddrExample.java
index 5fc015e..c5dfa98 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddrExample.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderAddrExample.java
@@ -10,7 +10,7 @@ public class SaleOrderAddrExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected String orderByClause;
 
@@ -18,7 +18,7 @@ public class SaleOrderAddrExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected boolean distinct;
 
@@ -26,7 +26,7 @@ public class SaleOrderAddrExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected List<Criteria> oredCriteria;
 
@@ -34,7 +34,7 @@ public class SaleOrderAddrExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected int limitStart = -1;
 
@@ -42,7 +42,7 @@ public class SaleOrderAddrExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected int limitEnd = -1;
 
@@ -50,7 +50,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public SaleOrderAddrExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -60,7 +60,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -70,7 +70,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -80,7 +80,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -90,7 +90,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public boolean isDistinct() {
         return distinct;
@@ -100,7 +100,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -110,7 +110,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -120,7 +120,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -132,7 +132,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -146,7 +146,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -157,7 +157,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void clear() {
         oredCriteria.clear();
@@ -169,7 +169,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setLimitStart(int limitStart) {
         this.limitStart=limitStart;
@@ -179,7 +179,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public int getLimitStart() {
         return limitStart;
@@ -189,7 +189,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setLimitEnd(int limitEnd) {
         this.limitEnd=limitEnd;
@@ -199,7 +199,7 @@ public class SaleOrderAddrExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public int getLimitEnd() {
         return limitEnd;
@@ -209,7 +209,7 @@ public class SaleOrderAddrExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -712,6 +712,76 @@ public class SaleOrderAddrExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepartAddrIsNull() {
+            addCriterion("depart_addr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrIsNotNull() {
+            addCriterion("depart_addr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrEqualTo(String value) {
+            addCriterion("depart_addr =", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrNotEqualTo(String value) {
+            addCriterion("depart_addr <>", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrGreaterThan(String value) {
+            addCriterion("depart_addr >", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrGreaterThanOrEqualTo(String value) {
+            addCriterion("depart_addr >=", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrLessThan(String value) {
+            addCriterion("depart_addr <", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrLessThanOrEqualTo(String value) {
+            addCriterion("depart_addr <=", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrLike(String value) {
+            addCriterion("depart_addr like", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrNotLike(String value) {
+            addCriterion("depart_addr not like", value, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrIn(List<String> values) {
+            addCriterion("depart_addr in", values, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrNotIn(List<String> values) {
+            addCriterion("depart_addr not in", values, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrBetween(String value1, String value2) {
+            addCriterion("depart_addr between", value1, value2, "departAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartAddrNotBetween(String value1, String value2) {
+            addCriterion("depart_addr not between", value1, value2, "departAddr");
+            return (Criteria) this;
+        }
+
         public Criteria andDestRegionCodeIsNull() {
             addCriterion("dest_region_code is null");
             return (Criteria) this;
@@ -992,6 +1062,76 @@ public class SaleOrderAddrExample {
             return (Criteria) this;
         }
 
+        public Criteria andDestAddrIsNull() {
+            addCriterion("dest_addr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrIsNotNull() {
+            addCriterion("dest_addr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrEqualTo(String value) {
+            addCriterion("dest_addr =", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrNotEqualTo(String value) {
+            addCriterion("dest_addr <>", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrGreaterThan(String value) {
+            addCriterion("dest_addr >", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrGreaterThanOrEqualTo(String value) {
+            addCriterion("dest_addr >=", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrLessThan(String value) {
+            addCriterion("dest_addr <", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrLessThanOrEqualTo(String value) {
+            addCriterion("dest_addr <=", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrLike(String value) {
+            addCriterion("dest_addr like", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrNotLike(String value) {
+            addCriterion("dest_addr not like", value, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrIn(List<String> values) {
+            addCriterion("dest_addr in", values, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrNotIn(List<String> values) {
+            addCriterion("dest_addr not in", values, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrBetween(String value1, String value2) {
+            addCriterion("dest_addr between", value1, value2, "destAddr");
+            return (Criteria) this;
+        }
+
+        public Criteria andDestAddrNotBetween(String value1, String value2) {
+            addCriterion("dest_addr not between", value1, value2, "destAddr");
+            return (Criteria) this;
+        }
+
         public Criteria andDistanceIsNull() {
             addCriterion("distance is null");
             return (Criteria) this;
@@ -1252,6 +1392,11 @@ public class SaleOrderAddrExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepartAddrLikeInsensitive(String value) {
+            addCriterion("upper(depart_addr) like", value.toUpperCase(), "departAddr");
+            return (Criteria) this;
+        }
+
         public Criteria andDestRegionCodeLikeInsensitive(String value) {
             addCriterion("upper(dest_region_code) like", value.toUpperCase(), "destRegionCode");
             return (Criteria) this;
@@ -1271,13 +1416,18 @@ public class SaleOrderAddrExample {
             addCriterion("upper(dest_phone) like", value.toUpperCase(), "destPhone");
             return (Criteria) this;
         }
+
+        public Criteria andDestAddrLikeInsensitive(String value) {
+            addCriterion("upper(dest_addr) like", value.toUpperCase(), "destAddr");
+            return (Criteria) this;
+        }
     }
 
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order_addr
      *
-     * @mbggenerated do_not_delete_during_merge Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated do_not_delete_during_merge Tue Sep 12 10:11:47 CST 2017
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -1290,7 +1440,7 @@ public class SaleOrderAddrExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order_addr
      *
-     * @mbggenerated Tue Jun 06 11:30:23 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public static class Criterion {
         private String condition;
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java
index 5046cb2..892d931 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java
@@ -11,7 +11,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected String orderByClause;
 
@@ -19,7 +19,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected boolean distinct;
 
@@ -27,7 +27,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected List<Criteria> oredCriteria;
 
@@ -35,7 +35,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected int limitStart = -1;
 
@@ -43,7 +43,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected int limitEnd = -1;
 
@@ -51,7 +51,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public SaleOrderExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -61,7 +61,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -71,7 +71,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -81,7 +81,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -91,7 +91,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public boolean isDistinct() {
         return distinct;
@@ -101,7 +101,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -111,7 +111,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -121,7 +121,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -133,7 +133,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -147,7 +147,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -158,7 +158,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void clear() {
         oredCriteria.clear();
@@ -170,7 +170,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setLimitStart(int limitStart) {
         this.limitStart=limitStart;
@@ -180,7 +180,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public int getLimitStart() {
         return limitStart;
@@ -190,7 +190,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public void setLimitEnd(int limitEnd) {
         this.limitEnd=limitEnd;
@@ -200,7 +200,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public int getLimitEnd() {
         return limitEnd;
@@ -210,7 +210,7 @@ public class SaleOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -529,6 +529,76 @@ public class SaleOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andPickTimeIsNull() {
+            addCriterion("pick_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeIsNotNull() {
+            addCriterion("pick_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeEqualTo(String value) {
+            addCriterion("pick_time =", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeNotEqualTo(String value) {
+            addCriterion("pick_time <>", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeGreaterThan(String value) {
+            addCriterion("pick_time >", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("pick_time >=", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeLessThan(String value) {
+            addCriterion("pick_time <", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeLessThanOrEqualTo(String value) {
+            addCriterion("pick_time <=", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeLike(String value) {
+            addCriterion("pick_time like", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeNotLike(String value) {
+            addCriterion("pick_time not like", value, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeIn(List<String> values) {
+            addCriterion("pick_time in", values, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeNotIn(List<String> values) {
+            addCriterion("pick_time not in", values, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeBetween(String value1, String value2) {
+            addCriterion("pick_time between", value1, value2, "pickTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPickTimeNotBetween(String value1, String value2) {
+            addCriterion("pick_time not between", value1, value2, "pickTime");
+            return (Criteria) this;
+        }
+
         public Criteria andBrandsIsNull() {
             addCriterion("brands is null");
             return (Criteria) this;
@@ -1439,22 +1509,402 @@ public class SaleOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsPickIsNull() {
+            addCriterion("is_pick is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickIsNotNull() {
+            addCriterion("is_pick is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickEqualTo(Boolean value) {
+            addCriterion("is_pick =", value, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickNotEqualTo(Boolean value) {
+            addCriterion("is_pick <>", value, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickGreaterThan(Boolean value) {
+            addCriterion("is_pick >", value, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_pick >=", value, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickLessThan(Boolean value) {
+            addCriterion("is_pick <", value, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_pick <=", value, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickIn(List<Boolean> values) {
+            addCriterion("is_pick in", values, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickNotIn(List<Boolean> values) {
+            addCriterion("is_pick not in", values, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_pick between", value1, value2, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPickNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_pick not between", value1, value2, "isPick");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivIsNull() {
+            addCriterion("is_deliv is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivIsNotNull() {
+            addCriterion("is_deliv is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivEqualTo(Boolean value) {
+            addCriterion("is_deliv =", value, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivNotEqualTo(Boolean value) {
+            addCriterion("is_deliv <>", value, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivGreaterThan(Boolean value) {
+            addCriterion("is_deliv >", value, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_deliv >=", value, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivLessThan(Boolean value) {
+            addCriterion("is_deliv <", value, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_deliv <=", value, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivIn(List<Boolean> values) {
+            addCriterion("is_deliv in", values, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivNotIn(List<Boolean> values) {
+            addCriterion("is_deliv not in", values, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_deliv between", value1, value2, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDelivNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_deliv not between", value1, value2, "isDeliv");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeIsNull() {
+            addCriterion("transport_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeIsNotNull() {
+            addCriterion("transport_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeEqualTo(Integer value) {
+            addCriterion("transport_type =", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotEqualTo(Integer value) {
+            addCriterion("transport_type <>", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeGreaterThan(Integer value) {
+            addCriterion("transport_type >", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("transport_type >=", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeLessThan(Integer value) {
+            addCriterion("transport_type <", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("transport_type <=", value, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeIn(List<Integer> values) {
+            addCriterion("transport_type in", values, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotIn(List<Integer> values) {
+            addCriterion("transport_type not in", values, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeBetween(Integer value1, Integer value2) {
+            addCriterion("transport_type between", value1, value2, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTransportTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("transport_type not between", value1, value2, "transportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketIsNull() {
+            addCriterion("is_ticket is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketIsNotNull() {
+            addCriterion("is_ticket is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketEqualTo(Boolean value) {
+            addCriterion("is_ticket =", value, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketNotEqualTo(Boolean value) {
+            addCriterion("is_ticket <>", value, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketGreaterThan(Boolean value) {
+            addCriterion("is_ticket >", value, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_ticket >=", value, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketLessThan(Boolean value) {
+            addCriterion("is_ticket <", value, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_ticket <=", value, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketIn(List<Boolean> values) {
+            addCriterion("is_ticket in", values, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketNotIn(List<Boolean> values) {
+            addCriterion("is_ticket not in", values, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_ticket between", value1, value2, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsTicketNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_ticket not between", value1, value2, "isTicket");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateIsNull() {
+            addCriterion("arrive_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateIsNotNull() {
+            addCriterion("arrive_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateEqualTo(Date value) {
+            addCriterionForJDBCDate("arrive_date =", value, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateNotEqualTo(Date value) {
+            addCriterionForJDBCDate("arrive_date <>", value, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateGreaterThan(Date value) {
+            addCriterionForJDBCDate("arrive_date >", value, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("arrive_date >=", value, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateLessThan(Date value) {
+            addCriterionForJDBCDate("arrive_date <", value, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("arrive_date <=", value, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateIn(List<Date> values) {
+            addCriterionForJDBCDate("arrive_date in", values, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateNotIn(List<Date> values) {
+            addCriterionForJDBCDate("arrive_date not in", values, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("arrive_date between", value1, value2, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveDateNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("arrive_date not between", value1, value2, "arriveDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeIsNull() {
+            addCriterion("arrive_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeIsNotNull() {
+            addCriterion("arrive_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeEqualTo(String value) {
+            addCriterion("arrive_time =", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeNotEqualTo(String value) {
+            addCriterion("arrive_time <>", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeGreaterThan(String value) {
+            addCriterion("arrive_time >", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("arrive_time >=", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeLessThan(String value) {
+            addCriterion("arrive_time <", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeLessThanOrEqualTo(String value) {
+            addCriterion("arrive_time <=", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeLike(String value) {
+            addCriterion("arrive_time like", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeNotLike(String value) {
+            addCriterion("arrive_time not like", value, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeIn(List<String> values) {
+            addCriterion("arrive_time in", values, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeNotIn(List<String> values) {
+            addCriterion("arrive_time not in", values, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeBetween(String value1, String value2) {
+            addCriterion("arrive_time between", value1, value2, "arriveTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andArriveTimeNotBetween(String value1, String value2) {
+            addCriterion("arrive_time not between", value1, value2, "arriveTime");
+            return (Criteria) this;
+        }
+
         public Criteria andCodeLikeInsensitive(String value) {
             addCriterion("upper(code) like", value.toUpperCase(), "code");
             return (Criteria) this;
         }
 
+        public Criteria andPickTimeLikeInsensitive(String value) {
+            addCriterion("upper(pick_time) like", value.toUpperCase(), "pickTime");
+            return (Criteria) this;
+        }
+
         public Criteria andCommentLikeInsensitive(String value) {
             addCriterion("upper(comment) like", value.toUpperCase(), "comment");
             return (Criteria) this;
         }
+
+        public Criteria andArriveTimeLikeInsensitive(String value) {
+            addCriterion("upper(arrive_time) like", value.toUpperCase(), "arriveTime");
+            return (Criteria) this;
+        }
     }
 
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order
      *
-     * @mbggenerated do_not_delete_during_merge Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated do_not_delete_during_merge Tue Sep 12 10:11:47 CST 2017
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -1467,7 +1917,7 @@ public class SaleOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order
      *
-     * @mbggenerated Mon Aug 14 16:47:17 CST 2017
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
      */
     public static class Criterion {
         private String condition;
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicket.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicket.java
new file mode 100644
index 0000000..72a45e1
--- /dev/null
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicket.java
@@ -0,0 +1,558 @@
+package com.unlcn.ils.sales.base.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SaleOrderTicket implements Serializable {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.id
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.order_id
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Integer orderId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.type
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String type;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.name
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String name;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.identify_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String identifyNumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.opening_bank
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String openingBank;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.account_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String accountNumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.address
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String address;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.contact_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String contactNumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.content
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String content;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.status
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String status;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.comment
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String comment;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.create_user
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.modified_user
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private String modifiedUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.gmt_create
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Date gmtCreate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order_ticket.gmt_modified
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private Date gmtModified;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.id
+     *
+     * @return the value of sale_order_ticket.id
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.id
+     *
+     * @param id the value for sale_order_ticket.id
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.order_id
+     *
+     * @return the value of sale_order_ticket.order_id
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.order_id
+     *
+     * @param orderId the value for sale_order_ticket.order_id
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.type
+     *
+     * @return the value of sale_order_ticket.type
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.type
+     *
+     * @param type the value for sale_order_ticket.type
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.name
+     *
+     * @return the value of sale_order_ticket.name
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.name
+     *
+     * @param name the value for sale_order_ticket.name
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.identify_number
+     *
+     * @return the value of sale_order_ticket.identify_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getIdentifyNumber() {
+        return identifyNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.identify_number
+     *
+     * @param identifyNumber the value for sale_order_ticket.identify_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setIdentifyNumber(String identifyNumber) {
+        this.identifyNumber = identifyNumber == null ? null : identifyNumber.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.opening_bank
+     *
+     * @return the value of sale_order_ticket.opening_bank
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getOpeningBank() {
+        return openingBank;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.opening_bank
+     *
+     * @param openingBank the value for sale_order_ticket.opening_bank
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setOpeningBank(String openingBank) {
+        this.openingBank = openingBank == null ? null : openingBank.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.account_number
+     *
+     * @return the value of sale_order_ticket.account_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.account_number
+     *
+     * @param accountNumber the value for sale_order_ticket.account_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber == null ? null : accountNumber.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.address
+     *
+     * @return the value of sale_order_ticket.address
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.address
+     *
+     * @param address the value for sale_order_ticket.address
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.contact_number
+     *
+     * @return the value of sale_order_ticket.contact_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.contact_number
+     *
+     * @param contactNumber the value for sale_order_ticket.contact_number
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber == null ? null : contactNumber.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.content
+     *
+     * @return the value of sale_order_ticket.content
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.content
+     *
+     * @param content the value for sale_order_ticket.content
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.status
+     *
+     * @return the value of sale_order_ticket.status
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.status
+     *
+     * @param status the value for sale_order_ticket.status
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.comment
+     *
+     * @return the value of sale_order_ticket.comment
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.comment
+     *
+     * @param comment the value for sale_order_ticket.comment
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.create_user
+     *
+     * @return the value of sale_order_ticket.create_user
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.create_user
+     *
+     * @param createUser the value for sale_order_ticket.create_user
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.modified_user
+     *
+     * @return the value of sale_order_ticket.modified_user
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getModifiedUser() {
+        return modifiedUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.modified_user
+     *
+     * @param modifiedUser the value for sale_order_ticket.modified_user
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setModifiedUser(String modifiedUser) {
+        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.gmt_create
+     *
+     * @return the value of sale_order_ticket.gmt_create
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.gmt_create
+     *
+     * @param gmtCreate the value for sale_order_ticket.gmt_create
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order_ticket.gmt_modified
+     *
+     * @return the value of sale_order_ticket.gmt_modified
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order_ticket.gmt_modified
+     *
+     * @param gmtModified the value for sale_order_ticket.gmt_modified
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", orderId=").append(orderId);
+        sb.append(", type=").append(type);
+        sb.append(", name=").append(name);
+        sb.append(", identifyNumber=").append(identifyNumber);
+        sb.append(", openingBank=").append(openingBank);
+        sb.append(", accountNumber=").append(accountNumber);
+        sb.append(", address=").append(address);
+        sb.append(", contactNumber=").append(contactNumber);
+        sb.append(", content=").append(content);
+        sb.append(", status=").append(status);
+        sb.append(", comment=").append(comment);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", modifiedUser=").append(modifiedUser);
+        sb.append(", gmtCreate=").append(gmtCreate);
+        sb.append(", gmtModified=").append(gmtModified);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicketExample.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicketExample.java
new file mode 100644
index 0000000..e2d4215
--- /dev/null
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderTicketExample.java
@@ -0,0 +1,1499 @@
+package com.unlcn.ils.sales.base.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class SaleOrderTicketExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected int limitStart = -1;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected int limitEnd = -1;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public SaleOrderTicketExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setLimitStart(int limitStart) {
+        this.limitStart=limitStart;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public int getLimitStart() {
+        return limitStart;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public void setLimitEnd(int limitEnd) {
+        this.limitEnd=limitEnd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public int getLimitEnd() {
+        return limitEnd;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdIsNull() {
+            addCriterion("order_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdIsNotNull() {
+            addCriterion("order_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdEqualTo(Integer value) {
+            addCriterion("order_id =", value, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdNotEqualTo(Integer value) {
+            addCriterion("order_id <>", value, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdGreaterThan(Integer value) {
+            addCriterion("order_id >", value, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("order_id >=", value, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdLessThan(Integer value) {
+            addCriterion("order_id <", value, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdLessThanOrEqualTo(Integer value) {
+            addCriterion("order_id <=", value, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdIn(List<Integer> values) {
+            addCriterion("order_id in", values, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdNotIn(List<Integer> values) {
+            addCriterion("order_id not in", values, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdBetween(Integer value1, Integer value2) {
+            addCriterion("order_id between", value1, value2, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("order_id not between", value1, value2, "orderId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberIsNull() {
+            addCriterion("identify_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberIsNotNull() {
+            addCriterion("identify_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberEqualTo(String value) {
+            addCriterion("identify_number =", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberNotEqualTo(String value) {
+            addCriterion("identify_number <>", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberGreaterThan(String value) {
+            addCriterion("identify_number >", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("identify_number >=", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberLessThan(String value) {
+            addCriterion("identify_number <", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberLessThanOrEqualTo(String value) {
+            addCriterion("identify_number <=", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberLike(String value) {
+            addCriterion("identify_number like", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberNotLike(String value) {
+            addCriterion("identify_number not like", value, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberIn(List<String> values) {
+            addCriterion("identify_number in", values, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberNotIn(List<String> values) {
+            addCriterion("identify_number not in", values, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberBetween(String value1, String value2) {
+            addCriterion("identify_number between", value1, value2, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberNotBetween(String value1, String value2) {
+            addCriterion("identify_number not between", value1, value2, "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankIsNull() {
+            addCriterion("opening_bank is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankIsNotNull() {
+            addCriterion("opening_bank is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankEqualTo(String value) {
+            addCriterion("opening_bank =", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankNotEqualTo(String value) {
+            addCriterion("opening_bank <>", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankGreaterThan(String value) {
+            addCriterion("opening_bank >", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankGreaterThanOrEqualTo(String value) {
+            addCriterion("opening_bank >=", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankLessThan(String value) {
+            addCriterion("opening_bank <", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankLessThanOrEqualTo(String value) {
+            addCriterion("opening_bank <=", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankLike(String value) {
+            addCriterion("opening_bank like", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankNotLike(String value) {
+            addCriterion("opening_bank not like", value, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankIn(List<String> values) {
+            addCriterion("opening_bank in", values, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankNotIn(List<String> values) {
+            addCriterion("opening_bank not in", values, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankBetween(String value1, String value2) {
+            addCriterion("opening_bank between", value1, value2, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankNotBetween(String value1, String value2) {
+            addCriterion("opening_bank not between", value1, value2, "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberIsNull() {
+            addCriterion("account_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberIsNotNull() {
+            addCriterion("account_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberEqualTo(String value) {
+            addCriterion("account_number =", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberNotEqualTo(String value) {
+            addCriterion("account_number <>", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberGreaterThan(String value) {
+            addCriterion("account_number >", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("account_number >=", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberLessThan(String value) {
+            addCriterion("account_number <", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberLessThanOrEqualTo(String value) {
+            addCriterion("account_number <=", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberLike(String value) {
+            addCriterion("account_number like", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberNotLike(String value) {
+            addCriterion("account_number not like", value, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberIn(List<String> values) {
+            addCriterion("account_number in", values, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberNotIn(List<String> values) {
+            addCriterion("account_number not in", values, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberBetween(String value1, String value2) {
+            addCriterion("account_number between", value1, value2, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberNotBetween(String value1, String value2) {
+            addCriterion("account_number not between", value1, value2, "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNull() {
+            addCriterion("address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNotNull() {
+            addCriterion("address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressEqualTo(String value) {
+            addCriterion("address =", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotEqualTo(String value) {
+            addCriterion("address <>", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThan(String value) {
+            addCriterion("address >", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("address >=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThan(String value) {
+            addCriterion("address <", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThanOrEqualTo(String value) {
+            addCriterion("address <=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLike(String value) {
+            addCriterion("address like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotLike(String value) {
+            addCriterion("address not like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIn(List<String> values) {
+            addCriterion("address in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotIn(List<String> values) {
+            addCriterion("address not in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressBetween(String value1, String value2) {
+            addCriterion("address between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotBetween(String value1, String value2) {
+            addCriterion("address not between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberIsNull() {
+            addCriterion("contact_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberIsNotNull() {
+            addCriterion("contact_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberEqualTo(String value) {
+            addCriterion("contact_number =", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberNotEqualTo(String value) {
+            addCriterion("contact_number <>", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberGreaterThan(String value) {
+            addCriterion("contact_number >", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("contact_number >=", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberLessThan(String value) {
+            addCriterion("contact_number <", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberLessThanOrEqualTo(String value) {
+            addCriterion("contact_number <=", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberLike(String value) {
+            addCriterion("contact_number like", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberNotLike(String value) {
+            addCriterion("contact_number not like", value, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberIn(List<String> values) {
+            addCriterion("contact_number in", values, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberNotIn(List<String> values) {
+            addCriterion("contact_number not in", values, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberBetween(String value1, String value2) {
+            addCriterion("contact_number between", value1, value2, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberNotBetween(String value1, String value2) {
+            addCriterion("contact_number not between", value1, value2, "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNull() {
+            addCriterion("content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNotNull() {
+            addCriterion("content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentEqualTo(String value) {
+            addCriterion("content =", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotEqualTo(String value) {
+            addCriterion("content <>", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThan(String value) {
+            addCriterion("content >", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThanOrEqualTo(String value) {
+            addCriterion("content >=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThan(String value) {
+            addCriterion("content <", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThanOrEqualTo(String value) {
+            addCriterion("content <=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLike(String value) {
+            addCriterion("content like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotLike(String value) {
+            addCriterion("content not like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIn(List<String> values) {
+            addCriterion("content in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotIn(List<String> values) {
+            addCriterion("content not in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentBetween(String value1, String value2) {
+            addCriterion("content between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotBetween(String value1, String value2) {
+            addCriterion("content not between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLike(String value) {
+            addCriterion("status like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("status not like", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<String> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<String> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentIsNull() {
+            addCriterion("comment is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentIsNotNull() {
+            addCriterion("comment is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentEqualTo(String value) {
+            addCriterion("comment =", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotEqualTo(String value) {
+            addCriterion("comment <>", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentGreaterThan(String value) {
+            addCriterion("comment >", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentGreaterThanOrEqualTo(String value) {
+            addCriterion("comment >=", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLessThan(String value) {
+            addCriterion("comment <", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLessThanOrEqualTo(String value) {
+            addCriterion("comment <=", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLike(String value) {
+            addCriterion("comment like", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotLike(String value) {
+            addCriterion("comment not like", value, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentIn(List<String> values) {
+            addCriterion("comment in", values, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotIn(List<String> values) {
+            addCriterion("comment not in", values, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentBetween(String value1, String value2) {
+            addCriterion("comment between", value1, value2, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentNotBetween(String value1, String value2) {
+            addCriterion("comment not between", value1, value2, "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("create_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("create_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("create_user =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("create_user <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("create_user >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("create_user >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("create_user <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("create_user <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("create_user like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("create_user not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("create_user in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("create_user not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("create_user between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("create_user not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserIsNull() {
+            addCriterion("modified_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserIsNotNull() {
+            addCriterion("modified_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserEqualTo(String value) {
+            addCriterion("modified_user =", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserNotEqualTo(String value) {
+            addCriterion("modified_user <>", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserGreaterThan(String value) {
+            addCriterion("modified_user >", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserGreaterThanOrEqualTo(String value) {
+            addCriterion("modified_user >=", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserLessThan(String value) {
+            addCriterion("modified_user <", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserLessThanOrEqualTo(String value) {
+            addCriterion("modified_user <=", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserLike(String value) {
+            addCriterion("modified_user like", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserNotLike(String value) {
+            addCriterion("modified_user not like", value, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserIn(List<String> values) {
+            addCriterion("modified_user in", values, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserNotIn(List<String> values) {
+            addCriterion("modified_user not in", values, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserBetween(String value1, String value2) {
+            addCriterion("modified_user between", value1, value2, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserNotBetween(String value1, String value2) {
+            addCriterion("modified_user not between", value1, value2, "modifiedUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateIsNull() {
+            addCriterion("gmt_create is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateIsNotNull() {
+            addCriterion("gmt_create is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateEqualTo(Date value) {
+            addCriterion("gmt_create =", value, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateNotEqualTo(Date value) {
+            addCriterion("gmt_create <>", value, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateGreaterThan(Date value) {
+            addCriterion("gmt_create >", value, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateGreaterThanOrEqualTo(Date value) {
+            addCriterion("gmt_create >=", value, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateLessThan(Date value) {
+            addCriterion("gmt_create <", value, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateLessThanOrEqualTo(Date value) {
+            addCriterion("gmt_create <=", value, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateIn(List<Date> values) {
+            addCriterion("gmt_create in", values, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateNotIn(List<Date> values) {
+            addCriterion("gmt_create not in", values, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateBetween(Date value1, Date value2) {
+            addCriterion("gmt_create between", value1, value2, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtCreateNotBetween(Date value1, Date value2) {
+            addCriterion("gmt_create not between", value1, value2, "gmtCreate");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedIsNull() {
+            addCriterion("gmt_modified is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedIsNotNull() {
+            addCriterion("gmt_modified is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedEqualTo(Date value) {
+            addCriterion("gmt_modified =", value, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedNotEqualTo(Date value) {
+            addCriterion("gmt_modified <>", value, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedGreaterThan(Date value) {
+            addCriterion("gmt_modified >", value, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedGreaterThanOrEqualTo(Date value) {
+            addCriterion("gmt_modified >=", value, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedLessThan(Date value) {
+            addCriterion("gmt_modified <", value, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedLessThanOrEqualTo(Date value) {
+            addCriterion("gmt_modified <=", value, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedIn(List<Date> values) {
+            addCriterion("gmt_modified in", values, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedNotIn(List<Date> values) {
+            addCriterion("gmt_modified not in", values, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedBetween(Date value1, Date value2) {
+            addCriterion("gmt_modified between", value1, value2, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andGmtModifiedNotBetween(Date value1, Date value2) {
+            addCriterion("gmt_modified not between", value1, value2, "gmtModified");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLikeInsensitive(String value) {
+            addCriterion("upper(type) like", value.toUpperCase(), "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLikeInsensitive(String value) {
+            addCriterion("upper(name) like", value.toUpperCase(), "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdentifyNumberLikeInsensitive(String value) {
+            addCriterion("upper(identify_number) like", value.toUpperCase(), "identifyNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpeningBankLikeInsensitive(String value) {
+            addCriterion("upper(opening_bank) like", value.toUpperCase(), "openingBank");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountNumberLikeInsensitive(String value) {
+            addCriterion("upper(account_number) like", value.toUpperCase(), "accountNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLikeInsensitive(String value) {
+            addCriterion("upper(address) like", value.toUpperCase(), "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactNumberLikeInsensitive(String value) {
+            addCriterion("upper(contact_number) like", value.toUpperCase(), "contactNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLikeInsensitive(String value) {
+            addCriterion("upper(content) like", value.toUpperCase(), "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLikeInsensitive(String value) {
+            addCriterion("upper(status) like", value.toUpperCase(), "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCommentLikeInsensitive(String value) {
+            addCriterion("upper(comment) like", value.toUpperCase(), "comment");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLikeInsensitive(String value) {
+            addCriterion("upper(create_user) like", value.toUpperCase(), "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedUserLikeInsensitive(String value) {
+            addCriterion("upper(modified_user) like", value.toUpperCase(), "modifiedUser");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Sep 12 10:11:47 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table sale_order_ticket
+     *
+     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderAddrMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderAddrMapper.xml
index d78d006..f4386db 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderAddrMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderAddrMapper.xml
@@ -1,52 +1,54 @@
-<?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" >
-<mapper namespace="com.unlcn.ils.sales.base.mapper.SaleOrderAddrMapper" >
-  <resultMap id="BaseResultMap" type="com.unlcn.ils.sales.base.model.SaleOrderAddr" >
+<?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">
+<mapper namespace="com.unlcn.ils.sales.base.mapper.SaleOrderAddrMapper">
+  <resultMap id="BaseResultMap" type="com.unlcn.ils.sales.base.model.SaleOrderAddr">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="sale_order_id" property="saleOrderId" jdbcType="INTEGER" />
-    <result column="line_id" property="lineId" jdbcType="INTEGER" />
-    <result column="depart_region_code" property="departRegionCode" jdbcType="VARCHAR" />
-    <result column="depart_region_name" property="departRegionName" jdbcType="VARCHAR" />
-    <result column="depart_contact" property="departContact" jdbcType="VARCHAR" />
-    <result column="depart_phone" property="departPhone" jdbcType="VARCHAR" />
-    <result column="dest_region_code" property="destRegionCode" jdbcType="VARCHAR" />
-    <result column="dest_region_name" property="destRegionName" jdbcType="VARCHAR" />
-    <result column="dest_contact" property="destContact" jdbcType="VARCHAR" />
-    <result column="dest_phone" property="destPhone" jdbcType="VARCHAR" />
-    <result column="distance" property="distance" jdbcType="DECIMAL" />
-    <result column="delete_mark" property="deleteMark" jdbcType="BIT" />
-    <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP" />
-    <result column="gmt_update" property="gmtUpdate" jdbcType="TIMESTAMP" />
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="sale_order_id" jdbcType="INTEGER" property="saleOrderId" />
+    <result column="line_id" jdbcType="INTEGER" property="lineId" />
+    <result column="depart_region_code" jdbcType="VARCHAR" property="departRegionCode" />
+    <result column="depart_region_name" jdbcType="VARCHAR" property="departRegionName" />
+    <result column="depart_contact" jdbcType="VARCHAR" property="departContact" />
+    <result column="depart_phone" jdbcType="VARCHAR" property="departPhone" />
+    <result column="depart_addr" jdbcType="VARCHAR" property="departAddr" />
+    <result column="dest_region_code" jdbcType="VARCHAR" property="destRegionCode" />
+    <result column="dest_region_name" jdbcType="VARCHAR" property="destRegionName" />
+    <result column="dest_contact" jdbcType="VARCHAR" property="destContact" />
+    <result column="dest_phone" jdbcType="VARCHAR" property="destPhone" />
+    <result column="dest_addr" jdbcType="VARCHAR" property="destAddr" />
+    <result column="distance" jdbcType="DECIMAL" property="distance" />
+    <result column="delete_mark" jdbcType="BIT" property="deleteMark" />
+    <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
+    <result column="gmt_update" jdbcType="TIMESTAMP" property="gmtUpdate" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -57,30 +59,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -91,262 +93,282 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     id, sale_order_id, line_id, depart_region_code, depart_region_name, depart_contact, 
-    depart_phone, dest_region_code, dest_region_name, dest_contact, dest_phone, distance, 
-    delete_mark, gmt_create, gmt_update
+    depart_phone, depart_addr, dest_region_code, dest_region_name, dest_contact, dest_phone, 
+    dest_addr, distance, delete_mark, gmt_create, gmt_update
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddrExample" >
+  <select id="selectByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddrExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from sale_order_addr
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
-    <if test="limitStart != null and limitStart>-1" >
+    <if test="limitStart != null and limitStart&gt;-1">
       limit ${limitStart} , ${limitEnd}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
     from sale_order_addr
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     delete from sale_order_addr
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddrExample" >
+  <delete id="deleteByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddrExample">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     delete from sale_order_addr
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr" useGeneratedKeys="true" keyProperty="id" >
+  <insert id="insert" keyProperty="id" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr" useGeneratedKeys="true">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
-    <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into sale_order_addr (sale_order_id, line_id, depart_region_code, 
       depart_region_name, depart_contact, depart_phone, 
-      dest_region_code, dest_region_name, dest_contact, 
-      dest_phone, distance, delete_mark, 
-      gmt_create, gmt_update)
+      depart_addr, dest_region_code, dest_region_name, 
+      dest_contact, dest_phone, dest_addr, 
+      distance, delete_mark, gmt_create, 
+      gmt_update)
     values (#{saleOrderId,jdbcType=INTEGER}, #{lineId,jdbcType=INTEGER}, #{departRegionCode,jdbcType=VARCHAR}, 
       #{departRegionName,jdbcType=VARCHAR}, #{departContact,jdbcType=VARCHAR}, #{departPhone,jdbcType=VARCHAR}, 
-      #{destRegionCode,jdbcType=VARCHAR}, #{destRegionName,jdbcType=VARCHAR}, #{destContact,jdbcType=VARCHAR}, 
-      #{destPhone,jdbcType=VARCHAR}, #{distance,jdbcType=DECIMAL}, #{deleteMark,jdbcType=BIT}, 
-      #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtUpdate,jdbcType=TIMESTAMP})
+      #{departAddr,jdbcType=VARCHAR}, #{destRegionCode,jdbcType=VARCHAR}, #{destRegionName,jdbcType=VARCHAR}, 
+      #{destContact,jdbcType=VARCHAR}, #{destPhone,jdbcType=VARCHAR}, #{destAddr,jdbcType=VARCHAR}, 
+      #{distance,jdbcType=DECIMAL}, #{deleteMark,jdbcType=BIT}, #{gmtCreate,jdbcType=TIMESTAMP}, 
+      #{gmtUpdate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr" >
+  <insert id="insertSelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
-    <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into sale_order_addr
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="saleOrderId != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="saleOrderId != null">
         sale_order_id,
       </if>
-      <if test="lineId != null" >
+      <if test="lineId != null">
         line_id,
       </if>
-      <if test="departRegionCode != null" >
+      <if test="departRegionCode != null">
         depart_region_code,
       </if>
-      <if test="departRegionName != null" >
+      <if test="departRegionName != null">
         depart_region_name,
       </if>
-      <if test="departContact != null" >
+      <if test="departContact != null">
         depart_contact,
       </if>
-      <if test="departPhone != null" >
+      <if test="departPhone != null">
         depart_phone,
       </if>
-      <if test="destRegionCode != null" >
+      <if test="departAddr != null">
+        depart_addr,
+      </if>
+      <if test="destRegionCode != null">
         dest_region_code,
       </if>
-      <if test="destRegionName != null" >
+      <if test="destRegionName != null">
         dest_region_name,
       </if>
-      <if test="destContact != null" >
+      <if test="destContact != null">
         dest_contact,
       </if>
-      <if test="destPhone != null" >
+      <if test="destPhone != null">
         dest_phone,
       </if>
-      <if test="distance != null" >
+      <if test="destAddr != null">
+        dest_addr,
+      </if>
+      <if test="distance != null">
         distance,
       </if>
-      <if test="deleteMark != null" >
+      <if test="deleteMark != null">
         delete_mark,
       </if>
-      <if test="gmtCreate != null" >
+      <if test="gmtCreate != null">
         gmt_create,
       </if>
-      <if test="gmtUpdate != null" >
+      <if test="gmtUpdate != null">
         gmt_update,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="saleOrderId != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="saleOrderId != null">
         #{saleOrderId,jdbcType=INTEGER},
       </if>
-      <if test="lineId != null" >
+      <if test="lineId != null">
         #{lineId,jdbcType=INTEGER},
       </if>
-      <if test="departRegionCode != null" >
+      <if test="departRegionCode != null">
         #{departRegionCode,jdbcType=VARCHAR},
       </if>
-      <if test="departRegionName != null" >
+      <if test="departRegionName != null">
         #{departRegionName,jdbcType=VARCHAR},
       </if>
-      <if test="departContact != null" >
+      <if test="departContact != null">
         #{departContact,jdbcType=VARCHAR},
       </if>
-      <if test="departPhone != null" >
+      <if test="departPhone != null">
         #{departPhone,jdbcType=VARCHAR},
       </if>
-      <if test="destRegionCode != null" >
+      <if test="departAddr != null">
+        #{departAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="destRegionCode != null">
         #{destRegionCode,jdbcType=VARCHAR},
       </if>
-      <if test="destRegionName != null" >
+      <if test="destRegionName != null">
         #{destRegionName,jdbcType=VARCHAR},
       </if>
-      <if test="destContact != null" >
+      <if test="destContact != null">
         #{destContact,jdbcType=VARCHAR},
       </if>
-      <if test="destPhone != null" >
+      <if test="destPhone != null">
         #{destPhone,jdbcType=VARCHAR},
       </if>
-      <if test="distance != null" >
+      <if test="destAddr != null">
+        #{destAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="distance != null">
         #{distance,jdbcType=DECIMAL},
       </if>
-      <if test="deleteMark != null" >
+      <if test="deleteMark != null">
         #{deleteMark,jdbcType=BIT},
       </if>
-      <if test="gmtCreate != null" >
+      <if test="gmtCreate != null">
         #{gmtCreate,jdbcType=TIMESTAMP},
       </if>
-      <if test="gmtUpdate != null" >
+      <if test="gmtUpdate != null">
         #{gmtUpdate,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddrExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddrExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     select count(*) from sale_order_addr
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order_addr
-    <set >
-      <if test="record.id != null" >
+    <set>
+      <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
-      <if test="record.saleOrderId != null" >
+      <if test="record.saleOrderId != null">
         sale_order_id = #{record.saleOrderId,jdbcType=INTEGER},
       </if>
-      <if test="record.lineId != null" >
+      <if test="record.lineId != null">
         line_id = #{record.lineId,jdbcType=INTEGER},
       </if>
-      <if test="record.departRegionCode != null" >
+      <if test="record.departRegionCode != null">
         depart_region_code = #{record.departRegionCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.departRegionName != null" >
+      <if test="record.departRegionName != null">
         depart_region_name = #{record.departRegionName,jdbcType=VARCHAR},
       </if>
-      <if test="record.departContact != null" >
+      <if test="record.departContact != null">
         depart_contact = #{record.departContact,jdbcType=VARCHAR},
       </if>
-      <if test="record.departPhone != null" >
+      <if test="record.departPhone != null">
         depart_phone = #{record.departPhone,jdbcType=VARCHAR},
       </if>
-      <if test="record.destRegionCode != null" >
+      <if test="record.departAddr != null">
+        depart_addr = #{record.departAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.destRegionCode != null">
         dest_region_code = #{record.destRegionCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.destRegionName != null" >
+      <if test="record.destRegionName != null">
         dest_region_name = #{record.destRegionName,jdbcType=VARCHAR},
       </if>
-      <if test="record.destContact != null" >
+      <if test="record.destContact != null">
         dest_contact = #{record.destContact,jdbcType=VARCHAR},
       </if>
-      <if test="record.destPhone != null" >
+      <if test="record.destPhone != null">
         dest_phone = #{record.destPhone,jdbcType=VARCHAR},
       </if>
-      <if test="record.distance != null" >
+      <if test="record.destAddr != null">
+        dest_addr = #{record.destAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.distance != null">
         distance = #{record.distance,jdbcType=DECIMAL},
       </if>
-      <if test="record.deleteMark != null" >
+      <if test="record.deleteMark != null">
         delete_mark = #{record.deleteMark,jdbcType=BIT},
       </if>
-      <if test="record.gmtCreate != null" >
+      <if test="record.gmtCreate != null">
         gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.gmtUpdate != null" >
+      <if test="record.gmtUpdate != null">
         gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order_addr
     set id = #{record.id,jdbcType=INTEGER},
@@ -356,76 +378,84 @@
       depart_region_name = #{record.departRegionName,jdbcType=VARCHAR},
       depart_contact = #{record.departContact,jdbcType=VARCHAR},
       depart_phone = #{record.departPhone,jdbcType=VARCHAR},
+      depart_addr = #{record.departAddr,jdbcType=VARCHAR},
       dest_region_code = #{record.destRegionCode,jdbcType=VARCHAR},
       dest_region_name = #{record.destRegionName,jdbcType=VARCHAR},
       dest_contact = #{record.destContact,jdbcType=VARCHAR},
       dest_phone = #{record.destPhone,jdbcType=VARCHAR},
+      dest_addr = #{record.destAddr,jdbcType=VARCHAR},
       distance = #{record.distance,jdbcType=DECIMAL},
       delete_mark = #{record.deleteMark,jdbcType=BIT},
       gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
       gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order_addr
-    <set >
-      <if test="saleOrderId != null" >
+    <set>
+      <if test="saleOrderId != null">
         sale_order_id = #{saleOrderId,jdbcType=INTEGER},
       </if>
-      <if test="lineId != null" >
+      <if test="lineId != null">
         line_id = #{lineId,jdbcType=INTEGER},
       </if>
-      <if test="departRegionCode != null" >
+      <if test="departRegionCode != null">
         depart_region_code = #{departRegionCode,jdbcType=VARCHAR},
       </if>
-      <if test="departRegionName != null" >
+      <if test="departRegionName != null">
         depart_region_name = #{departRegionName,jdbcType=VARCHAR},
       </if>
-      <if test="departContact != null" >
+      <if test="departContact != null">
         depart_contact = #{departContact,jdbcType=VARCHAR},
       </if>
-      <if test="departPhone != null" >
+      <if test="departPhone != null">
         depart_phone = #{departPhone,jdbcType=VARCHAR},
       </if>
-      <if test="destRegionCode != null" >
+      <if test="departAddr != null">
+        depart_addr = #{departAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="destRegionCode != null">
         dest_region_code = #{destRegionCode,jdbcType=VARCHAR},
       </if>
-      <if test="destRegionName != null" >
+      <if test="destRegionName != null">
         dest_region_name = #{destRegionName,jdbcType=VARCHAR},
       </if>
-      <if test="destContact != null" >
+      <if test="destContact != null">
         dest_contact = #{destContact,jdbcType=VARCHAR},
       </if>
-      <if test="destPhone != null" >
+      <if test="destPhone != null">
         dest_phone = #{destPhone,jdbcType=VARCHAR},
       </if>
-      <if test="distance != null" >
+      <if test="destAddr != null">
+        dest_addr = #{destAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="distance != null">
         distance = #{distance,jdbcType=DECIMAL},
       </if>
-      <if test="deleteMark != null" >
+      <if test="deleteMark != null">
         delete_mark = #{deleteMark,jdbcType=BIT},
       </if>
-      <if test="gmtCreate != null" >
+      <if test="gmtCreate != null">
         gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
       </if>
-      <if test="gmtUpdate != null" >
+      <if test="gmtUpdate != null">
         gmt_update = #{gmtUpdate,jdbcType=TIMESTAMP},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr" >
+  <update id="updateByPrimaryKey" parameterType="com.unlcn.ils.sales.base.model.SaleOrderAddr">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 06 11:30:23 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order_addr
     set sale_order_id = #{saleOrderId,jdbcType=INTEGER},
@@ -434,10 +464,12 @@
       depart_region_name = #{departRegionName,jdbcType=VARCHAR},
       depart_contact = #{departContact,jdbcType=VARCHAR},
       depart_phone = #{departPhone,jdbcType=VARCHAR},
+      depart_addr = #{departAddr,jdbcType=VARCHAR},
       dest_region_code = #{destRegionCode,jdbcType=VARCHAR},
       dest_region_name = #{destRegionName,jdbcType=VARCHAR},
       dest_contact = #{destContact,jdbcType=VARCHAR},
       dest_phone = #{destPhone,jdbcType=VARCHAR},
+      dest_addr = #{destAddr,jdbcType=VARCHAR},
       distance = #{distance,jdbcType=DECIMAL},
       delete_mark = #{deleteMark,jdbcType=BIT},
       gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml
index 7b65001..fbf126f 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml
@@ -5,12 +5,13 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="pick_date" jdbcType="DATE" property="pickDate" />
+    <result column="pick_time" jdbcType="VARCHAR" property="pickTime" />
     <result column="brands" jdbcType="INTEGER" property="brands" />
     <result column="series_amt" jdbcType="INTEGER" property="seriesAmt" />
     <result column="standard_sale_price" jdbcType="DECIMAL" property="standardSalePrice" />
@@ -26,12 +27,18 @@
     <result column="delete_mark" jdbcType="BIT" property="deleteMark" />
     <result column="gmt_create" jdbcType="TIMESTAMP" property="gmtCreate" />
     <result column="gmt_update" jdbcType="TIMESTAMP" property="gmtUpdate" />
+    <result column="is_pick" jdbcType="BIT" property="isPick" />
+    <result column="is_deliv" jdbcType="BIT" property="isDeliv" />
+    <result column="transport_type" jdbcType="INTEGER" property="transportType" />
+    <result column="is_ticket" jdbcType="BIT" property="isTicket" />
+    <result column="arrive_date" jdbcType="DATE" property="arriveDate" />
+    <result column="arrive_time" jdbcType="VARCHAR" property="arriveTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -65,7 +72,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -99,18 +106,19 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
-    id, code, user_id, pick_date, brands, series_amt, standard_sale_price, standard_unit_price, 
-    suggest_sale_price, final_sale_price, final_purchase_price, insurance_sale_price, 
-    insurance_unit_price, order_status, attach_audit_status, comment, delete_mark, gmt_create, 
-    gmt_update
+    id, code, user_id, pick_date, pick_time, brands, series_amt, standard_sale_price, 
+    standard_unit_price, suggest_sale_price, final_sale_price, final_purchase_price, 
+    insurance_sale_price, insurance_unit_price, order_status, attach_audit_status, comment, 
+    delete_mark, gmt_create, gmt_update, is_pick, is_deliv, transport_type, is_ticket, 
+    arrive_date, arrive_time
   </sql>
   <select id="selectByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     select
     <if test="distinct">
@@ -132,7 +140,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -143,7 +151,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     delete from sale_order
     where id = #{id,jdbcType=INTEGER}
@@ -152,7 +160,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     delete from sale_order
     <if test="_parameter != null">
@@ -163,31 +171,35 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into sale_order (code, user_id, pick_date, 
-      brands, series_amt, standard_sale_price, 
-      standard_unit_price, suggest_sale_price, final_sale_price, 
-      final_purchase_price, insurance_sale_price, 
+      pick_time, brands, series_amt, 
+      standard_sale_price, standard_unit_price, suggest_sale_price, 
+      final_sale_price, final_purchase_price, insurance_sale_price, 
       insurance_unit_price, order_status, attach_audit_status, 
       comment, delete_mark, gmt_create, 
-      gmt_update)
+      gmt_update, is_pick, is_deliv, 
+      transport_type, is_ticket, arrive_date, 
+      arrive_time)
     values (#{code,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{pickDate,jdbcType=DATE}, 
-      #{brands,jdbcType=INTEGER}, #{seriesAmt,jdbcType=INTEGER}, #{standardSalePrice,jdbcType=DECIMAL}, 
-      #{standardUnitPrice,jdbcType=DECIMAL}, #{suggestSalePrice,jdbcType=DECIMAL}, #{finalSalePrice,jdbcType=DECIMAL}, 
-      #{finalPurchasePrice,jdbcType=DECIMAL}, #{insuranceSalePrice,jdbcType=DECIMAL}, 
+      #{pickTime,jdbcType=VARCHAR}, #{brands,jdbcType=INTEGER}, #{seriesAmt,jdbcType=INTEGER}, 
+      #{standardSalePrice,jdbcType=DECIMAL}, #{standardUnitPrice,jdbcType=DECIMAL}, #{suggestSalePrice,jdbcType=DECIMAL}, 
+      #{finalSalePrice,jdbcType=DECIMAL}, #{finalPurchasePrice,jdbcType=DECIMAL}, #{insuranceSalePrice,jdbcType=DECIMAL}, 
       #{insuranceUnitPrice,jdbcType=DECIMAL}, #{orderStatus,jdbcType=INTEGER}, #{attachAuditStatus,jdbcType=INTEGER}, 
       #{comment,jdbcType=VARCHAR}, #{deleteMark,jdbcType=BIT}, #{gmtCreate,jdbcType=TIMESTAMP}, 
-      #{gmtUpdate,jdbcType=TIMESTAMP})
+      #{gmtUpdate,jdbcType=TIMESTAMP}, #{isPick,jdbcType=BIT}, #{isDeliv,jdbcType=BIT}, 
+      #{transportType,jdbcType=INTEGER}, #{isTicket,jdbcType=BIT}, #{arriveDate,jdbcType=DATE}, 
+      #{arriveTime,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrder">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -203,6 +215,9 @@
       <if test="pickDate != null">
         pick_date,
       </if>
+      <if test="pickTime != null">
+        pick_time,
+      </if>
       <if test="brands != null">
         brands,
       </if>
@@ -248,6 +263,24 @@
       <if test="gmtUpdate != null">
         gmt_update,
       </if>
+      <if test="isPick != null">
+        is_pick,
+      </if>
+      <if test="isDeliv != null">
+        is_deliv,
+      </if>
+      <if test="transportType != null">
+        transport_type,
+      </if>
+      <if test="isTicket != null">
+        is_ticket,
+      </if>
+      <if test="arriveDate != null">
+        arrive_date,
+      </if>
+      <if test="arriveTime != null">
+        arrive_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="code != null">
@@ -259,6 +292,9 @@
       <if test="pickDate != null">
         #{pickDate,jdbcType=DATE},
       </if>
+      <if test="pickTime != null">
+        #{pickTime,jdbcType=VARCHAR},
+      </if>
       <if test="brands != null">
         #{brands,jdbcType=INTEGER},
       </if>
@@ -304,13 +340,31 @@
       <if test="gmtUpdate != null">
         #{gmtUpdate,jdbcType=TIMESTAMP},
       </if>
+      <if test="isPick != null">
+        #{isPick,jdbcType=BIT},
+      </if>
+      <if test="isDeliv != null">
+        #{isDeliv,jdbcType=BIT},
+      </if>
+      <if test="transportType != null">
+        #{transportType,jdbcType=INTEGER},
+      </if>
+      <if test="isTicket != null">
+        #{isTicket,jdbcType=BIT},
+      </if>
+      <if test="arriveDate != null">
+        #{arriveDate,jdbcType=DATE},
+      </if>
+      <if test="arriveTime != null">
+        #{arriveTime,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     select count(*) from sale_order
     <if test="_parameter != null">
@@ -321,7 +375,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order
     <set>
@@ -337,6 +391,9 @@
       <if test="record.pickDate != null">
         pick_date = #{record.pickDate,jdbcType=DATE},
       </if>
+      <if test="record.pickTime != null">
+        pick_time = #{record.pickTime,jdbcType=VARCHAR},
+      </if>
       <if test="record.brands != null">
         brands = #{record.brands,jdbcType=INTEGER},
       </if>
@@ -382,6 +439,24 @@
       <if test="record.gmtUpdate != null">
         gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.isPick != null">
+        is_pick = #{record.isPick,jdbcType=BIT},
+      </if>
+      <if test="record.isDeliv != null">
+        is_deliv = #{record.isDeliv,jdbcType=BIT},
+      </if>
+      <if test="record.transportType != null">
+        transport_type = #{record.transportType,jdbcType=INTEGER},
+      </if>
+      <if test="record.isTicket != null">
+        is_ticket = #{record.isTicket,jdbcType=BIT},
+      </if>
+      <if test="record.arriveDate != null">
+        arrive_date = #{record.arriveDate,jdbcType=DATE},
+      </if>
+      <if test="record.arriveTime != null">
+        arrive_time = #{record.arriveTime,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -391,13 +466,14 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order
     set id = #{record.id,jdbcType=INTEGER},
       code = #{record.code,jdbcType=VARCHAR},
       user_id = #{record.userId,jdbcType=INTEGER},
       pick_date = #{record.pickDate,jdbcType=DATE},
+      pick_time = #{record.pickTime,jdbcType=VARCHAR},
       brands = #{record.brands,jdbcType=INTEGER},
       series_amt = #{record.seriesAmt,jdbcType=INTEGER},
       standard_sale_price = #{record.standardSalePrice,jdbcType=DECIMAL},
@@ -412,7 +488,13 @@
       comment = #{record.comment,jdbcType=VARCHAR},
       delete_mark = #{record.deleteMark,jdbcType=BIT},
       gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
-      gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP}
+      gmt_update = #{record.gmtUpdate,jdbcType=TIMESTAMP},
+      is_pick = #{record.isPick,jdbcType=BIT},
+      is_deliv = #{record.isDeliv,jdbcType=BIT},
+      transport_type = #{record.transportType,jdbcType=INTEGER},
+      is_ticket = #{record.isTicket,jdbcType=BIT},
+      arrive_date = #{record.arriveDate,jdbcType=DATE},
+      arrive_time = #{record.arriveTime,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -421,7 +503,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order
     <set>
@@ -434,6 +516,9 @@
       <if test="pickDate != null">
         pick_date = #{pickDate,jdbcType=DATE},
       </if>
+      <if test="pickTime != null">
+        pick_time = #{pickTime,jdbcType=VARCHAR},
+      </if>
       <if test="brands != null">
         brands = #{brands,jdbcType=INTEGER},
       </if>
@@ -479,6 +564,24 @@
       <if test="gmtUpdate != null">
         gmt_update = #{gmtUpdate,jdbcType=TIMESTAMP},
       </if>
+      <if test="isPick != null">
+        is_pick = #{isPick,jdbcType=BIT},
+      </if>
+      <if test="isDeliv != null">
+        is_deliv = #{isDeliv,jdbcType=BIT},
+      </if>
+      <if test="transportType != null">
+        transport_type = #{transportType,jdbcType=INTEGER},
+      </if>
+      <if test="isTicket != null">
+        is_ticket = #{isTicket,jdbcType=BIT},
+      </if>
+      <if test="arriveDate != null">
+        arrive_date = #{arriveDate,jdbcType=DATE},
+      </if>
+      <if test="arriveTime != null">
+        arrive_time = #{arriveTime,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -486,12 +589,13 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Aug 14 16:47:17 CST 2017.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
     -->
     update sale_order
     set code = #{code,jdbcType=VARCHAR},
       user_id = #{userId,jdbcType=INTEGER},
       pick_date = #{pickDate,jdbcType=DATE},
+      pick_time = #{pickTime,jdbcType=VARCHAR},
       brands = #{brands,jdbcType=INTEGER},
       series_amt = #{seriesAmt,jdbcType=INTEGER},
       standard_sale_price = #{standardSalePrice,jdbcType=DECIMAL},
@@ -506,7 +610,13 @@
       comment = #{comment,jdbcType=VARCHAR},
       delete_mark = #{deleteMark,jdbcType=BIT},
       gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
-      gmt_update = #{gmtUpdate,jdbcType=TIMESTAMP}
+      gmt_update = #{gmtUpdate,jdbcType=TIMESTAMP},
+      is_pick = #{isPick,jdbcType=BIT},
+      is_deliv = #{isDeliv,jdbcType=BIT},
+      transport_type = #{transportType,jdbcType=INTEGER},
+      is_ticket = #{isTicket,jdbcType=BIT},
+      arrive_date = #{arriveDate,jdbcType=DATE},
+      arrive_time = #{arriveTime,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderTicketMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderTicketMapper.xml
new file mode 100644
index 0000000..3c1c6e8
--- /dev/null
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderTicketMapper.xml
@@ -0,0 +1,464 @@
+<?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" >
+<mapper namespace="com.unlcn.ils.sales.base.mapper.SaleOrderTicketMapper" >
+  <resultMap id="BaseResultMap" type="com.unlcn.ils.sales.base.model.SaleOrderTicket" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="order_id" property="orderId" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+    <result column="identify_number" property="identifyNumber" jdbcType="VARCHAR" />
+    <result column="opening_bank" property="openingBank" jdbcType="VARCHAR" />
+    <result column="account_number" property="accountNumber" jdbcType="VARCHAR" />
+    <result column="address" property="address" jdbcType="VARCHAR" />
+    <result column="contact_number" property="contactNumber" jdbcType="VARCHAR" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="VARCHAR" />
+    <result column="comment" property="comment" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="VARCHAR" />
+    <result column="modified_user" property="modifiedUser" jdbcType="VARCHAR" />
+    <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP" />
+    <result column="gmt_modified" property="gmtModified" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    id, order_id, type, name, identify_number, opening_bank, account_number, address, 
+    contact_number, content, status, comment, create_user, modified_user, gmt_create, 
+    gmt_modified
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicketExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from sale_order_ticket
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+    <if test="limitStart != null and limitStart>-1" >
+      limit ${limitStart} , ${limitEnd}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from sale_order_ticket
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    delete from sale_order_ticket
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicketExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    delete from sale_order_ticket
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicket" useGeneratedKeys="true" keyProperty="id" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sale_order_ticket (order_id, type, name, 
+      identify_number, opening_bank, account_number, 
+      address, contact_number, content, 
+      status, comment, create_user, 
+      modified_user, gmt_create, gmt_modified
+      )
+    values (#{orderId,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{identifyNumber,jdbcType=VARCHAR}, #{openingBank,jdbcType=VARCHAR}, #{accountNumber,jdbcType=VARCHAR}, 
+      #{address,jdbcType=VARCHAR}, #{contactNumber,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{comment,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{modifiedUser,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicket" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into sale_order_ticket
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="orderId != null" >
+        order_id,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="name != null" >
+        name,
+      </if>
+      <if test="identifyNumber != null" >
+        identify_number,
+      </if>
+      <if test="openingBank != null" >
+        opening_bank,
+      </if>
+      <if test="accountNumber != null" >
+        account_number,
+      </if>
+      <if test="address != null" >
+        address,
+      </if>
+      <if test="contactNumber != null" >
+        contact_number,
+      </if>
+      <if test="content != null" >
+        content,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="comment != null" >
+        comment,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="modifiedUser != null" >
+        modified_user,
+      </if>
+      <if test="gmtCreate != null" >
+        gmt_create,
+      </if>
+      <if test="gmtModified != null" >
+        gmt_modified,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="orderId != null" >
+        #{orderId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="identifyNumber != null" >
+        #{identifyNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="openingBank != null" >
+        #{openingBank,jdbcType=VARCHAR},
+      </if>
+      <if test="accountNumber != null" >
+        #{accountNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null" >
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="contactNumber != null" >
+        #{contactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null" >
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="comment != null" >
+        #{comment,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedUser != null" >
+        #{modifiedUser,jdbcType=VARCHAR},
+      </if>
+      <if test="gmtCreate != null" >
+        #{gmtCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="gmtModified != null" >
+        #{gmtModified,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicketExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    select count(*) from sale_order_ticket
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    update sale_order_ticket
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderId != null" >
+        order_id = #{record.orderId,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null" >
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.identifyNumber != null" >
+        identify_number = #{record.identifyNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.openingBank != null" >
+        opening_bank = #{record.openingBank,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountNumber != null" >
+        account_number = #{record.accountNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null" >
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactNumber != null" >
+        contact_number = #{record.contactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.content != null" >
+        content = #{record.content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null" >
+        status = #{record.status,jdbcType=VARCHAR},
+      </if>
+      <if test="record.comment != null" >
+        comment = #{record.comment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        create_user = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modifiedUser != null" >
+        modified_user = #{record.modifiedUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gmtCreate != null" >
+        gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.gmtModified != null" >
+        gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    update sale_order_ticket
+    set id = #{record.id,jdbcType=INTEGER},
+      order_id = #{record.orderId,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      identify_number = #{record.identifyNumber,jdbcType=VARCHAR},
+      opening_bank = #{record.openingBank,jdbcType=VARCHAR},
+      account_number = #{record.accountNumber,jdbcType=VARCHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      contact_number = #{record.contactNumber,jdbcType=VARCHAR},
+      content = #{record.content,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=VARCHAR},
+      comment = #{record.comment,jdbcType=VARCHAR},
+      create_user = #{record.createUser,jdbcType=VARCHAR},
+      modified_user = #{record.modifiedUser,jdbcType=VARCHAR},
+      gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
+      gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicket" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    update sale_order_ticket
+    <set >
+      <if test="orderId != null" >
+        order_id = #{orderId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="identifyNumber != null" >
+        identify_number = #{identifyNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="openingBank != null" >
+        opening_bank = #{openingBank,jdbcType=VARCHAR},
+      </if>
+      <if test="accountNumber != null" >
+        account_number = #{accountNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null" >
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="contactNumber != null" >
+        contact_number = #{contactNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null" >
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="comment != null" >
+        comment = #{comment,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedUser != null" >
+        modified_user = #{modifiedUser,jdbcType=VARCHAR},
+      </if>
+      <if test="gmtCreate != null" >
+        gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="gmtModified != null" >
+        gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.unlcn.ils.sales.base.model.SaleOrderTicket" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+    -->
+    update sale_order_ticket
+    set order_id = #{orderId,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      name = #{name,jdbcType=VARCHAR},
+      identify_number = #{identifyNumber,jdbcType=VARCHAR},
+      opening_bank = #{openingBank,jdbcType=VARCHAR},
+      account_number = #{accountNumber,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      contact_number = #{contactNumber,jdbcType=VARCHAR},
+      content = #{content,jdbcType=VARCHAR},
+      status = #{status,jdbcType=VARCHAR},
+      comment = #{comment,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=VARCHAR},
+      modified_user = #{modifiedUser,jdbcType=VARCHAR},
+      gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
+      gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index bdb4b56..4f59eb0 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -31,7 +31,13 @@
         <result column="distance" property="distance" jdbcType="DECIMAL"/>
         <result column="auditStatus" property="auditStatus" jdbcType="INTEGER"/>
         <result column="auditId" property="auditId" jdbcType="INTEGER"/>
-        <result column="auditComment" property="auditComment" jdbcType="VARCHAR"/>
+        <result column="is_ticket" property="isTicket" jdbcType="BIT"/>
+        <result column="transport_type" property="transportType" jdbcType="INTEGER"/>
+        <result column="is_pick" property="isPick" jdbcType="BIT"/>
+        <result column="is_deliv" property="isDeliv" jdbcType="BIT"/>
+        <result column="depart_addr" property="departAddr" jdbcType="VARCHAR"/>
+        <result column="dest_addr" property="destAddr" jdbcType="VARCHAR"/>
+        <result column="pick_time" property="pickTime" jdbcType="VARCHAR"/>
         <collection property="orderSkus" column="id" ofType="com.unlcn.ils.sales.base.model.OrderSkuViewDAO"
                     javaType="ArrayList" select="listSaleOrderSku"/>
         <collection property="attachs" column="id" ofType="com.unlcn.ils.sales.base.model.OrderAttachViewDAO"
@@ -71,7 +77,14 @@
         soa.distance as distance,
         soau.audit_status AS auditStatus,
         soau.id AS auditId,
-        soau.comment AS auditComment
+        soau.comment AS auditComment,
+        so.is_ticket AS isTicket,
+        so.transport_type AS transportType,
+        so.is_pick AS isPick,
+        so.is_deliv AS isDeliv,
+        soa.depart_addr AS departAddr,
+        soa.dest_addr AS destAddr,
+        so.pick_time AS pickTime
         FROM
         sale_order so
         LEFT JOIN sale_order_addr soa ON so.id = soa.sale_order_id
@@ -187,23 +200,23 @@
     </resultMap>
 
     <select id="listSaleOrderSku" resultMap="SaleOrderSkuMap">
+    SELECT *,count(*) as amt FROM(
     SELECT
-        sos.brand_id AS brandId,
-        sos.brand_code AS brandCode,
-        sos.brand_name AS brandName,
-        sos.series_id AS seriesId,
-        sos.series_code AS seriesCode,
-        sos.series_name AS seriesName,
-        sos.model_id AS modelId,
-        sos.model_code AS modelCode,
-        sos.model_name AS modelName,
-        sos.amt AS amt,
-        sos.vin AS vin
-    FROM
-        sale_order_sku sos
-    WHERE
-        sos.delete_mark = 1
-    AND sos.sale_order_id = #{id}
+            sos.brand_id AS brandId,
+            sos.brand_code AS brandCode,
+            sos.brand_name AS brandName,
+            sos.series_id AS seriesId,
+            sos.series_code AS seriesCode,
+            sos.series_name AS seriesName,
+            sos.model_id AS modelId,
+            sos.model_code AS modelCode,
+            sos.model_name AS modelName
+        FROM
+            sale_order_sku sos
+        WHERE
+            sos.delete_mark = 1
+        AND sos.sale_order_id = #{id}) t
+    GROUP BY t.brandId,t.brandCode,t.brandName,t.modelCode,t.modelId,t.modelName,t.seriesCode,t.seriesId,t.seriesName
   </select>
 
   <select id="listOrderAttach" resultMap="SaleOrderAttachMap">
diff --git a/ils-sales-base/src/main/resources/mybatis/generatorConfig.xml b/ils-sales-base/src/main/resources/mybatis/generatorConfig.xml
index 6766f90..c843e9e 100644
--- a/ils-sales-base/src/main/resources/mybatis/generatorConfig.xml
+++ b/ils-sales-base/src/main/resources/mybatis/generatorConfig.xml
@@ -38,12 +38,15 @@
         <!--<table tableName="sale_order_sku" >-->
             <!--<generatedKey column="id" sqlStatement="MySql" identity="true" />-->
         <!--</table>-->
-        <!--<table tableName="sale_order_addr" >-->
-            <!--<generatedKey column="id" sqlStatement="MySql" identity="true" />-->
-        <!--</table>-->
-        <!--<table tableName="sale_order" >-->
-            <!--<generatedKey column="id" sqlStatement="MySql" identity="true" />-->
-        <!--</table>-->
+        <table tableName="sale_order_addr" >
+            <generatedKey column="id" sqlStatement="MySql" identity="true" />
+        </table>
+        <table tableName="sale_order" >
+            <generatedKey column="id" sqlStatement="MySql" identity="true" />
+        </table>
+        <table tableName="sale_order_ticket" >
+            <generatedKey column="id" sqlStatement="MySql" identity="true" />
+        </table>
         <!--<table tableName="sale_order_audit" >-->
             <!--<generatedKey column="id" sqlStatement="MySql" identity="true" />-->
         <!--</table>-->
@@ -95,8 +98,8 @@
         <!--<table tableName="sale_bank" >-->
             <!--<generatedKey column="id" sqlStatement="MySql" identity="true" />-->
         <!--</table>-->
-        <table tableName="sale_order_attach" >
-            <generatedKey column="id" sqlStatement="MySql" identity="true" />
-        </table>
+        <!--<table tableName="sale_order_attach" >-->
+            <!--<generatedKey column="id" sqlStatement="MySql" identity="true" />-->
+        <!--</table>-->
     </context>
 </generatorConfiguration>
-- 
Gitee


From c619f07b6ebf35f37fb67f9695cf7ae8c8e4b3a8 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 14 Sep 2017 18:06:48 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/enums/OrderPayStatusEnum.java     |  36 ++++
 .../sales/backend/service/OrderService.java   |  11 +
 .../backend/service/OrderServiceImpl.java     |  48 ++++-
 .../sales/base/mapper/SaleOrderMapper.java    |  22 +-
 .../unlcn/ils/sales/base/model/SaleOrder.java | 193 ++++++++++--------
 .../sales/base/model/SaleOrderExample.java    | 106 +++++++---
 .../resources/mappers/SaleOrderMapper.xml     |  55 +++--
 7 files changed, 336 insertions(+), 135 deletions(-)
 create mode 100644 ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/OrderPayStatusEnum.java

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/OrderPayStatusEnum.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/OrderPayStatusEnum.java
new file mode 100644
index 0000000..90ddd34
--- /dev/null
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/enums/OrderPayStatusEnum.java
@@ -0,0 +1,36 @@
+package com.unlcn.ils.sales.backend.enums;
+
+/**
+ * Created by houjianhui on 2017/6/10.
+ */
+public enum OrderPayStatusEnum {
+
+    ORDER_INIT(10, "未支付"),
+    ORDER_AWAIT(20, "待支付"),
+    ORDER_TOUCH(30, "已支付");
+
+    private final int value;
+    private final String text;
+
+    OrderPayStatusEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public static OrderPayStatusEnum getByValue(int value){
+        for (OrderPayStatusEnum temp : OrderPayStatusEnum.values()) {
+            if(temp.getValue() == value){
+                return temp;
+            }
+        }
+        return null;
+    }
+}
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java
index 01a5e3c..16bb4be 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderService.java
@@ -31,6 +31,17 @@ public interface OrderService {
      */
     Integer updateOrderStatusByOrderCode(String orderCode, Integer orderStatus) throws Exception;
 
+    /**
+     * 更新销售订单物流状态及支付状态
+     *
+     * @param orderCode   销售订单编号
+     * @param orderStatus 销售订单状态
+     * @param payStatus   销售订单支付状态
+     * @return
+     * @throws Exception
+     */
+    Integer updateOrderStatusAndPayStatusByOrderCode(String orderCode, Integer orderStatus, Integer payStatus) throws Exception;
+
     /**
      * 查询销售订单列表
      *
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index 449901b..dc79729 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 import com.unlcn.ils.sales.backend.bo.*;
 import com.unlcn.ils.sales.backend.constant.AutoConfConstant;
 import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum;
+import com.unlcn.ils.sales.backend.enums.OrderPayStatusEnum;
 import com.unlcn.ils.sales.backend.enums.OrderStatusEnum;
 import com.unlcn.ils.sales.backend.util.UniquenessUtil;
 import com.unlcn.ils.sales.base.mapper.SaleOrderMapper;
@@ -156,6 +157,49 @@ public class OrderServiceImpl implements OrderService {
         }
     }
 
+    @Override
+    public Integer updateOrderStatusAndPayStatusByOrderCode(String orderCode, Integer orderStatus, Integer payStatus) throws Exception {
+        LOGGER.info("OrderServiceImpl.updateOrderStatusAndPayStatusByOrderCode params orderCode:{}, orderStatus: {}, payStatus: {}", orderCode, orderStatus, payStatus);
+        if (StringUtils.isBlank(orderCode)) {
+            LOGGER.info("OrderServiceImpl.updateOrderStatusAndPayStatusByOrderCode param orderCode must not be null");
+            throw new IllegalArgumentException("销售订单编号不能为空");
+        } else if (Objects.equals(orderStatus, null) || Objects.equals(orderStatus, "") || Objects.equals(orderStatus, 0)) {
+            LOGGER.info("OrderServiceImpl.updateOrderStatusAndPayStatusByOrderCode param orderStatus must not be null");
+            throw new IllegalArgumentException("销售订单物流状态不能为空");
+        } else if (Objects.equals(payStatus, null) || Objects.equals(payStatus, "") || Objects.equals(payStatus, 0)) {
+            LOGGER.info("OrderServiceImpl.updateOrderStatusAndPayStatusByOrderCode param payStatus must not be null");
+            throw new IllegalArgumentException("销售订单支付状态不能为空");
+        }
+
+        // 构建查询条件
+        SaleOrderExample example = new SaleOrderExample();
+        example.createCriteria().andCodeEqualTo(orderCode);
+        // 查询销售订单
+        List<SaleOrder> orders = orderMapper.selectByExample(example);
+        // 判断销售订单是否存在
+        if (CollectionUtils.isEmpty(orders)) {
+            LOGGER.info("OrderServiceImpl.updateOrderStatusByOrderCode Current order: {} doesn't exist", orderCode);
+            throw new BusinessException("当前销售订单不存在");
+        }
+        // 获取销售订单
+        SaleOrder order = orders.get(0);
+        // 验证状态是否合法
+        if (Objects.equals(OrderStatusEnum.getByValue(orderStatus), null)){
+            LOGGER.info("Sales order status is not legal: {}", orderStatus);
+            throw new BusinessException("销售订单状态不合法");
+        }
+
+        // 设置销售订单状态
+        order.setOrderStatus(orderStatus);
+        order.setPayStatus(payStatus);
+        try {
+            return orderMapper.updateByPrimaryKeySelective(order);
+        } catch (Exception e) {
+            LOGGER.error("OrderServiceImpl.updateOrderStatusByOrderCode error: {}", e);
+            throw new BusinessException("更新销售订单状态异常");
+        }
+    }
+
     @Override
     public Map<String, Object> listSaleOrder(PageVo pageVo, OrderQueryBO queryBO) throws Exception {
         LOGGER.info("OrderServiceImpl.listSaleOrder params OrderQueryBO: {}", queryBO);
@@ -211,7 +255,8 @@ public class OrderServiceImpl implements OrderService {
                     String[] code_status = orderLists.get(i).split(",");
                     String orderCode = code_status[0];
                     String status = code_status[1];
-                    updateOrderStatusByOrderCode(orderCode, Integer.valueOf(status));
+                    String payStatus = status.split("_")[1];
+                    updateOrderStatusAndPayStatusByOrderCode(orderCode, Integer.valueOf(status), Integer.valueOf(payStatus));
                 }
             }
         }
@@ -233,6 +278,7 @@ public class OrderServiceImpl implements OrderService {
         if (CollectionUtils.isNotEmpty(orders)) {
             orders.stream().forEach(item -> {
                 item.setAttachAuditStatus(AttachAuditStatusEnum.getByValue(attachAuditStatus).getValue());
+                item.setPayStatus(OrderPayStatusEnum.ORDER_TOUCH.getValue());
                 orderMapper.updateByPrimaryKeySelective(item);
             });
         }
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java
index 0657f34..77b1373 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderMapper.java
@@ -10,7 +10,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int countByExample(SaleOrderExample example);
 
@@ -18,7 +18,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int deleteByExample(SaleOrderExample example);
 
@@ -26,7 +26,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int deleteByPrimaryKey(Integer id);
 
@@ -34,7 +34,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int insert(SaleOrder record);
 
@@ -42,7 +42,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int insertSelective(SaleOrder record);
 
@@ -50,7 +50,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     List<SaleOrder> selectByExample(SaleOrderExample example);
 
@@ -58,7 +58,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     SaleOrder selectByPrimaryKey(Integer id);
 
@@ -66,7 +66,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int updateByExampleSelective(@Param("record") SaleOrder record, @Param("example") SaleOrderExample example);
 
@@ -74,7 +74,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int updateByExample(@Param("record") SaleOrder record, @Param("example") SaleOrderExample example);
 
@@ -82,7 +82,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int updateByPrimaryKeySelective(SaleOrder record);
 
@@ -90,7 +90,7 @@ public interface SaleOrderMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     int updateByPrimaryKey(SaleOrder record);
 }
\ No newline at end of file
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java
index 161d2c0..044c057 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrder.java
@@ -9,7 +9,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.id
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private Integer id;
 
@@ -17,7 +17,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.code
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private String code;
 
@@ -25,7 +25,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.user_id
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private Integer userId;
 
@@ -33,7 +33,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.pick_date
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private Date pickDate;
 
@@ -41,7 +41,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.pick_time
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private String pickTime;
 
@@ -49,7 +49,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.brands
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private Integer brands;
 
@@ -57,7 +57,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.series_amt
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private Integer seriesAmt;
 
@@ -65,7 +65,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.standard_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal standardSalePrice;
 
@@ -73,7 +73,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.standard_unit_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal standardUnitPrice;
 
@@ -81,7 +81,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.suggest_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal suggestSalePrice;
 
@@ -89,7 +89,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.final_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal finalSalePrice;
 
@@ -97,7 +97,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.final_purchase_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal finalPurchasePrice;
 
@@ -105,7 +105,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.insurance_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal insuranceSalePrice;
 
@@ -113,7 +113,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.insurance_unit_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private BigDecimal insuranceUnitPrice;
 
@@ -121,7 +121,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.order_status
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     private Integer orderStatus;
 
@@ -129,7 +129,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.attach_audit_status
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Integer attachAuditStatus;
 
@@ -137,7 +137,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.comment
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private String comment;
 
@@ -145,7 +145,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.delete_mark
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Boolean deleteMark;
 
@@ -153,7 +153,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.gmt_create
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Date gmtCreate;
 
@@ -161,7 +161,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.gmt_update
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Date gmtUpdate;
 
@@ -169,7 +169,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.is_pick
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Boolean isPick;
 
@@ -177,7 +177,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.is_deliv
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Boolean isDeliv;
 
@@ -185,7 +185,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.transport_type
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Integer transportType;
 
@@ -193,7 +193,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.is_ticket
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Boolean isTicket;
 
@@ -201,7 +201,7 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.arrive_date
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private Date arriveDate;
 
@@ -209,15 +209,23 @@ public class SaleOrder implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column sale_order.arrive_time
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private String arriveTime;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column sale_order.pay_status
+     *
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
+     */
+    private Integer payStatus;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     private static final long serialVersionUID = 1L;
 
@@ -227,7 +235,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.id
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Integer getId() {
         return id;
@@ -239,7 +247,7 @@ public class SaleOrder implements Serializable {
      *
      * @param id the value for sale_order.id
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setId(Integer id) {
         this.id = id;
@@ -251,7 +259,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.code
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public String getCode() {
         return code;
@@ -263,7 +271,7 @@ public class SaleOrder implements Serializable {
      *
      * @param code the value for sale_order.code
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
@@ -275,7 +283,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.user_id
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Integer getUserId() {
         return userId;
@@ -287,7 +295,7 @@ public class SaleOrder implements Serializable {
      *
      * @param userId the value for sale_order.user_id
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setUserId(Integer userId) {
         this.userId = userId;
@@ -299,7 +307,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.pick_date
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Date getPickDate() {
         return pickDate;
@@ -311,7 +319,7 @@ public class SaleOrder implements Serializable {
      *
      * @param pickDate the value for sale_order.pick_date
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setPickDate(Date pickDate) {
         this.pickDate = pickDate;
@@ -323,7 +331,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.pick_time
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public String getPickTime() {
         return pickTime;
@@ -335,7 +343,7 @@ public class SaleOrder implements Serializable {
      *
      * @param pickTime the value for sale_order.pick_time
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setPickTime(String pickTime) {
         this.pickTime = pickTime == null ? null : pickTime.trim();
@@ -347,7 +355,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.brands
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Integer getBrands() {
         return brands;
@@ -359,7 +367,7 @@ public class SaleOrder implements Serializable {
      *
      * @param brands the value for sale_order.brands
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setBrands(Integer brands) {
         this.brands = brands;
@@ -371,7 +379,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.series_amt
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Integer getSeriesAmt() {
         return seriesAmt;
@@ -383,7 +391,7 @@ public class SaleOrder implements Serializable {
      *
      * @param seriesAmt the value for sale_order.series_amt
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setSeriesAmt(Integer seriesAmt) {
         this.seriesAmt = seriesAmt;
@@ -395,7 +403,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.standard_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getStandardSalePrice() {
         return standardSalePrice;
@@ -407,7 +415,7 @@ public class SaleOrder implements Serializable {
      *
      * @param standardSalePrice the value for sale_order.standard_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setStandardSalePrice(BigDecimal standardSalePrice) {
         this.standardSalePrice = standardSalePrice;
@@ -419,7 +427,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.standard_unit_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getStandardUnitPrice() {
         return standardUnitPrice;
@@ -431,7 +439,7 @@ public class SaleOrder implements Serializable {
      *
      * @param standardUnitPrice the value for sale_order.standard_unit_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setStandardUnitPrice(BigDecimal standardUnitPrice) {
         this.standardUnitPrice = standardUnitPrice;
@@ -443,7 +451,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.suggest_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getSuggestSalePrice() {
         return suggestSalePrice;
@@ -455,7 +463,7 @@ public class SaleOrder implements Serializable {
      *
      * @param suggestSalePrice the value for sale_order.suggest_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setSuggestSalePrice(BigDecimal suggestSalePrice) {
         this.suggestSalePrice = suggestSalePrice;
@@ -467,7 +475,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.final_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getFinalSalePrice() {
         return finalSalePrice;
@@ -479,7 +487,7 @@ public class SaleOrder implements Serializable {
      *
      * @param finalSalePrice the value for sale_order.final_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setFinalSalePrice(BigDecimal finalSalePrice) {
         this.finalSalePrice = finalSalePrice;
@@ -491,7 +499,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.final_purchase_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getFinalPurchasePrice() {
         return finalPurchasePrice;
@@ -503,7 +511,7 @@ public class SaleOrder implements Serializable {
      *
      * @param finalPurchasePrice the value for sale_order.final_purchase_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setFinalPurchasePrice(BigDecimal finalPurchasePrice) {
         this.finalPurchasePrice = finalPurchasePrice;
@@ -515,7 +523,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.insurance_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getInsuranceSalePrice() {
         return insuranceSalePrice;
@@ -527,7 +535,7 @@ public class SaleOrder implements Serializable {
      *
      * @param insuranceSalePrice the value for sale_order.insurance_sale_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setInsuranceSalePrice(BigDecimal insuranceSalePrice) {
         this.insuranceSalePrice = insuranceSalePrice;
@@ -539,7 +547,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.insurance_unit_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public BigDecimal getInsuranceUnitPrice() {
         return insuranceUnitPrice;
@@ -551,7 +559,7 @@ public class SaleOrder implements Serializable {
      *
      * @param insuranceUnitPrice the value for sale_order.insurance_unit_price
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setInsuranceUnitPrice(BigDecimal insuranceUnitPrice) {
         this.insuranceUnitPrice = insuranceUnitPrice;
@@ -563,7 +571,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.order_status
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Integer getOrderStatus() {
         return orderStatus;
@@ -575,7 +583,7 @@ public class SaleOrder implements Serializable {
      *
      * @param orderStatus the value for sale_order.order_status
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setOrderStatus(Integer orderStatus) {
         this.orderStatus = orderStatus;
@@ -587,7 +595,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.attach_audit_status
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Integer getAttachAuditStatus() {
         return attachAuditStatus;
@@ -599,7 +607,7 @@ public class SaleOrder implements Serializable {
      *
      * @param attachAuditStatus the value for sale_order.attach_audit_status
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setAttachAuditStatus(Integer attachAuditStatus) {
         this.attachAuditStatus = attachAuditStatus;
@@ -611,7 +619,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.comment
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public String getComment() {
         return comment;
@@ -623,7 +631,7 @@ public class SaleOrder implements Serializable {
      *
      * @param comment the value for sale_order.comment
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setComment(String comment) {
         this.comment = comment == null ? null : comment.trim();
@@ -635,7 +643,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.delete_mark
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Boolean getDeleteMark() {
         return deleteMark;
@@ -647,7 +655,7 @@ public class SaleOrder implements Serializable {
      *
      * @param deleteMark the value for sale_order.delete_mark
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setDeleteMark(Boolean deleteMark) {
         this.deleteMark = deleteMark;
@@ -659,7 +667,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.gmt_create
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Date getGmtCreate() {
         return gmtCreate;
@@ -671,7 +679,7 @@ public class SaleOrder implements Serializable {
      *
      * @param gmtCreate the value for sale_order.gmt_create
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
@@ -683,7 +691,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.gmt_update
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Date getGmtUpdate() {
         return gmtUpdate;
@@ -695,7 +703,7 @@ public class SaleOrder implements Serializable {
      *
      * @param gmtUpdate the value for sale_order.gmt_update
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setGmtUpdate(Date gmtUpdate) {
         this.gmtUpdate = gmtUpdate;
@@ -707,7 +715,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.is_pick
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Boolean getIsPick() {
         return isPick;
@@ -719,7 +727,7 @@ public class SaleOrder implements Serializable {
      *
      * @param isPick the value for sale_order.is_pick
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setIsPick(Boolean isPick) {
         this.isPick = isPick;
@@ -731,7 +739,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.is_deliv
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Boolean getIsDeliv() {
         return isDeliv;
@@ -743,7 +751,7 @@ public class SaleOrder implements Serializable {
      *
      * @param isDeliv the value for sale_order.is_deliv
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setIsDeliv(Boolean isDeliv) {
         this.isDeliv = isDeliv;
@@ -755,7 +763,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.transport_type
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Integer getTransportType() {
         return transportType;
@@ -767,7 +775,7 @@ public class SaleOrder implements Serializable {
      *
      * @param transportType the value for sale_order.transport_type
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setTransportType(Integer transportType) {
         this.transportType = transportType;
@@ -779,7 +787,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.is_ticket
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Boolean getIsTicket() {
         return isTicket;
@@ -791,7 +799,7 @@ public class SaleOrder implements Serializable {
      *
      * @param isTicket the value for sale_order.is_ticket
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setIsTicket(Boolean isTicket) {
         this.isTicket = isTicket;
@@ -803,7 +811,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.arrive_date
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public Date getArriveDate() {
         return arriveDate;
@@ -815,7 +823,7 @@ public class SaleOrder implements Serializable {
      *
      * @param arriveDate the value for sale_order.arrive_date
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setArriveDate(Date arriveDate) {
         this.arriveDate = arriveDate;
@@ -827,7 +835,7 @@ public class SaleOrder implements Serializable {
      *
      * @return the value of sale_order.arrive_time
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public String getArriveTime() {
         return arriveTime;
@@ -839,17 +847,41 @@ public class SaleOrder implements Serializable {
      *
      * @param arriveTime the value for sale_order.arrive_time
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     public void setArriveTime(String arriveTime) {
         this.arriveTime = arriveTime == null ? null : arriveTime.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column sale_order.pay_status
+     *
+     * @return the value of sale_order.pay_status
+     *
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
+     */
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column sale_order.pay_status
+     *
+     * @param payStatus the value for sale_order.pay_status
+     *
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
+     */
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:11 CST 2017
      */
     @Override
     public String toString() {
@@ -883,6 +915,7 @@ public class SaleOrder implements Serializable {
         sb.append(", isTicket=").append(isTicket);
         sb.append(", arriveDate=").append(arriveDate);
         sb.append(", arriveTime=").append(arriveTime);
+        sb.append(", payStatus=").append(payStatus);
         sb.append("]");
         return sb.toString();
     }
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java
index 892d931..2f4ecc0 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/SaleOrderExample.java
@@ -11,7 +11,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected String orderByClause;
 
@@ -19,7 +19,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected boolean distinct;
 
@@ -27,7 +27,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected List<Criteria> oredCriteria;
 
@@ -35,7 +35,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected int limitStart = -1;
 
@@ -43,7 +43,7 @@ public class SaleOrderExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected int limitEnd = -1;
 
@@ -51,7 +51,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public SaleOrderExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -61,7 +61,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -71,7 +71,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -81,7 +81,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -91,7 +91,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public boolean isDistinct() {
         return distinct;
@@ -101,7 +101,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -111,7 +111,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -121,7 +121,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -133,7 +133,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -147,7 +147,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -158,7 +158,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void clear() {
         oredCriteria.clear();
@@ -170,7 +170,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setLimitStart(int limitStart) {
         this.limitStart=limitStart;
@@ -180,7 +180,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public int getLimitStart() {
         return limitStart;
@@ -190,7 +190,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public void setLimitEnd(int limitEnd) {
         this.limitEnd=limitEnd;
@@ -200,7 +200,7 @@ public class SaleOrderExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public int getLimitEnd() {
         return limitEnd;
@@ -210,7 +210,7 @@ public class SaleOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -1879,6 +1879,66 @@ public class SaleOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andPayStatusIsNull() {
+            addCriterion("pay_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIsNotNull() {
+            addCriterion("pay_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusEqualTo(Integer value) {
+            addCriterion("pay_status =", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotEqualTo(Integer value) {
+            addCriterion("pay_status <>", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusGreaterThan(Integer value) {
+            addCriterion("pay_status >", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_status >=", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLessThan(Integer value) {
+            addCriterion("pay_status <", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_status <=", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIn(List<Integer> values) {
+            addCriterion("pay_status in", values, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotIn(List<Integer> values) {
+            addCriterion("pay_status not in", values, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusBetween(Integer value1, Integer value2) {
+            addCriterion("pay_status between", value1, value2, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_status not between", value1, value2, "payStatus");
+            return (Criteria) this;
+        }
+
         public Criteria andCodeLikeInsensitive(String value) {
             addCriterion("upper(code) like", value.toUpperCase(), "code");
             return (Criteria) this;
@@ -1904,7 +1964,7 @@ public class SaleOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order
      *
-     * @mbggenerated do_not_delete_during_merge Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated do_not_delete_during_merge Thu Sep 14 18:02:10 CST 2017
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -1917,7 +1977,7 @@ public class SaleOrderExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table sale_order
      *
-     * @mbggenerated Tue Sep 12 10:11:47 CST 2017
+     * @mbggenerated Thu Sep 14 18:02:10 CST 2017
      */
     public static class Criterion {
         private String condition;
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml
index fbf126f..4d5c525 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderMapper.xml
@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
@@ -33,12 +33,13 @@
     <result column="is_ticket" jdbcType="BIT" property="isTicket" />
     <result column="arrive_date" jdbcType="DATE" property="arriveDate" />
     <result column="arrive_time" jdbcType="VARCHAR" property="arriveTime" />
+    <result column="pay_status" jdbcType="INTEGER" property="payStatus" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -72,7 +73,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -106,19 +107,19 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     id, code, user_id, pick_date, pick_time, brands, series_amt, standard_sale_price, 
     standard_unit_price, suggest_sale_price, final_sale_price, final_purchase_price, 
     insurance_sale_price, insurance_unit_price, order_status, attach_audit_status, comment, 
     delete_mark, gmt_create, gmt_update, is_pick, is_deliv, transport_type, is_ticket, 
-    arrive_date, arrive_time
+    arrive_date, arrive_time, pay_status
   </sql>
   <select id="selectByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     select
     <if test="distinct">
@@ -140,7 +141,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -151,7 +152,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     delete from sale_order
     where id = #{id,jdbcType=INTEGER}
@@ -160,7 +161,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     delete from sale_order
     <if test="_parameter != null">
@@ -171,7 +172,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -184,7 +185,7 @@
       comment, delete_mark, gmt_create, 
       gmt_update, is_pick, is_deliv, 
       transport_type, is_ticket, arrive_date, 
-      arrive_time)
+      arrive_time, pay_status)
     values (#{code,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{pickDate,jdbcType=DATE}, 
       #{pickTime,jdbcType=VARCHAR}, #{brands,jdbcType=INTEGER}, #{seriesAmt,jdbcType=INTEGER}, 
       #{standardSalePrice,jdbcType=DECIMAL}, #{standardUnitPrice,jdbcType=DECIMAL}, #{suggestSalePrice,jdbcType=DECIMAL}, 
@@ -193,13 +194,13 @@
       #{comment,jdbcType=VARCHAR}, #{deleteMark,jdbcType=BIT}, #{gmtCreate,jdbcType=TIMESTAMP}, 
       #{gmtUpdate,jdbcType=TIMESTAMP}, #{isPick,jdbcType=BIT}, #{isDeliv,jdbcType=BIT}, 
       #{transportType,jdbcType=INTEGER}, #{isTicket,jdbcType=BIT}, #{arriveDate,jdbcType=DATE}, 
-      #{arriveTime,jdbcType=VARCHAR})
+      #{arriveTime,jdbcType=VARCHAR}, #{payStatus,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.unlcn.ils.sales.base.model.SaleOrder">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -281,6 +282,9 @@
       <if test="arriveTime != null">
         arrive_time,
       </if>
+      <if test="payStatus != null">
+        pay_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="code != null">
@@ -358,13 +362,16 @@
       <if test="arriveTime != null">
         #{arriveTime,jdbcType=VARCHAR},
       </if>
+      <if test="payStatus != null">
+        #{payStatus,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.unlcn.ils.sales.base.model.SaleOrderExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     select count(*) from sale_order
     <if test="_parameter != null">
@@ -375,7 +382,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     update sale_order
     <set>
@@ -457,6 +464,9 @@
       <if test="record.arriveTime != null">
         arrive_time = #{record.arriveTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.payStatus != null">
+        pay_status = #{record.payStatus,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -466,7 +476,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     update sale_order
     set id = #{record.id,jdbcType=INTEGER},
@@ -494,7 +504,8 @@
       transport_type = #{record.transportType,jdbcType=INTEGER},
       is_ticket = #{record.isTicket,jdbcType=BIT},
       arrive_date = #{record.arriveDate,jdbcType=DATE},
-      arrive_time = #{record.arriveTime,jdbcType=VARCHAR}
+      arrive_time = #{record.arriveTime,jdbcType=VARCHAR},
+      pay_status = #{record.payStatus,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -503,7 +514,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     update sale_order
     <set>
@@ -582,6 +593,9 @@
       <if test="arriveTime != null">
         arrive_time = #{arriveTime,jdbcType=VARCHAR},
       </if>
+      <if test="payStatus != null">
+        pay_status = #{payStatus,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -589,7 +603,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 12 10:11:47 CST 2017.
+      This element was generated on Thu Sep 14 18:02:11 CST 2017.
     -->
     update sale_order
     set code = #{code,jdbcType=VARCHAR},
@@ -616,7 +630,8 @@
       transport_type = #{transportType,jdbcType=INTEGER},
       is_ticket = #{isTicket,jdbcType=BIT},
       arrive_date = #{arriveDate,jdbcType=DATE},
-      arrive_time = #{arriveTime,jdbcType=VARCHAR}
+      arrive_time = #{arriveTime,jdbcType=VARCHAR},
+      pay_status = #{payStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>
\ No newline at end of file
-- 
Gitee


From 9be6187360943f0ea1992e16a8a6cb5e560b4f2b Mon Sep 17 00:00:00 2001
From: zhaoguixin <306743062@qq.com>
Date: Fri, 15 Sep 2017 09:39:18 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9dev=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-backend/config/dev.properties                     | 6 ++++++
 ils-sales-backend/config/production.properties              | 5 +++++
 ils-sales-backend/config/uat.properties                     | 5 +++++
 .../src/main/resources/META-INF/autoconf/auto-config.xml    | 4 ++++
 .../src/main/resources/META-INF/autoconf/config.vm          | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/ils-sales-backend/config/dev.properties b/ils-sales-backend/config/dev.properties
index 159e0f9..4d7acac 100644
--- a/ils-sales-backend/config/dev.properties
+++ b/ils-sales-backend/config/dev.properties
@@ -73,3 +73,9 @@ ils.bms.url.timeout=7200
 
 #整板数量配置
 ils.sale.brands=10
+
+#operation主数据地址
+hyc.operation.url=http://119.57.140.26/hyc-operation-api
+#operation主数据地址请求超时
+hyc.operation.url.timeout=7200
+
diff --git a/ils-sales-backend/config/production.properties b/ils-sales-backend/config/production.properties
index 6d9344f..b99fade 100644
--- a/ils-sales-backend/config/production.properties
+++ b/ils-sales-backend/config/production.properties
@@ -73,3 +73,8 @@ ils.bms.url.timeout=7200
 
 #整板数量配置
 ils.sale.brands=10
+
+#operation主数据地址
+hyc.operation.url=http://192.168.199.164:8080
+#operation主数据地址请求超时
+hyc.operation.url.timeout=7200
diff --git a/ils-sales-backend/config/uat.properties b/ils-sales-backend/config/uat.properties
index 154aa5a..0234841 100644
--- a/ils-sales-backend/config/uat.properties
+++ b/ils-sales-backend/config/uat.properties
@@ -67,3 +67,8 @@ ils.bms.url.timeout=7200
 
 #整板数量配置
 ils.sale.brands=10
+
+#operation主数据地址
+hyc.operation.url=http://192.168.199.164:8080
+#operation主数据地址请求超时
+hyc.operation.url.timeout=7200
diff --git a/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml b/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml
index e684f87..89c4b17 100644
--- a/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml
+++ b/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml
@@ -70,6 +70,10 @@
     <group>
         <property name="ils.sale.brands" description="销售端整板商品车数量" />
     </group>
+    <group>
+        <property name="hyc.operation.url" description="运营系统URl" />
+        <property name="hyc.operation.url.timeout=" description="调用超时时间" />
+    </group>
     <script>
         <generate template="config.vm" destfile="constant.properties"  charset="UTF-8" />
     </script>
diff --git a/ils-sales-backend/src/main/resources/META-INF/autoconf/config.vm b/ils-sales-backend/src/main/resources/META-INF/autoconf/config.vm
index 000c2cd..ee885e0 100644
--- a/ils-sales-backend/src/main/resources/META-INF/autoconf/config.vm
+++ b/ils-sales-backend/src/main/resources/META-INF/autoconf/config.vm
@@ -67,3 +67,8 @@ ils.bms.url.timeout=${ils.bms.url.timeout}
 
 #整板数量配置
 ils.sale.brands=${ils.sale.brands}
+
+#operation地址
+hyc.operation.url=${hyc.operation.url}
+#operation主数据地址请求超时
+hyc.operation.url.timeout=${hyc.operation.url.timeout}
-- 
Gitee


From 9855f7926c8231209fa2b985413bba993513b22e Mon Sep 17 00:00:00 2001
From: zhaoguixin <306743062@qq.com>
Date: Fri, 15 Sep 2017 11:42:28 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/autoconf/auto-config.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml b/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml
index 89c4b17..f2028a1 100644
--- a/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml
+++ b/ils-sales-backend/src/main/resources/META-INF/autoconf/auto-config.xml
@@ -72,7 +72,7 @@
     </group>
     <group>
         <property name="hyc.operation.url" description="运营系统URl" />
-        <property name="hyc.operation.url.timeout=" description="调用超时时间" />
+        <property name="hyc.operation.url.timeout" description="调用超时时间" />
     </group>
     <script>
         <generate template="config.vm" destfile="constant.properties"  charset="UTF-8" />
-- 
Gitee


From f7399a66e618f0934d54302e3bb28f3ff64afc22 Mon Sep 17 00:00:00 2001
From: zhaoguixin <306743062@qq.com>
Date: Fri, 15 Sep 2017 12:05:37 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unlcn/ils/sales/web/controller/AreaController.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/controller/AreaController.java b/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/controller/AreaController.java
index e9fa16a..ca6a989 100644
--- a/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/controller/AreaController.java
+++ b/ils-sales-web/src/main/java/com/unlcn/ils/sales/web/controller/AreaController.java
@@ -69,7 +69,8 @@ public class AreaController {
     ResultDTO<Object> destArea(@ApiParam(value = "起运地ID", required = true) @PathVariable(value = "departAreaId") Integer departAreaId, @ApiParam(value = "目的地省ID", required = true) @PathVariable(value = "provinceId") Integer provinceId) {
         ResultDTO<Object> result = new ResultDTO<Object>(true, null, "查询目的地区域成功");
         try {
-            result.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition(departAreaId, provinceId)));
+            //esult.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition(departAreaId, provinceId)));
+            result.setData(converAreaBOToAreaDTO(addrService.listAreaByCondition("")));
         } catch (Exception e) {
             LOGGER.error("AreaRest destArea error: {}", e);
             throw new BusinessException(e.getMessage());
-- 
Gitee


From e3baacb66bbce9e57ef9163e078e1093d897d538 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Fri, 15 Sep 2017 13:47:19 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=B7=B2=E4=BB=98=E6=AC=BE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unlcn/ils/sales/api/query/OrderQuery.java | 14 ++++++-
 .../ils/sales/backend/bo/OrderQueryBO.java    | 13 +++++-
 .../ils/sales/backend/bo/OrderViewBO.java     | 11 +++++
 .../backend/service/OrderServiceImpl.java     |  1 +
 .../ils/sales/base/model/OrderViewDAO.java    | 41 +++++++++++++++++--
 .../resources/mappers/SaleOrderViewMapper.xml |  4 +-
 6 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
index 094d290..3352b8d 100644
--- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
+++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
@@ -34,6 +34,9 @@ public class OrderQuery {
     // 审核状态
     @ApiModelProperty(value = "审核状态")
     private String auditStatus;
+    // 支付状态
+    @ApiModelProperty(value = "支付状态")
+    private Integer payStatus;
 
     public String getCode() {
         return code;
@@ -99,6 +102,14 @@ public class OrderQuery {
         this.auditStatus = auditStatus;
     }
 
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
     @Override
     public String toString() {
         return "OrderQuery{" +
@@ -109,7 +120,8 @@ public class OrderQuery {
                 ", destRegionCode='" + destRegionCode + '\'' +
                 ", pickDateBegin=" + pickDateBegin +
                 ", pickDateEnd=" + pickDateEnd +
-                ", auditStatus=" + auditStatus +
+                ", auditStatus='" + auditStatus + '\'' +
+                ", payStatus='" + payStatus + '\'' +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
index 8924d65..0d0b46e 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
@@ -24,6 +24,8 @@ public class OrderQueryBO {
     private Date pickDateEnd;
     // 审核状态
     private String auditStatus;
+    // 支付状态
+    private Integer payStatus;
 
     public String getCode() {
         return code;
@@ -89,6 +91,14 @@ public class OrderQueryBO {
         this.auditStatus = auditStatus;
     }
 
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
     @Override
     public String toString() {
         return "OrderQueryBO{" +
@@ -99,7 +109,8 @@ public class OrderQueryBO {
                 ", destRegionCode='" + destRegionCode + '\'' +
                 ", pickDateBegin=" + pickDateBegin +
                 ", pickDateEnd=" + pickDateEnd +
-                ", auditStatus=" + auditStatus +
+                ", auditStatus='" + auditStatus + '\'' +
+                ", payStatus=" + payStatus +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java
index 31c8039..128f0b2 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderViewBO.java
@@ -30,6 +30,8 @@ public class OrderViewBO {
     private String comment;
     private String auditComment;
     private String attachAuditStatusText;
+    // 支付状态
+    private Integer payStatus;
 
     // 销售订单地址表
     private String departRegionCode;
@@ -288,6 +290,14 @@ public class OrderViewBO {
         this.attachs = attachs;
     }
 
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
     @Override
     public String toString() {
         return "OrderViewBO{" +
@@ -309,6 +319,7 @@ public class OrderViewBO {
                 ", comment='" + comment + '\'' +
                 ", auditComment='" + auditComment + '\'' +
                 ", attachAuditStatusText='" + attachAuditStatusText + '\'' +
+                ", payStatus=" + payStatus +
                 ", departRegionCode='" + departRegionCode + '\'' +
                 ", departRegionName='" + departRegionName + '\'' +
                 ", departContact='" + departContact + '\'' +
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index dc79729..1bbb359 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -219,6 +219,7 @@ public class OrderServiceImpl implements OrderService {
         queryMap.put("auditStatus", queryBO.getAuditStatus());
         queryMap.put("pickDateBegin", queryBO.getPickDateBegin());
         queryMap.put("pickDateEnd", queryBO.getPickDateEnd());
+        queryMap.put("payStatus", queryBO.getPayStatus());
         return buildListSaleOrder(queryMap, pageVo);
     }
 
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
index d95dfd3..1e41439 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/model/OrderViewDAO.java
@@ -64,6 +64,8 @@ public class OrderViewDAO {
     private String destAddr;
     // 提车时间
     private String pickTime;
+    // 支付状态
+    private Integer payStatus;
 
     public Integer getId() {
         return id;
@@ -385,6 +387,38 @@ public class OrderViewDAO {
         this.pickTime = pickTime;
     }
 
+    public Boolean getTicket() {
+        return isTicket;
+    }
+
+    public void setTicket(Boolean ticket) {
+        isTicket = ticket;
+    }
+
+    public Boolean getPick() {
+        return isPick;
+    }
+
+    public void setPick(Boolean pick) {
+        isPick = pick;
+    }
+
+    public Boolean getDeliv() {
+        return isDeliv;
+    }
+
+    public void setDeliv(Boolean deliv) {
+        isDeliv = deliv;
+    }
+
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
     @Override
     public String toString() {
         return "OrderViewDAO{" +
@@ -425,9 +459,10 @@ public class OrderViewDAO {
                 ", transportType=" + transportType +
                 ", isPick=" + isPick +
                 ", isDeliv=" + isDeliv +
-                ", departAddr=" + departAddr +
-                ", destAddr=" + destAddr +
-                ", pickTime=" + pickTime +
+                ", departAddr='" + departAddr + '\'' +
+                ", destAddr='" + destAddr + '\'' +
+                ", pickTime='" + pickTime + '\'' +
+                ", payStatus=" + payStatus +
                 '}';
     }
 }
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index 4f59eb0..c1ca3ba 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -38,6 +38,7 @@
         <result column="depart_addr" property="departAddr" jdbcType="VARCHAR"/>
         <result column="dest_addr" property="destAddr" jdbcType="VARCHAR"/>
         <result column="pick_time" property="pickTime" jdbcType="VARCHAR"/>
+        <result column="payStatus" property="payStatus" jdbcType="INTEGER"/>
         <collection property="orderSkus" column="id" ofType="com.unlcn.ils.sales.base.model.OrderSkuViewDAO"
                     javaType="ArrayList" select="listSaleOrderSku"/>
         <collection property="attachs" column="id" ofType="com.unlcn.ils.sales.base.model.OrderAttachViewDAO"
@@ -84,7 +85,8 @@
         so.is_deliv AS isDeliv,
         soa.depart_addr AS departAddr,
         soa.dest_addr AS destAddr,
-        so.pick_time AS pickTime
+        so.pick_time AS pickTime,
+        so.pay_status AS payStatus
         FROM
         sale_order so
         LEFT JOIN sale_order_addr soa ON so.id = soa.sale_order_id
-- 
Gitee


From faa22742afc713379305cfb5f8af2868a6ed49b1 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Fri, 15 Sep 2017 14:51:12 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
index 246f16a..36298da 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
@@ -9,6 +9,7 @@ import com.unlcn.ils.sales.backend.bo.OrderToKyleBO;
 import com.unlcn.ils.sales.backend.bo.PriceBO;
 import com.unlcn.ils.sales.backend.constant.AutoConfConstant;
 import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum;
+import com.unlcn.ils.sales.backend.util.DateUtils;
 import com.unlcn.ils.sales.base.mapper.SaleOrderAuditMapper;
 import com.unlcn.ils.sales.base.mapper.SaleOrderViewMapper;
 import com.unlcn.ils.sales.base.model.OrderViewDAO;
@@ -154,7 +155,7 @@ public class OrderAuditServiceImpl implements OrderAuditService {
                bo.setDestRegionName(val.getDestRegionName());
                bo.setDestContact(val.getDestContact());
                bo.setDestPhone(val.getDestPhone());
-               bo.setPickDate(val.getPickDate().toString());
+               bo.setPickDate(DateUtils.getStringFromDate(val.getPickDate(), "yyyy-MM-dd"));
                bo.setBrands(val.getBrands());
                bo.setSeriesAmt(val.getSeriesAmt());
                bo.setDistance(val.getDistance().toString());
-- 
Gitee


From ff8b9e00d19e2a20878fea71533a0d9c89657824 Mon Sep 17 00:00:00 2001
From: Quzf <felix.quzf@gmail.com>
Date: Fri, 15 Sep 2017 16:50:00 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E5=95=86=E5=93=81=E8=BD=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/SaleOrderViewMapper.xml | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index c1ca3ba..deb6ee5 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -40,7 +40,7 @@
         <result column="pick_time" property="pickTime" jdbcType="VARCHAR"/>
         <result column="payStatus" property="payStatus" jdbcType="INTEGER"/>
         <collection property="orderSkus" column="id" ofType="com.unlcn.ils.sales.base.model.OrderSkuViewDAO"
-                    javaType="ArrayList" select="listSaleOrderSku"/>
+                    javaType="ArrayList" select="saleOrderSkus"/>
         <collection property="attachs" column="id" ofType="com.unlcn.ils.sales.base.model.OrderAttachViewDAO"
                     javaType="ArrayList" select="listOrderAttach"/>
     </resultMap>
@@ -202,8 +202,7 @@
     </resultMap>
 
     <select id="listSaleOrderSku" resultMap="SaleOrderSkuMap">
-    SELECT *,count(*) as amt FROM(
-    SELECT
+    SELECT  DISTINCT
             sos.brand_id AS brandId,
             sos.brand_code AS brandCode,
             sos.brand_name AS brandName,
@@ -212,15 +211,35 @@
             sos.series_name AS seriesName,
             sos.model_id AS modelId,
             sos.model_code AS modelCode,
-            sos.model_name AS modelName
+            sos.model_name AS modelName,
+            sos.amt AS amt
         FROM
             sale_order_sku sos
         WHERE
             sos.delete_mark = 1
-        AND sos.sale_order_id = #{id}) t
-    GROUP BY t.brandId,t.brandCode,t.brandName,t.modelCode,t.modelId,t.modelName,t.seriesCode,t.seriesId,t.seriesName
+        AND sos.sale_order_id = #{id}
   </select>
 
+    <select id="saleOrderSkus" resultMap="SaleOrderSkuMap">
+        SELECT
+        sos.brand_id AS brandId,
+        sos.brand_code AS brandCode,
+        sos.brand_name AS brandName,
+        sos.series_id AS seriesId,
+        sos.series_code AS seriesCode,
+        sos.series_name AS seriesName,
+        sos.model_id AS modelId,
+        sos.model_code AS modelCode,
+        sos.model_name AS modelName,
+        sos.amt AS amt,
+        sos.vin AS vin
+        FROM
+        sale_order_sku sos
+        WHERE
+        sos.delete_mark = 1
+        AND sos.sale_order_id = #{id}
+    </select>
+
   <select id="listOrderAttach" resultMap="SaleOrderAttachMap">
     SELECT
         soa.id AS id,
-- 
Gitee


From 5a0e94d84cf253faa46340e3f9026c17f73ff642 Mon Sep 17 00:00:00 2001
From: zhaoguixin <306743062@qq.com>
Date: Fri, 15 Sep 2017 17:11:38 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=835?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E8=8E=B7=E5=8F=96=E4=B8=80=E6=AC=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/spring/applicationContext-schedule.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml b/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml
index d2560c6..aa2bef4 100644
--- a/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml
+++ b/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml
@@ -72,9 +72,9 @@
         <property name="name" value="saleOrderClusterTrigger"/>
         <property name="group" value="saleOrderClusterCluster"/>
         <property name="jobDetail" ref="saleOrderClusterJobDetail"/>
-        <property name="cronExpression" value="0 0 0/1 * * ?"/>
+        <!--<property name="cronExpression" value="0 0 0/1 * * ?"/>-->
         <!--<property name="cronExpression" value="0 */2 0-23 * * ?"/>-->
-        <!--<property name="cronExpression" value="0 */5 * * * ?"/>-->
+        <property name="cronExpression" value="0 */5 * * * ?"/>
     </bean>
     <bean id="saleOrderClusterJobDetail" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
         <property name="name" value="waybillDeliveryJob"></property>
-- 
Gitee


From f3eabf730a8fbab47f432e660d0d5d36d26b3308 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Fri, 15 Sep 2017 17:38:28 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unlcn/ils/sales/backend/service/OrderServiceImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index 1bbb359..0189c5f 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -257,7 +257,8 @@ public class OrderServiceImpl implements OrderService {
                     String orderCode = code_status[0];
                     String status = code_status[1];
                     String payStatus = status.split("_")[1];
-                    updateOrderStatusAndPayStatusByOrderCode(orderCode, Integer.valueOf(status), Integer.valueOf(payStatus));
+                    String orderStatus = status.split("_")[0];
+                    updateOrderStatusAndPayStatusByOrderCode(orderCode, Integer.valueOf(orderStatus), Integer.valueOf(payStatus));
                 }
             }
         }
-- 
Gitee


From 54f2491c90c170b58ebbca1a100f3f4a10b7ab65 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Fri, 15 Sep 2017 18:11:55 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/service/OrderAuditService.java    |  8 +++++++
 .../service/OrderAuditServiceImpl.java        | 21 +++++++++++++++++++
 .../backend/service/OrderServiceImpl.java     |  3 +++
 3 files changed, 32 insertions(+)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java
index efd4fa0..fcc0052 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditService.java
@@ -33,4 +33,12 @@ public interface OrderAuditService {
      * @throws Exception
      */
     Integer updateAuditStatus(String ids) throws Exception;
+
+    /**
+     * 更新销售订单审核状态
+     *
+     * @param saleOrderId 销售订单ID
+     * @param auditStatus 审核状态
+     */
+    void updateAuditStatusByOrderId(Integer saleOrderId, Integer auditStatus);
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
index 36298da..2af3094 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
@@ -134,6 +134,27 @@ public class OrderAuditServiceImpl implements OrderAuditService {
         return null;
     }
 
+    @Override
+    public void updateAuditStatusByOrderId(Integer saleOrderId, Integer auditStatus) {
+        if (Objects.equals(saleOrderId, null) || Objects.equals(saleOrderId, "") || Objects.equals(saleOrderId, 0)) {
+            LOGGER.info("OrderAuditServiceImpl.updateAuditStatusByOrderId param saleOrderId must not be null");
+            throw new IllegalArgumentException("销售订单ID不能为空");
+        } else if (Objects.equals(auditStatus, null) || Objects.equals(auditStatus, "") || Objects.equals(auditStatus, 0)) {
+            LOGGER.info("OrderAuditServiceImpl.updateAuditStatusByOrderId param auditStatus must not be null");
+            throw new IllegalArgumentException("销售订单审核状态不能为空");
+        }
+        SaleOrderAuditExample example = new SaleOrderAuditExample();
+        example.createCriteria().andSaleOrderIdEqualTo(saleOrderId);
+        List<SaleOrderAudit> audits = orderAuditMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(audits)) {
+            audits.stream().forEach(item -> {
+                item.setAuditStatus(auditStatus);
+                orderAuditMapper.updateByPrimaryKeySelective(item);
+            });
+        }
+
+    }
+
     /**
      * 构建推送销售订单对象
      *
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index 0189c5f..406bd8d 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
 import com.unlcn.ils.sales.backend.bo.*;
 import com.unlcn.ils.sales.backend.constant.AutoConfConstant;
 import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum;
+import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum;
 import com.unlcn.ils.sales.backend.enums.OrderPayStatusEnum;
 import com.unlcn.ils.sales.backend.enums.OrderStatusEnum;
 import com.unlcn.ils.sales.backend.util.UniquenessUtil;
@@ -282,6 +283,8 @@ public class OrderServiceImpl implements OrderService {
                 item.setAttachAuditStatus(AttachAuditStatusEnum.getByValue(attachAuditStatus).getValue());
                 item.setPayStatus(OrderPayStatusEnum.ORDER_TOUCH.getValue());
                 orderMapper.updateByPrimaryKeySelective(item);
+                // 更新审核表中状态
+                orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue());
             });
         }
         return 0;
-- 
Gitee


From ed145c122a2c894f3157a116d66f644606101d71 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Fri, 15 Sep 2017 18:32:44 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E5=B7=B2=E6=94=B6=E6=AC=BE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unlcn/ils/sales/api/query/OrderQuery.java  | 14 +++++++++++++-
 .../unlcn/ils/sales/backend/bo/OrderQueryBO.java   | 11 +++++++++++
 .../sales/backend/service/OrderServiceImpl.java    |  6 ++++--
 .../main/resources/mappers/SaleOrderViewMapper.xml |  6 ++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
index 3352b8d..2fa840f 100644
--- a/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
+++ b/ils-sales-api/src/main/java/com/unlcn/ils/sales/api/query/OrderQuery.java
@@ -37,6 +37,9 @@ public class OrderQuery {
     // 支付状态
     @ApiModelProperty(value = "支付状态")
     private Integer payStatus;
+    // 附件审核状态
+    @ApiModelProperty(value = "附件审核状态")
+    private Integer attachAuditStatus;
 
     public String getCode() {
         return code;
@@ -110,6 +113,14 @@ public class OrderQuery {
         this.payStatus = payStatus;
     }
 
+    public Integer getAttachAuditStatus() {
+        return attachAuditStatus;
+    }
+
+    public void setAttachAuditStatus(Integer attachAuditStatus) {
+        this.attachAuditStatus = attachAuditStatus;
+    }
+
     @Override
     public String toString() {
         return "OrderQuery{" +
@@ -121,7 +132,8 @@ public class OrderQuery {
                 ", pickDateBegin=" + pickDateBegin +
                 ", pickDateEnd=" + pickDateEnd +
                 ", auditStatus='" + auditStatus + '\'' +
-                ", payStatus='" + payStatus + '\'' +
+                ", payStatus=" + payStatus +
+                ", attachAuditStatus=" + attachAuditStatus +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
index 0d0b46e..73d7d1a 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/bo/OrderQueryBO.java
@@ -26,6 +26,8 @@ public class OrderQueryBO {
     private String auditStatus;
     // 支付状态
     private Integer payStatus;
+    // 附件审核状态
+    private Integer attachAuditStatus;
 
     public String getCode() {
         return code;
@@ -99,6 +101,14 @@ public class OrderQueryBO {
         this.payStatus = payStatus;
     }
 
+    public Integer getAttachAuditStatus() {
+        return attachAuditStatus;
+    }
+
+    public void setAttachAuditStatus(Integer attachAuditStatus) {
+        this.attachAuditStatus = attachAuditStatus;
+    }
+
     @Override
     public String toString() {
         return "OrderQueryBO{" +
@@ -111,6 +121,7 @@ public class OrderQueryBO {
                 ", pickDateEnd=" + pickDateEnd +
                 ", auditStatus='" + auditStatus + '\'' +
                 ", payStatus=" + payStatus +
+                ", attachAuditStatus=" + attachAuditStatus +
                 '}';
     }
 }
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index 406bd8d..9710d82 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -10,7 +10,6 @@ import com.google.common.collect.Lists;
 import com.unlcn.ils.sales.backend.bo.*;
 import com.unlcn.ils.sales.backend.constant.AutoConfConstant;
 import com.unlcn.ils.sales.backend.enums.AttachAuditStatusEnum;
-import com.unlcn.ils.sales.backend.enums.OrderAuditStatusEnum;
 import com.unlcn.ils.sales.backend.enums.OrderPayStatusEnum;
 import com.unlcn.ils.sales.backend.enums.OrderStatusEnum;
 import com.unlcn.ils.sales.backend.util.UniquenessUtil;
@@ -221,6 +220,7 @@ public class OrderServiceImpl implements OrderService {
         queryMap.put("pickDateBegin", queryBO.getPickDateBegin());
         queryMap.put("pickDateEnd", queryBO.getPickDateEnd());
         queryMap.put("payStatus", queryBO.getPayStatus());
+        queryMap.put("attachAuditStatus", queryBO.getAttachAuditStatus());
         return buildListSaleOrder(queryMap, pageVo);
     }
 
@@ -237,6 +237,8 @@ public class OrderServiceImpl implements OrderService {
         queryMap.put("auditStatus", queryBO.getAuditStatus());
         queryMap.put("pickDateBegin", queryBO.getPickDateBegin());
         queryMap.put("pickDateEnd", queryBO.getPickDateEnd());
+        queryMap.put("payStatus", queryBO.getPayStatus());
+        queryMap.put("attachAuditStatus", queryBO.getAttachAuditStatus());
         return buildListSaleOrder(queryMap, pageVo);
     }
 
@@ -284,7 +286,7 @@ public class OrderServiceImpl implements OrderService {
                 item.setPayStatus(OrderPayStatusEnum.ORDER_TOUCH.getValue());
                 orderMapper.updateByPrimaryKeySelective(item);
                 // 更新审核表中状态
-                orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue());
+                //orderAuditService.updateAuditStatusByOrderId(item.getId(), OrderAuditStatusEnum.ORDER_AWAIT.getValue());
             });
         }
         return 0;
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index deb6ee5..368ad86 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -109,6 +109,9 @@
             <if test="orderStatus != null ">
                 AND so.order_status = #{orderStatus, jdbcType=INTEGER}
             </if>
+            <if test="attachAuditStatus != null">
+                AND so.attach_audit_status = #{attachAuditStatus, jdbcType=INTEGER}
+            </if>
             <if test="departRegionCode != null and departRegionCode != '' and departRegionCode !='null'">
                 AND soa.depart_region_code = #{departRegionCode, jdbcType=VARCHAR}
             </if>
@@ -160,6 +163,9 @@
             <if test="orderStatus != null">
                 AND so.order_status = #{orderStatus, jdbcType=INTEGER}
             </if>
+            <if test="attachAuditStatus != null">
+                AND so.attach_audit_status = #{attachAuditStatus, jdbcType=INTEGER}
+            </if>
             <if test="departRegionCode != null and departRegionCode != '' and departRegionCode !='null'">
                 AND soa.depart_region_code = #{departRegionCode, jdbcType=VARCHAR}
             </if>
-- 
Gitee


From 23b9f8638e0cc27fbaefaab7de8d68e10ddb4353 Mon Sep 17 00:00:00 2001
From: Quzf <felix.quzf@gmail.com>
Date: Fri, 15 Sep 2017 19:05:37 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E5=95=86=E5=93=81=E8=BD=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/service/OrderServiceImpl.java      |  8 ++++----
 .../backend/service/OrderSkuServiceImpl.java   | 18 +++++++++++-------
 .../sales/base/mapper/SaleOrderViewMapper.java |  4 ++++
 .../resources/mappers/SaleOrderViewMapper.xml  |  6 ++++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
index 1bbb359..d5f777e 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderServiceImpl.java
@@ -356,11 +356,11 @@ public class OrderServiceImpl implements OrderService {
             OrderViewBO bo = new OrderViewBO();
             BeanUtils.copyProperties(dao, bo);
             // SKU
-            List<OrderSkuViewDAO> skuViewDTOS = dao.getOrderSkus();
+//            List<OrderSkuViewDAO> skuViewDTOS = dao.getOrderSkus();
             List<OrderSkuBO> skuBOS = Lists.newArrayList();
-
-            if (CollectionUtils.isNotEmpty(skuViewDTOS)) {
-                skuViewDTOS.stream().forEach(va -> {
+            List<OrderSkuViewDAO> daos = orderViewMapper.listSaleOrderSku(dao.getId());
+            if (CollectionUtils.isNotEmpty(daos)) {
+                daos.stream().forEach(va -> {
                     OrderSkuBO skuBO = new OrderSkuBO();
                     BeanUtils.copyProperties(va, skuBO);
                     skuBOS.add(skuBO);
diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
index 0a0cb32..29d474f 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
@@ -61,6 +61,7 @@ public class OrderSkuServiceImpl implements OrderSkuService {
                     SaleOrderSku sku = new SaleOrderSku();
                     BeanUtils.copyProperties(val, sku);
                     sku.setVin(str);
+                    sku.setAmt(1);
                     try {
                         orderSkuMapper.insertSelective(sku);
                     } catch (Exception e) {
@@ -69,13 +70,16 @@ public class OrderSkuServiceImpl implements OrderSkuService {
                     }
                 });
             } else {
-                SaleOrderSku sku = new SaleOrderSku();
-                BeanUtils.copyProperties(val, sku);
-                try {
-                    orderSkuMapper.insertSelective(sku);
-                } catch (Exception e) {
-                    LOGGER.error("OrderSkuServiceImpl.save error: {}", e);
-                    throw new BusinessException("保存销售订单商品车信息异常");
+                for (int i=0;i<val.getAmt();i++) {
+                    SaleOrderSku sku = new SaleOrderSku();
+                    BeanUtils.copyProperties(val, sku);
+                    sku.setAmt(1);
+                    try {
+                        orderSkuMapper.insertSelective(sku);
+                    } catch (Exception e) {
+                        LOGGER.error("OrderSkuServiceImpl.save error: {}", e);
+                        throw new BusinessException("保存销售订单商品车信息异常");
+                    }
                 }
             }
         });
diff --git a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderViewMapper.java b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderViewMapper.java
index 78d2319..05cbe1b 100644
--- a/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderViewMapper.java
+++ b/ils-sales-base/src/main/java/com/unlcn/ils/sales/base/mapper/SaleOrderViewMapper.java
@@ -1,6 +1,8 @@
 package com.unlcn.ils.sales.base.mapper;
 
+import com.unlcn.ils.sales.base.model.OrderSkuViewDAO;
 import com.unlcn.ils.sales.base.model.OrderViewDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -47,4 +49,6 @@ public interface SaleOrderViewMapper {
      * @param map
      */
     void updateOrderStatus(Map<String, Object> map);
+
+    List<OrderSkuViewDAO> listSaleOrderSku(@Param("id")Integer id);
 }
diff --git a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
index deb6ee5..dfc56b9 100644
--- a/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
+++ b/ils-sales-base/src/main/resources/mappers/SaleOrderViewMapper.xml
@@ -202,7 +202,7 @@
     </resultMap>
 
     <select id="listSaleOrderSku" resultMap="SaleOrderSkuMap">
-    SELECT  DISTINCT
+    SELECT
             sos.brand_id AS brandId,
             sos.brand_code AS brandCode,
             sos.brand_name AS brandName,
@@ -212,12 +212,14 @@
             sos.model_id AS modelId,
             sos.model_code AS modelCode,
             sos.model_name AS modelName,
-            sos.amt AS amt
+            sum(sos.amt) AS amt
         FROM
             sale_order_sku sos
         WHERE
             sos.delete_mark = 1
         AND sos.sale_order_id = #{id}
+    GROUP BY sos.brand_id,sos.brand_code,sos.brand_name,sos.series_id,sos.series_code,
+    sos.series_name,sos.model_id,sos.model_code,sos.model_name
   </select>
 
     <select id="saleOrderSkus" resultMap="SaleOrderSkuMap">
-- 
Gitee


From b349ed94fee0c2d8e7a22e99e07468a736df347a Mon Sep 17 00:00:00 2001
From: Quzf <felix.quzf@gmail.com>
Date: Fri, 15 Sep 2017 19:10:33 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E5=95=86=E5=93=81=E8=BD=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/spring/applicationContext-schedule.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml b/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml
index d2560c6..aa2bef4 100644
--- a/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml
+++ b/ils-sales-web/src/main/resources/spring/applicationContext-schedule.xml
@@ -72,9 +72,9 @@
         <property name="name" value="saleOrderClusterTrigger"/>
         <property name="group" value="saleOrderClusterCluster"/>
         <property name="jobDetail" ref="saleOrderClusterJobDetail"/>
-        <property name="cronExpression" value="0 0 0/1 * * ?"/>
+        <!--<property name="cronExpression" value="0 0 0/1 * * ?"/>-->
         <!--<property name="cronExpression" value="0 */2 0-23 * * ?"/>-->
-        <!--<property name="cronExpression" value="0 */5 * * * ?"/>-->
+        <property name="cronExpression" value="0 */5 * * * ?"/>
     </bean>
     <bean id="saleOrderClusterJobDetail" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
         <property name="name" value="waybillDeliveryJob"></property>
-- 
Gitee


From 06cdb999b99723bec81f256a7d187d9250a1c075 Mon Sep 17 00:00:00 2001
From: zhaoguixin <306743062@qq.com>
Date: Fri, 15 Sep 2017 19:34:41 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-backend/config/dev.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ils-sales-backend/config/dev.properties b/ils-sales-backend/config/dev.properties
index 4d7acac..bcc4d86 100644
--- a/ils-sales-backend/config/dev.properties
+++ b/ils-sales-backend/config/dev.properties
@@ -67,7 +67,7 @@ ils.kyle.url=http://119.57.140.26/kylebuss
 ils.kyle.url.timeout=7200
 
 #BMS端地址
-ils.bms.url=http://119.57.140.26/hyc-bms-api
+ils.bms.url=http://119.57.140.26/hyc-bms-web
 #kyle商户端地址请求超时
 ils.bms.url.timeout=7200
 
-- 
Gitee


From c450e5a1413bdfcab4e336c2142e5f55f9df827f Mon Sep 17 00:00:00 2001
From: Quzf <felix.quzf@gmail.com>
Date: Fri, 15 Sep 2017 19:51:54 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E5=95=86=E5=93=81=E8=BD=A6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
index 29d474f..b42f269 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderSkuServiceImpl.java
@@ -74,6 +74,7 @@ public class OrderSkuServiceImpl implements OrderSkuService {
                     SaleOrderSku sku = new SaleOrderSku();
                     BeanUtils.copyProperties(val, sku);
                     sku.setAmt(1);
+                    sku.setVin("");
                     try {
                         orderSkuMapper.insertSelective(sku);
                     } catch (Exception e) {
-- 
Gitee


From 217c63101e86b55eb156a17b15571866b8958852 Mon Sep 17 00:00:00 2001
From: zhaoguixin <306743062@qq.com>
Date: Mon, 18 Sep 2017 13:39:04 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E7=AB=AF=E7=94=9F=E4=BA=A7=E5=BA=93=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-backend/config/production.properties | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ils-sales-backend/config/production.properties b/ils-sales-backend/config/production.properties
index b99fade..8eec858 100644
--- a/ils-sales-backend/config/production.properties
+++ b/ils-sales-backend/config/production.properties
@@ -1,11 +1,11 @@
 #rdb
 jdbc.driver=net.sf.log4jdbc.DriverSpy
-master.jdbc.url=jdbc:log4jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8
-master.jdbc.user=sales
-master.jdbc.password=Unlcn@12
-slave.jdbc.url=jdbc:mysql://119.57.140.26:8095/sales?useUnicode=true&characterEncoding=utf8
-slave.jdbc.user=sales
-slave.jdbc.password=Unlcn@12
+master.jdbc.url=jdbc:log4jdbc:mysql://10.46.178.149:8095/hycsales?useUnicode=true&characterEncoding=utf8
+master.jdbc.user=huiyunche
+master.jdbc.password=Gf6nag7db*61UwFMuGv|auEE4&2tz|
+slave.jdbc.url=jdbc:mysql://10.25.178.199:8095/hycsales?useUnicode=true&characterEncoding=utf8
+slave.jdbc.user=huiyunche
+slave.jdbc.password=Gf6nag7db*61UwFMuGv|auEE4&2tz|
 
 #securekey
 secure.key=kyleKEY
@@ -17,8 +17,8 @@ secure.bank.key=kyleKEY
 #spring.redis.password=unlcn
 #spring.redis.hostname=10.20.30.131
 #spring.redis.port=6379
-spring.redis.sentinel.master=mymaster1
-spring.redis.sentinel.nodes=119.57.140.26:26380
+spring.redis.sentinel.master=mymaster
+spring.redis.sentinel.nodes=10.46.178.149:26379,10.25.178.199:26379
 
 
 #qiniu
@@ -75,6 +75,6 @@ ils.bms.url.timeout=7200
 ils.sale.brands=10
 
 #operation主数据地址
-hyc.operation.url=http://192.168.199.164:8080
+hyc.operation.url=http://119.57.140.26/hyc-operation-api
 #operation主数据地址请求超时
 hyc.operation.url.timeout=7200
-- 
Gitee