Эх сурвалжийг харах

Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

hy 7 жил өмнө
parent
commit
cfaa301d97
15 өөрчлөгдсөн 187 нэмэгдсэн , 4126 устгасан
  1. 1 1
      applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml
  2. 22 21
      applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDetailDTO.java
  3. 1 3
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutMapper.java
  4. 5 2
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaleListMapper.java
  5. 2 11
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaleMapper.java
  6. 1 2
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaledetailMapper.java
  7. 4 0
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java
  8. 0 1941
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleExample.java
  9. 0 1651
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaledetailExample.java
  10. 24 17
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java
  11. 17 71
      applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml
  12. 30 206
      applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml
  13. 74 200
      applications/sale/sale-server/src/main/resources/mapper/SaledetailMapper.xml
  14. 4 0
      applications/storage/storage-dto/pom.xml
  15. 2 0
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetail.java

+ 1 - 1
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -63,7 +63,7 @@
                  ${con}
             </if>
             <if test="companyId != null">
-              and   companyId = #{companyId}
+              and   purchase.companyId = #{companyId}
             </if>
         </where>  order by pu_id,pd_detno
     </select>

+ 22 - 21
applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDetailDTO.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.base.dto.CommonBaseDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author: guq
@@ -12,45 +13,45 @@ import java.io.Serializable;
  **/
 @Data
 public class SaleDetailDTO extends CommonBaseDTO implements Serializable {
-    private  Long pd_puid;
+    private Long sd_said;
 
-    private String pd_code;
+    private Integer sd_detno;
 
-    private Integer pd_detno;
+    private String sd_code;
 
-    private Integer pd_prodid;
+    private Long sd_prodid;
 
-    private String pd_prodcode;
+    private String sd_prodcode;
 
-    private String pd_unit;
+    private Double sd_qty;
 
-    private Double pd_qty;
+    private Double sd_price;
 
-    private Double pd_price;
+    private Double sd_total;
 
-    private Double pd_total;
+    private Double sd_taxrate;
 
-    private Double pd_taxtotal;
+    private Double sd_netprice;
 
-    private Double pd_acceptqty;
+    private Double sd_nettotal;
 
-    private Double pd_delivery;
+    private Date sd_delivery;
 
-    private String pd_salecode;
+    private Double sd_sendqty;
 
-    private Integer pd_saledetno;
+    private Double sd_pdqty;
 
-    private Integer pd_sdid;
+    private Double sd_yqty;
 
-    private String pd_text1;
+    private String sd_remark;
 
-    private String pd_text2;
+    private String sd_text1;
 
-    private String pd_text3;
+    private String sd_text2;
 
-    private String pd_text4;
+    private String sd_text3;
 
-    private String pd_text5;
+    private String sd_text4;
 
-    private Double pd_yqty;
+    private String sd_text5;
 }

+ 1 - 3
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutMapper.java

@@ -1,10 +1,8 @@
 package com.usoftchina.saas.sale.mapper;
 
-import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.storage.entities.ProdInOut;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+
 
 public interface ProdInOutMapper {
 

+ 5 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaleListMapper.java

@@ -2,10 +2,13 @@ package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.sale.po.SaleList;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface SaleListMapper {
-    List<SaleList> selectSaleBycondition(ListReqDTO list);
-    List<SaleList> selectPurchaseListByCondition(ListReqDTO list);
+
+    List<SaleList> selectPurchaseBycondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    List<SaleList> selectPurchaseListByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 }

+ 2 - 11
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaleMapper.java

@@ -2,14 +2,10 @@ package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.sale.po.Sale;
-import com.usoftchina.saas.sale.po.SaleExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface SaleMapper {
-    int countByExample(SaleExample example);
-
-    int deleteByExample(SaleExample example);
 
     int deleteByPrimaryKey(Long sa_id);
 
@@ -17,13 +13,8 @@ public interface SaleMapper {
 
     int insertSelective(Sale record);
 
-    List<Sale> selectByExample(SaleExample example);
-
     Sale selectByPrimaryKey(Long sa_id);
 
-    int updateByExampleSelective(@Param("record") Sale record, @Param("example") SaleExample example);
-
-    int updateByExample(@Param("record") Sale record, @Param("example") SaleExample example);
 
     int updateByPrimaryKeySelective(Sale record);
 
@@ -31,8 +22,6 @@ public interface SaleMapper {
 
     Integer validateCodeWhenInsert(String code);
 
-    Integer validateCodeWhenUpdate(String code, Long id);
-
     String selectCodeById(Long id);
 
     String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
@@ -40,4 +29,6 @@ public interface SaleMapper {
     String validateUnAudit(Long id);
 
     String validateAudit(List<DocBaseDTO> baseDTOs);
+
+    Integer validateCodeWhenUpdate(@Param("code") String code,@Param("id") Long id);
 }

+ 1 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SaledetailMapper.java

@@ -1,9 +1,8 @@
 package com.usoftchina.saas.sale.mapper;
 
 import com.usoftchina.saas.sale.po.SaleDetail;
-import com.usoftchina.saas.sale.po.SaledetailExample;
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
+
 
 public interface SaledetailMapper {
 

+ 4 - 0
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java

@@ -19,10 +19,14 @@ public class Sale extends CommonBaseEntity{
 
     private String sa_custname;
 
+    private String sa_toplace;
+
     private Double sa_total;
 
     private String sa_totalupper;
 
+    private String sa_remark;
+
     private String sa_status;
 
     private String sa_statuscode;

+ 0 - 1941
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleExample.java

@@ -1,1941 +0,0 @@
-package com.usoftchina.saas.sale.po;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class SaleExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public SaleExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    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 andSa_idIsNull() {
-            addCriterion("sa_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idIsNotNull() {
-            addCriterion("sa_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idEqualTo(Integer value) {
-            addCriterion("sa_id =", value, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idNotEqualTo(Integer value) {
-            addCriterion("sa_id <>", value, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idGreaterThan(Integer value) {
-            addCriterion("sa_id >", value, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sa_id >=", value, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idLessThan(Integer value) {
-            addCriterion("sa_id <", value, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idLessThanOrEqualTo(Integer value) {
-            addCriterion("sa_id <=", value, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idIn(List<Integer> values) {
-            addCriterion("sa_id in", values, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idNotIn(List<Integer> values) {
-            addCriterion("sa_id not in", values, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idBetween(Integer value1, Integer value2) {
-            addCriterion("sa_id between", value1, value2, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_idNotBetween(Integer value1, Integer value2) {
-            addCriterion("sa_id not between", value1, value2, "sa_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeIsNull() {
-            addCriterion("sa_code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeIsNotNull() {
-            addCriterion("sa_code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeEqualTo(String value) {
-            addCriterion("sa_code =", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeNotEqualTo(String value) {
-            addCriterion("sa_code <>", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeGreaterThan(String value) {
-            addCriterion("sa_code >", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_code >=", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeLessThan(String value) {
-            addCriterion("sa_code <", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeLessThanOrEqualTo(String value) {
-            addCriterion("sa_code <=", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeLike(String value) {
-            addCriterion("sa_code like", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeNotLike(String value) {
-            addCriterion("sa_code not like", value, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeIn(List<String> values) {
-            addCriterion("sa_code in", values, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeNotIn(List<String> values) {
-            addCriterion("sa_code not in", values, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeBetween(String value1, String value2) {
-            addCriterion("sa_code between", value1, value2, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_codeNotBetween(String value1, String value2) {
-            addCriterion("sa_code not between", value1, value2, "sa_code");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidIsNull() {
-            addCriterion("sa_custid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidIsNotNull() {
-            addCriterion("sa_custid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidEqualTo(Integer value) {
-            addCriterion("sa_custid =", value, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidNotEqualTo(Integer value) {
-            addCriterion("sa_custid <>", value, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidGreaterThan(Integer value) {
-            addCriterion("sa_custid >", value, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sa_custid >=", value, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidLessThan(Integer value) {
-            addCriterion("sa_custid <", value, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidLessThanOrEqualTo(Integer value) {
-            addCriterion("sa_custid <=", value, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidIn(List<Integer> values) {
-            addCriterion("sa_custid in", values, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidNotIn(List<Integer> values) {
-            addCriterion("sa_custid not in", values, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidBetween(Integer value1, Integer value2) {
-            addCriterion("sa_custid between", value1, value2, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custidNotBetween(Integer value1, Integer value2) {
-            addCriterion("sa_custid not between", value1, value2, "sa_custid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeIsNull() {
-            addCriterion("sa_custcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeIsNotNull() {
-            addCriterion("sa_custcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeEqualTo(String value) {
-            addCriterion("sa_custcode =", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeNotEqualTo(String value) {
-            addCriterion("sa_custcode <>", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeGreaterThan(String value) {
-            addCriterion("sa_custcode >", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_custcode >=", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeLessThan(String value) {
-            addCriterion("sa_custcode <", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeLessThanOrEqualTo(String value) {
-            addCriterion("sa_custcode <=", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeLike(String value) {
-            addCriterion("sa_custcode like", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeNotLike(String value) {
-            addCriterion("sa_custcode not like", value, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeIn(List<String> values) {
-            addCriterion("sa_custcode in", values, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeNotIn(List<String> values) {
-            addCriterion("sa_custcode not in", values, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeBetween(String value1, String value2) {
-            addCriterion("sa_custcode between", value1, value2, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custcodeNotBetween(String value1, String value2) {
-            addCriterion("sa_custcode not between", value1, value2, "sa_custcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameIsNull() {
-            addCriterion("sa_custname is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameIsNotNull() {
-            addCriterion("sa_custname is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameEqualTo(String value) {
-            addCriterion("sa_custname =", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameNotEqualTo(String value) {
-            addCriterion("sa_custname <>", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameGreaterThan(String value) {
-            addCriterion("sa_custname >", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_custname >=", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameLessThan(String value) {
-            addCriterion("sa_custname <", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameLessThanOrEqualTo(String value) {
-            addCriterion("sa_custname <=", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameLike(String value) {
-            addCriterion("sa_custname like", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameNotLike(String value) {
-            addCriterion("sa_custname not like", value, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameIn(List<String> values) {
-            addCriterion("sa_custname in", values, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameNotIn(List<String> values) {
-            addCriterion("sa_custname not in", values, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameBetween(String value1, String value2) {
-            addCriterion("sa_custname between", value1, value2, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_custnameNotBetween(String value1, String value2) {
-            addCriterion("sa_custname not between", value1, value2, "sa_custname");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceIsNull() {
-            addCriterion("sa_toplace is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceIsNotNull() {
-            addCriterion("sa_toplace is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceEqualTo(String value) {
-            addCriterion("sa_toplace =", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceNotEqualTo(String value) {
-            addCriterion("sa_toplace <>", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceGreaterThan(String value) {
-            addCriterion("sa_toplace >", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_toplace >=", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceLessThan(String value) {
-            addCriterion("sa_toplace <", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceLessThanOrEqualTo(String value) {
-            addCriterion("sa_toplace <=", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceLike(String value) {
-            addCriterion("sa_toplace like", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceNotLike(String value) {
-            addCriterion("sa_toplace not like", value, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceIn(List<String> values) {
-            addCriterion("sa_toplace in", values, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceNotIn(List<String> values) {
-            addCriterion("sa_toplace not in", values, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceBetween(String value1, String value2) {
-            addCriterion("sa_toplace between", value1, value2, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_toplaceNotBetween(String value1, String value2) {
-            addCriterion("sa_toplace not between", value1, value2, "sa_toplace");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalIsNull() {
-            addCriterion("sa_total is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalIsNotNull() {
-            addCriterion("sa_total is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalEqualTo(Double value) {
-            addCriterion("sa_total =", value, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalNotEqualTo(Double value) {
-            addCriterion("sa_total <>", value, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalGreaterThan(Double value) {
-            addCriterion("sa_total >", value, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalGreaterThanOrEqualTo(Double value) {
-            addCriterion("sa_total >=", value, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalLessThan(Double value) {
-            addCriterion("sa_total <", value, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalLessThanOrEqualTo(Double value) {
-            addCriterion("sa_total <=", value, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalIn(List<Double> values) {
-            addCriterion("sa_total in", values, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalNotIn(List<Double> values) {
-            addCriterion("sa_total not in", values, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalBetween(Double value1, Double value2) {
-            addCriterion("sa_total between", value1, value2, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalNotBetween(Double value1, Double value2) {
-            addCriterion("sa_total not between", value1, value2, "sa_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperIsNull() {
-            addCriterion("sa_totalupper is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperIsNotNull() {
-            addCriterion("sa_totalupper is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperEqualTo(String value) {
-            addCriterion("sa_totalupper =", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperNotEqualTo(String value) {
-            addCriterion("sa_totalupper <>", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperGreaterThan(String value) {
-            addCriterion("sa_totalupper >", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_totalupper >=", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperLessThan(String value) {
-            addCriterion("sa_totalupper <", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperLessThanOrEqualTo(String value) {
-            addCriterion("sa_totalupper <=", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperLike(String value) {
-            addCriterion("sa_totalupper like", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperNotLike(String value) {
-            addCriterion("sa_totalupper not like", value, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperIn(List<String> values) {
-            addCriterion("sa_totalupper in", values, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperNotIn(List<String> values) {
-            addCriterion("sa_totalupper not in", values, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperBetween(String value1, String value2) {
-            addCriterion("sa_totalupper between", value1, value2, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_totalupperNotBetween(String value1, String value2) {
-            addCriterion("sa_totalupper not between", value1, value2, "sa_totalupper");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkIsNull() {
-            addCriterion("sa_remark is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkIsNotNull() {
-            addCriterion("sa_remark is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkEqualTo(String value) {
-            addCriterion("sa_remark =", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkNotEqualTo(String value) {
-            addCriterion("sa_remark <>", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkGreaterThan(String value) {
-            addCriterion("sa_remark >", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_remark >=", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkLessThan(String value) {
-            addCriterion("sa_remark <", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkLessThanOrEqualTo(String value) {
-            addCriterion("sa_remark <=", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkLike(String value) {
-            addCriterion("sa_remark like", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkNotLike(String value) {
-            addCriterion("sa_remark not like", value, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkIn(List<String> values) {
-            addCriterion("sa_remark in", values, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkNotIn(List<String> values) {
-            addCriterion("sa_remark not in", values, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkBetween(String value1, String value2) {
-            addCriterion("sa_remark between", value1, value2, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_remarkNotBetween(String value1, String value2) {
-            addCriterion("sa_remark not between", value1, value2, "sa_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusIsNull() {
-            addCriterion("sa_status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusIsNotNull() {
-            addCriterion("sa_status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusEqualTo(String value) {
-            addCriterion("sa_status =", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusNotEqualTo(String value) {
-            addCriterion("sa_status <>", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusGreaterThan(String value) {
-            addCriterion("sa_status >", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_status >=", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusLessThan(String value) {
-            addCriterion("sa_status <", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusLessThanOrEqualTo(String value) {
-            addCriterion("sa_status <=", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusLike(String value) {
-            addCriterion("sa_status like", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusNotLike(String value) {
-            addCriterion("sa_status not like", value, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusIn(List<String> values) {
-            addCriterion("sa_status in", values, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusNotIn(List<String> values) {
-            addCriterion("sa_status not in", values, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusBetween(String value1, String value2) {
-            addCriterion("sa_status between", value1, value2, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statusNotBetween(String value1, String value2) {
-            addCriterion("sa_status not between", value1, value2, "sa_status");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeIsNull() {
-            addCriterion("sa_statuscode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeIsNotNull() {
-            addCriterion("sa_statuscode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeEqualTo(String value) {
-            addCriterion("sa_statuscode =", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeNotEqualTo(String value) {
-            addCriterion("sa_statuscode <>", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeGreaterThan(String value) {
-            addCriterion("sa_statuscode >", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_statuscode >=", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeLessThan(String value) {
-            addCriterion("sa_statuscode <", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeLessThanOrEqualTo(String value) {
-            addCriterion("sa_statuscode <=", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeLike(String value) {
-            addCriterion("sa_statuscode like", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeNotLike(String value) {
-            addCriterion("sa_statuscode not like", value, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeIn(List<String> values) {
-            addCriterion("sa_statuscode in", values, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeNotIn(List<String> values) {
-            addCriterion("sa_statuscode not in", values, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeBetween(String value1, String value2) {
-            addCriterion("sa_statuscode between", value1, value2, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_statuscodeNotBetween(String value1, String value2) {
-            addCriterion("sa_statuscode not between", value1, value2, "sa_statuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeIsNull() {
-            addCriterion("sa_sendstatuscode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeIsNotNull() {
-            addCriterion("sa_sendstatuscode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeEqualTo(String value) {
-            addCriterion("sa_sendstatuscode =", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeNotEqualTo(String value) {
-            addCriterion("sa_sendstatuscode <>", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeGreaterThan(String value) {
-            addCriterion("sa_sendstatuscode >", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_sendstatuscode >=", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeLessThan(String value) {
-            addCriterion("sa_sendstatuscode <", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeLessThanOrEqualTo(String value) {
-            addCriterion("sa_sendstatuscode <=", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeLike(String value) {
-            addCriterion("sa_sendstatuscode like", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeNotLike(String value) {
-            addCriterion("sa_sendstatuscode not like", value, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeIn(List<String> values) {
-            addCriterion("sa_sendstatuscode in", values, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeNotIn(List<String> values) {
-            addCriterion("sa_sendstatuscode not in", values, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeBetween(String value1, String value2) {
-            addCriterion("sa_sendstatuscode between", value1, value2, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatuscodeNotBetween(String value1, String value2) {
-            addCriterion("sa_sendstatuscode not between", value1, value2, "sa_sendstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusIsNull() {
-            addCriterion("sa_sendstatus is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusIsNotNull() {
-            addCriterion("sa_sendstatus is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusEqualTo(String value) {
-            addCriterion("sa_sendstatus =", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusNotEqualTo(String value) {
-            addCriterion("sa_sendstatus <>", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusGreaterThan(String value) {
-            addCriterion("sa_sendstatus >", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_sendstatus >=", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusLessThan(String value) {
-            addCriterion("sa_sendstatus <", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusLessThanOrEqualTo(String value) {
-            addCriterion("sa_sendstatus <=", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusLike(String value) {
-            addCriterion("sa_sendstatus like", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusNotLike(String value) {
-            addCriterion("sa_sendstatus not like", value, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusIn(List<String> values) {
-            addCriterion("sa_sendstatus in", values, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusNotIn(List<String> values) {
-            addCriterion("sa_sendstatus not in", values, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusBetween(String value1, String value2) {
-            addCriterion("sa_sendstatus between", value1, value2, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_sendstatusNotBetween(String value1, String value2) {
-            addCriterion("sa_sendstatus not between", value1, value2, "sa_sendstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusIsNull() {
-            addCriterion("sa_printstatus is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusIsNotNull() {
-            addCriterion("sa_printstatus is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusEqualTo(String value) {
-            addCriterion("sa_printstatus =", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusNotEqualTo(String value) {
-            addCriterion("sa_printstatus <>", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusGreaterThan(String value) {
-            addCriterion("sa_printstatus >", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_printstatus >=", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusLessThan(String value) {
-            addCriterion("sa_printstatus <", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusLessThanOrEqualTo(String value) {
-            addCriterion("sa_printstatus <=", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusLike(String value) {
-            addCriterion("sa_printstatus like", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusNotLike(String value) {
-            addCriterion("sa_printstatus not like", value, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusIn(List<String> values) {
-            addCriterion("sa_printstatus in", values, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusNotIn(List<String> values) {
-            addCriterion("sa_printstatus not in", values, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusBetween(String value1, String value2) {
-            addCriterion("sa_printstatus between", value1, value2, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatusNotBetween(String value1, String value2) {
-            addCriterion("sa_printstatus not between", value1, value2, "sa_printstatus");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeIsNull() {
-            addCriterion("sa_printstatuscode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeIsNotNull() {
-            addCriterion("sa_printstatuscode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeEqualTo(String value) {
-            addCriterion("sa_printstatuscode =", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeNotEqualTo(String value) {
-            addCriterion("sa_printstatuscode <>", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeGreaterThan(String value) {
-            addCriterion("sa_printstatuscode >", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_printstatuscode >=", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeLessThan(String value) {
-            addCriterion("sa_printstatuscode <", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeLessThanOrEqualTo(String value) {
-            addCriterion("sa_printstatuscode <=", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeLike(String value) {
-            addCriterion("sa_printstatuscode like", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeNotLike(String value) {
-            addCriterion("sa_printstatuscode not like", value, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeIn(List<String> values) {
-            addCriterion("sa_printstatuscode in", values, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeNotIn(List<String> values) {
-            addCriterion("sa_printstatuscode not in", values, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeBetween(String value1, String value2) {
-            addCriterion("sa_printstatuscode between", value1, value2, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_printstatuscodeNotBetween(String value1, String value2) {
-            addCriterion("sa_printstatuscode not between", value1, value2, "sa_printstatuscode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidIsNull() {
-            addCriterion("sa_recorderid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidIsNotNull() {
-            addCriterion("sa_recorderid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidEqualTo(Integer value) {
-            addCriterion("sa_recorderid =", value, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidNotEqualTo(Integer value) {
-            addCriterion("sa_recorderid <>", value, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidGreaterThan(Integer value) {
-            addCriterion("sa_recorderid >", value, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sa_recorderid >=", value, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidLessThan(Integer value) {
-            addCriterion("sa_recorderid <", value, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidLessThanOrEqualTo(Integer value) {
-            addCriterion("sa_recorderid <=", value, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidIn(List<Integer> values) {
-            addCriterion("sa_recorderid in", values, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidNotIn(List<Integer> values) {
-            addCriterion("sa_recorderid not in", values, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidBetween(Integer value1, Integer value2) {
-            addCriterion("sa_recorderid between", value1, value2, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderidNotBetween(Integer value1, Integer value2) {
-            addCriterion("sa_recorderid not between", value1, value2, "sa_recorderid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderIsNull() {
-            addCriterion("sa_recorder is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderIsNotNull() {
-            addCriterion("sa_recorder is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderEqualTo(String value) {
-            addCriterion("sa_recorder =", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderNotEqualTo(String value) {
-            addCriterion("sa_recorder <>", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderGreaterThan(String value) {
-            addCriterion("sa_recorder >", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderGreaterThanOrEqualTo(String value) {
-            addCriterion("sa_recorder >=", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderLessThan(String value) {
-            addCriterion("sa_recorder <", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderLessThanOrEqualTo(String value) {
-            addCriterion("sa_recorder <=", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderLike(String value) {
-            addCriterion("sa_recorder like", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderNotLike(String value) {
-            addCriterion("sa_recorder not like", value, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderIn(List<String> values) {
-            addCriterion("sa_recorder in", values, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderNotIn(List<String> values) {
-            addCriterion("sa_recorder not in", values, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderBetween(String value1, String value2) {
-            addCriterion("sa_recorder between", value1, value2, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorderNotBetween(String value1, String value2) {
-            addCriterion("sa_recorder not between", value1, value2, "sa_recorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateIsNull() {
-            addCriterion("sa_recorddate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateIsNotNull() {
-            addCriterion("sa_recorddate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateEqualTo(Date value) {
-            addCriterion("sa_recorddate =", value, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateNotEqualTo(Date value) {
-            addCriterion("sa_recorddate <>", value, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateGreaterThan(Date value) {
-            addCriterion("sa_recorddate >", value, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateGreaterThanOrEqualTo(Date value) {
-            addCriterion("sa_recorddate >=", value, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateLessThan(Date value) {
-            addCriterion("sa_recorddate <", value, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateLessThanOrEqualTo(Date value) {
-            addCriterion("sa_recorddate <=", value, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateIn(List<Date> values) {
-            addCriterion("sa_recorddate in", values, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateNotIn(List<Date> values) {
-            addCriterion("sa_recorddate not in", values, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateBetween(Date value1, Date value2) {
-            addCriterion("sa_recorddate between", value1, value2, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_recorddateNotBetween(Date value1, Date value2) {
-            addCriterion("sa_recorddate not between", value1, value2, "sa_recorddate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNull() {
-            addCriterion("companyid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNotNull() {
-            addCriterion("companyid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidEqualTo(Integer value) {
-            addCriterion("companyid =", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotEqualTo(Integer value) {
-            addCriterion("companyid <>", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThan(Integer value) {
-            addCriterion("companyid >", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("companyid >=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThan(Integer value) {
-            addCriterion("companyid <", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThanOrEqualTo(Integer value) {
-            addCriterion("companyid <=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIn(List<Integer> values) {
-            addCriterion("companyid in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotIn(List<Integer> values) {
-            addCriterion("companyid not in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidBetween(Integer value1, Integer value2) {
-            addCriterion("companyid between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotBetween(Integer value1, Integer value2) {
-            addCriterion("companyid not between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdIsNull() {
-            addCriterion("updaterId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdIsNotNull() {
-            addCriterion("updaterId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdEqualTo(Integer value) {
-            addCriterion("updaterId =", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdNotEqualTo(Integer value) {
-            addCriterion("updaterId <>", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdGreaterThan(Integer value) {
-            addCriterion("updaterId >", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("updaterId >=", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdLessThan(Integer value) {
-            addCriterion("updaterId <", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdLessThanOrEqualTo(Integer value) {
-            addCriterion("updaterId <=", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdIn(List<Integer> values) {
-            addCriterion("updaterId in", values, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdNotIn(List<Integer> values) {
-            addCriterion("updaterId not in", values, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdBetween(Integer value1, Integer value2) {
-            addCriterion("updaterId between", value1, value2, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("updaterId not between", value1, value2, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNull() {
-            addCriterion("updatetime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNotNull() {
-            addCriterion("updatetime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeEqualTo(Date value) {
-            addCriterion("updatetime =", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotEqualTo(Date value) {
-            addCriterion("updatetime <>", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThan(Date value) {
-            addCriterion("updatetime >", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("updatetime >=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThan(Date value) {
-            addCriterion("updatetime <", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
-            addCriterion("updatetime <=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIn(List<Date> values) {
-            addCriterion("updatetime in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotIn(List<Date> values) {
-            addCriterion("updatetime not in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
-            addCriterion("updatetime between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
-            addCriterion("updatetime not between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1IsNull() {
-            addCriterion("sa_text1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1IsNotNull() {
-            addCriterion("sa_text1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1EqualTo(String value) {
-            addCriterion("sa_text1 =", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1NotEqualTo(String value) {
-            addCriterion("sa_text1 <>", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1GreaterThan(String value) {
-            addCriterion("sa_text1 >", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1GreaterThanOrEqualTo(String value) {
-            addCriterion("sa_text1 >=", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1LessThan(String value) {
-            addCriterion("sa_text1 <", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1LessThanOrEqualTo(String value) {
-            addCriterion("sa_text1 <=", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1Like(String value) {
-            addCriterion("sa_text1 like", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1NotLike(String value) {
-            addCriterion("sa_text1 not like", value, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1In(List<String> values) {
-            addCriterion("sa_text1 in", values, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1NotIn(List<String> values) {
-            addCriterion("sa_text1 not in", values, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1Between(String value1, String value2) {
-            addCriterion("sa_text1 between", value1, value2, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text1NotBetween(String value1, String value2) {
-            addCriterion("sa_text1 not between", value1, value2, "sa_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2IsNull() {
-            addCriterion("sa_text2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2IsNotNull() {
-            addCriterion("sa_text2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2EqualTo(String value) {
-            addCriterion("sa_text2 =", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2NotEqualTo(String value) {
-            addCriterion("sa_text2 <>", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2GreaterThan(String value) {
-            addCriterion("sa_text2 >", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2GreaterThanOrEqualTo(String value) {
-            addCriterion("sa_text2 >=", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2LessThan(String value) {
-            addCriterion("sa_text2 <", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2LessThanOrEqualTo(String value) {
-            addCriterion("sa_text2 <=", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2Like(String value) {
-            addCriterion("sa_text2 like", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2NotLike(String value) {
-            addCriterion("sa_text2 not like", value, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2In(List<String> values) {
-            addCriterion("sa_text2 in", values, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2NotIn(List<String> values) {
-            addCriterion("sa_text2 not in", values, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2Between(String value1, String value2) {
-            addCriterion("sa_text2 between", value1, value2, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text2NotBetween(String value1, String value2) {
-            addCriterion("sa_text2 not between", value1, value2, "sa_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3IsNull() {
-            addCriterion("sa_text3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3IsNotNull() {
-            addCriterion("sa_text3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3EqualTo(String value) {
-            addCriterion("sa_text3 =", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3NotEqualTo(String value) {
-            addCriterion("sa_text3 <>", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3GreaterThan(String value) {
-            addCriterion("sa_text3 >", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3GreaterThanOrEqualTo(String value) {
-            addCriterion("sa_text3 >=", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3LessThan(String value) {
-            addCriterion("sa_text3 <", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3LessThanOrEqualTo(String value) {
-            addCriterion("sa_text3 <=", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3Like(String value) {
-            addCriterion("sa_text3 like", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3NotLike(String value) {
-            addCriterion("sa_text3 not like", value, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3In(List<String> values) {
-            addCriterion("sa_text3 in", values, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3NotIn(List<String> values) {
-            addCriterion("sa_text3 not in", values, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3Between(String value1, String value2) {
-            addCriterion("sa_text3 between", value1, value2, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text3NotBetween(String value1, String value2) {
-            addCriterion("sa_text3 not between", value1, value2, "sa_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4IsNull() {
-            addCriterion("sa_text4 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4IsNotNull() {
-            addCriterion("sa_text4 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4EqualTo(String value) {
-            addCriterion("sa_text4 =", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4NotEqualTo(String value) {
-            addCriterion("sa_text4 <>", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4GreaterThan(String value) {
-            addCriterion("sa_text4 >", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4GreaterThanOrEqualTo(String value) {
-            addCriterion("sa_text4 >=", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4LessThan(String value) {
-            addCriterion("sa_text4 <", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4LessThanOrEqualTo(String value) {
-            addCriterion("sa_text4 <=", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4Like(String value) {
-            addCriterion("sa_text4 like", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4NotLike(String value) {
-            addCriterion("sa_text4 not like", value, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4In(List<String> values) {
-            addCriterion("sa_text4 in", values, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4NotIn(List<String> values) {
-            addCriterion("sa_text4 not in", values, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4Between(String value1, String value2) {
-            addCriterion("sa_text4 between", value1, value2, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text4NotBetween(String value1, String value2) {
-            addCriterion("sa_text4 not between", value1, value2, "sa_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5IsNull() {
-            addCriterion("sa_text5 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5IsNotNull() {
-            addCriterion("sa_text5 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5EqualTo(String value) {
-            addCriterion("sa_text5 =", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5NotEqualTo(String value) {
-            addCriterion("sa_text5 <>", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5GreaterThan(String value) {
-            addCriterion("sa_text5 >", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5GreaterThanOrEqualTo(String value) {
-            addCriterion("sa_text5 >=", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5LessThan(String value) {
-            addCriterion("sa_text5 <", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5LessThanOrEqualTo(String value) {
-            addCriterion("sa_text5 <=", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5Like(String value) {
-            addCriterion("sa_text5 like", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5NotLike(String value) {
-            addCriterion("sa_text5 not like", value, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5In(List<String> values) {
-            addCriterion("sa_text5 in", values, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5NotIn(List<String> values) {
-            addCriterion("sa_text5 not in", values, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5Between(String value1, String value2) {
-            addCriterion("sa_text5 between", value1, value2, "sa_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSa_text5NotBetween(String value1, String value2) {
-            addCriterion("sa_text5 not between", value1, value2, "sa_text5");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    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);
-        }
-    }
-}

+ 0 - 1651
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaledetailExample.java

@@ -1,1651 +0,0 @@
-package com.usoftchina.saas.sale.po;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class SaledetailExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public SaledetailExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    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 andSd_idIsNull() {
-            addCriterion("sd_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idIsNotNull() {
-            addCriterion("sd_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idEqualTo(Integer value) {
-            addCriterion("sd_id =", value, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idNotEqualTo(Integer value) {
-            addCriterion("sd_id <>", value, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idGreaterThan(Integer value) {
-            addCriterion("sd_id >", value, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sd_id >=", value, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idLessThan(Integer value) {
-            addCriterion("sd_id <", value, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idLessThanOrEqualTo(Integer value) {
-            addCriterion("sd_id <=", value, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idIn(List<Integer> values) {
-            addCriterion("sd_id in", values, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idNotIn(List<Integer> values) {
-            addCriterion("sd_id not in", values, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idBetween(Integer value1, Integer value2) {
-            addCriterion("sd_id between", value1, value2, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_idNotBetween(Integer value1, Integer value2) {
-            addCriterion("sd_id not between", value1, value2, "sd_id");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidIsNull() {
-            addCriterion("sd_said is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidIsNotNull() {
-            addCriterion("sd_said is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidEqualTo(Integer value) {
-            addCriterion("sd_said =", value, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidNotEqualTo(Integer value) {
-            addCriterion("sd_said <>", value, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidGreaterThan(Integer value) {
-            addCriterion("sd_said >", value, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sd_said >=", value, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidLessThan(Integer value) {
-            addCriterion("sd_said <", value, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidLessThanOrEqualTo(Integer value) {
-            addCriterion("sd_said <=", value, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidIn(List<Integer> values) {
-            addCriterion("sd_said in", values, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidNotIn(List<Integer> values) {
-            addCriterion("sd_said not in", values, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidBetween(Integer value1, Integer value2) {
-            addCriterion("sd_said between", value1, value2, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_saidNotBetween(Integer value1, Integer value2) {
-            addCriterion("sd_said not between", value1, value2, "sd_said");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoIsNull() {
-            addCriterion("sd_detno is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoIsNotNull() {
-            addCriterion("sd_detno is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoEqualTo(Integer value) {
-            addCriterion("sd_detno =", value, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoNotEqualTo(Integer value) {
-            addCriterion("sd_detno <>", value, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoGreaterThan(Integer value) {
-            addCriterion("sd_detno >", value, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sd_detno >=", value, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoLessThan(Integer value) {
-            addCriterion("sd_detno <", value, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoLessThanOrEqualTo(Integer value) {
-            addCriterion("sd_detno <=", value, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoIn(List<Integer> values) {
-            addCriterion("sd_detno in", values, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoNotIn(List<Integer> values) {
-            addCriterion("sd_detno not in", values, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoBetween(Integer value1, Integer value2) {
-            addCriterion("sd_detno between", value1, value2, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_detnoNotBetween(Integer value1, Integer value2) {
-            addCriterion("sd_detno not between", value1, value2, "sd_detno");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidIsNull() {
-            addCriterion("sd_prodid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidIsNotNull() {
-            addCriterion("sd_prodid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidEqualTo(Integer value) {
-            addCriterion("sd_prodid =", value, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidNotEqualTo(Integer value) {
-            addCriterion("sd_prodid <>", value, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidGreaterThan(Integer value) {
-            addCriterion("sd_prodid >", value, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sd_prodid >=", value, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidLessThan(Integer value) {
-            addCriterion("sd_prodid <", value, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidLessThanOrEqualTo(Integer value) {
-            addCriterion("sd_prodid <=", value, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidIn(List<Integer> values) {
-            addCriterion("sd_prodid in", values, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidNotIn(List<Integer> values) {
-            addCriterion("sd_prodid not in", values, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidBetween(Integer value1, Integer value2) {
-            addCriterion("sd_prodid between", value1, value2, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodidNotBetween(Integer value1, Integer value2) {
-            addCriterion("sd_prodid not between", value1, value2, "sd_prodid");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeIsNull() {
-            addCriterion("sd_prodcode is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeIsNotNull() {
-            addCriterion("sd_prodcode is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeEqualTo(String value) {
-            addCriterion("sd_prodcode =", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeNotEqualTo(String value) {
-            addCriterion("sd_prodcode <>", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeGreaterThan(String value) {
-            addCriterion("sd_prodcode >", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeGreaterThanOrEqualTo(String value) {
-            addCriterion("sd_prodcode >=", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeLessThan(String value) {
-            addCriterion("sd_prodcode <", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeLessThanOrEqualTo(String value) {
-            addCriterion("sd_prodcode <=", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeLike(String value) {
-            addCriterion("sd_prodcode like", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeNotLike(String value) {
-            addCriterion("sd_prodcode not like", value, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeIn(List<String> values) {
-            addCriterion("sd_prodcode in", values, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeNotIn(List<String> values) {
-            addCriterion("sd_prodcode not in", values, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeBetween(String value1, String value2) {
-            addCriterion("sd_prodcode between", value1, value2, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_prodcodeNotBetween(String value1, String value2) {
-            addCriterion("sd_prodcode not between", value1, value2, "sd_prodcode");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyIsNull() {
-            addCriterion("sd_qty is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyIsNotNull() {
-            addCriterion("sd_qty is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyEqualTo(Double value) {
-            addCriterion("sd_qty =", value, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyNotEqualTo(Double value) {
-            addCriterion("sd_qty <>", value, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyGreaterThan(Double value) {
-            addCriterion("sd_qty >", value, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_qty >=", value, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyLessThan(Double value) {
-            addCriterion("sd_qty <", value, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyLessThanOrEqualTo(Double value) {
-            addCriterion("sd_qty <=", value, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyIn(List<Double> values) {
-            addCriterion("sd_qty in", values, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyNotIn(List<Double> values) {
-            addCriterion("sd_qty not in", values, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyBetween(Double value1, Double value2) {
-            addCriterion("sd_qty between", value1, value2, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_qtyNotBetween(Double value1, Double value2) {
-            addCriterion("sd_qty not between", value1, value2, "sd_qty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceIsNull() {
-            addCriterion("sd_price is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceIsNotNull() {
-            addCriterion("sd_price is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceEqualTo(Double value) {
-            addCriterion("sd_price =", value, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceNotEqualTo(Double value) {
-            addCriterion("sd_price <>", value, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceGreaterThan(Double value) {
-            addCriterion("sd_price >", value, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_price >=", value, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceLessThan(Double value) {
-            addCriterion("sd_price <", value, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceLessThanOrEqualTo(Double value) {
-            addCriterion("sd_price <=", value, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceIn(List<Double> values) {
-            addCriterion("sd_price in", values, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceNotIn(List<Double> values) {
-            addCriterion("sd_price not in", values, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceBetween(Double value1, Double value2) {
-            addCriterion("sd_price between", value1, value2, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_priceNotBetween(Double value1, Double value2) {
-            addCriterion("sd_price not between", value1, value2, "sd_price");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalIsNull() {
-            addCriterion("sd_total is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalIsNotNull() {
-            addCriterion("sd_total is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalEqualTo(Double value) {
-            addCriterion("sd_total =", value, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalNotEqualTo(Double value) {
-            addCriterion("sd_total <>", value, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalGreaterThan(Double value) {
-            addCriterion("sd_total >", value, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_total >=", value, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalLessThan(Double value) {
-            addCriterion("sd_total <", value, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalLessThanOrEqualTo(Double value) {
-            addCriterion("sd_total <=", value, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalIn(List<Double> values) {
-            addCriterion("sd_total in", values, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalNotIn(List<Double> values) {
-            addCriterion("sd_total not in", values, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalBetween(Double value1, Double value2) {
-            addCriterion("sd_total between", value1, value2, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_totalNotBetween(Double value1, Double value2) {
-            addCriterion("sd_total not between", value1, value2, "sd_total");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateIsNull() {
-            addCriterion("sd_taxrate is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateIsNotNull() {
-            addCriterion("sd_taxrate is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateEqualTo(Double value) {
-            addCriterion("sd_taxrate =", value, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateNotEqualTo(Double value) {
-            addCriterion("sd_taxrate <>", value, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateGreaterThan(Double value) {
-            addCriterion("sd_taxrate >", value, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_taxrate >=", value, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateLessThan(Double value) {
-            addCriterion("sd_taxrate <", value, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateLessThanOrEqualTo(Double value) {
-            addCriterion("sd_taxrate <=", value, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateIn(List<Double> values) {
-            addCriterion("sd_taxrate in", values, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateNotIn(List<Double> values) {
-            addCriterion("sd_taxrate not in", values, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateBetween(Double value1, Double value2) {
-            addCriterion("sd_taxrate between", value1, value2, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_taxrateNotBetween(Double value1, Double value2) {
-            addCriterion("sd_taxrate not between", value1, value2, "sd_taxrate");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceIsNull() {
-            addCriterion("sd_netprice is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceIsNotNull() {
-            addCriterion("sd_netprice is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceEqualTo(Double value) {
-            addCriterion("sd_netprice =", value, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceNotEqualTo(Double value) {
-            addCriterion("sd_netprice <>", value, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceGreaterThan(Double value) {
-            addCriterion("sd_netprice >", value, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_netprice >=", value, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceLessThan(Double value) {
-            addCriterion("sd_netprice <", value, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceLessThanOrEqualTo(Double value) {
-            addCriterion("sd_netprice <=", value, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceIn(List<Double> values) {
-            addCriterion("sd_netprice in", values, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceNotIn(List<Double> values) {
-            addCriterion("sd_netprice not in", values, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceBetween(Double value1, Double value2) {
-            addCriterion("sd_netprice between", value1, value2, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_netpriceNotBetween(Double value1, Double value2) {
-            addCriterion("sd_netprice not between", value1, value2, "sd_netprice");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalIsNull() {
-            addCriterion("sd_nettotal is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalIsNotNull() {
-            addCriterion("sd_nettotal is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalEqualTo(Double value) {
-            addCriterion("sd_nettotal =", value, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalNotEqualTo(Double value) {
-            addCriterion("sd_nettotal <>", value, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalGreaterThan(Double value) {
-            addCriterion("sd_nettotal >", value, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_nettotal >=", value, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalLessThan(Double value) {
-            addCriterion("sd_nettotal <", value, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalLessThanOrEqualTo(Double value) {
-            addCriterion("sd_nettotal <=", value, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalIn(List<Double> values) {
-            addCriterion("sd_nettotal in", values, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalNotIn(List<Double> values) {
-            addCriterion("sd_nettotal not in", values, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalBetween(Double value1, Double value2) {
-            addCriterion("sd_nettotal between", value1, value2, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_nettotalNotBetween(Double value1, Double value2) {
-            addCriterion("sd_nettotal not between", value1, value2, "sd_nettotal");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryIsNull() {
-            addCriterion("sd_delivery is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryIsNotNull() {
-            addCriterion("sd_delivery is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryEqualTo(Date value) {
-            addCriterion("sd_delivery =", value, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryNotEqualTo(Date value) {
-            addCriterion("sd_delivery <>", value, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryGreaterThan(Date value) {
-            addCriterion("sd_delivery >", value, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryGreaterThanOrEqualTo(Date value) {
-            addCriterion("sd_delivery >=", value, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryLessThan(Date value) {
-            addCriterion("sd_delivery <", value, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryLessThanOrEqualTo(Date value) {
-            addCriterion("sd_delivery <=", value, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryIn(List<Date> values) {
-            addCriterion("sd_delivery in", values, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryNotIn(List<Date> values) {
-            addCriterion("sd_delivery not in", values, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryBetween(Date value1, Date value2) {
-            addCriterion("sd_delivery between", value1, value2, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_deliveryNotBetween(Date value1, Date value2) {
-            addCriterion("sd_delivery not between", value1, value2, "sd_delivery");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyIsNull() {
-            addCriterion("sd_sendqty is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyIsNotNull() {
-            addCriterion("sd_sendqty is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyEqualTo(Double value) {
-            addCriterion("sd_sendqty =", value, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyNotEqualTo(Double value) {
-            addCriterion("sd_sendqty <>", value, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyGreaterThan(Double value) {
-            addCriterion("sd_sendqty >", value, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_sendqty >=", value, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyLessThan(Double value) {
-            addCriterion("sd_sendqty <", value, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyLessThanOrEqualTo(Double value) {
-            addCriterion("sd_sendqty <=", value, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyIn(List<Double> values) {
-            addCriterion("sd_sendqty in", values, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyNotIn(List<Double> values) {
-            addCriterion("sd_sendqty not in", values, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyBetween(Double value1, Double value2) {
-            addCriterion("sd_sendqty between", value1, value2, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_sendqtyNotBetween(Double value1, Double value2) {
-            addCriterion("sd_sendqty not between", value1, value2, "sd_sendqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyIsNull() {
-            addCriterion("sd_pdqty is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyIsNotNull() {
-            addCriterion("sd_pdqty is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyEqualTo(Double value) {
-            addCriterion("sd_pdqty =", value, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyNotEqualTo(Double value) {
-            addCriterion("sd_pdqty <>", value, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyGreaterThan(Double value) {
-            addCriterion("sd_pdqty >", value, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyGreaterThanOrEqualTo(Double value) {
-            addCriterion("sd_pdqty >=", value, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyLessThan(Double value) {
-            addCriterion("sd_pdqty <", value, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyLessThanOrEqualTo(Double value) {
-            addCriterion("sd_pdqty <=", value, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyIn(List<Double> values) {
-            addCriterion("sd_pdqty in", values, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyNotIn(List<Double> values) {
-            addCriterion("sd_pdqty not in", values, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyBetween(Double value1, Double value2) {
-            addCriterion("sd_pdqty between", value1, value2, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_pdqtyNotBetween(Double value1, Double value2) {
-            addCriterion("sd_pdqty not between", value1, value2, "sd_pdqty");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkIsNull() {
-            addCriterion("sd_remark is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkIsNotNull() {
-            addCriterion("sd_remark is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkEqualTo(String value) {
-            addCriterion("sd_remark =", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkNotEqualTo(String value) {
-            addCriterion("sd_remark <>", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkGreaterThan(String value) {
-            addCriterion("sd_remark >", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkGreaterThanOrEqualTo(String value) {
-            addCriterion("sd_remark >=", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkLessThan(String value) {
-            addCriterion("sd_remark <", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkLessThanOrEqualTo(String value) {
-            addCriterion("sd_remark <=", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkLike(String value) {
-            addCriterion("sd_remark like", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkNotLike(String value) {
-            addCriterion("sd_remark not like", value, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkIn(List<String> values) {
-            addCriterion("sd_remark in", values, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkNotIn(List<String> values) {
-            addCriterion("sd_remark not in", values, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkBetween(String value1, String value2) {
-            addCriterion("sd_remark between", value1, value2, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_remarkNotBetween(String value1, String value2) {
-            addCriterion("sd_remark not between", value1, value2, "sd_remark");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNull() {
-            addCriterion("companyid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIsNotNull() {
-            addCriterion("companyid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidEqualTo(Integer value) {
-            addCriterion("companyid =", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotEqualTo(Integer value) {
-            addCriterion("companyid <>", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThan(Integer value) {
-            addCriterion("companyid >", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("companyid >=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThan(Integer value) {
-            addCriterion("companyid <", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidLessThanOrEqualTo(Integer value) {
-            addCriterion("companyid <=", value, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidIn(List<Integer> values) {
-            addCriterion("companyid in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotIn(List<Integer> values) {
-            addCriterion("companyid not in", values, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidBetween(Integer value1, Integer value2) {
-            addCriterion("companyid between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyidNotBetween(Integer value1, Integer value2) {
-            addCriterion("companyid not between", value1, value2, "companyid");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdIsNull() {
-            addCriterion("updaterId is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdIsNotNull() {
-            addCriterion("updaterId is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdEqualTo(Integer value) {
-            addCriterion("updaterId =", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdNotEqualTo(Integer value) {
-            addCriterion("updaterId <>", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdGreaterThan(Integer value) {
-            addCriterion("updaterId >", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("updaterId >=", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdLessThan(Integer value) {
-            addCriterion("updaterId <", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdLessThanOrEqualTo(Integer value) {
-            addCriterion("updaterId <=", value, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdIn(List<Integer> values) {
-            addCriterion("updaterId in", values, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdNotIn(List<Integer> values) {
-            addCriterion("updaterId not in", values, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdBetween(Integer value1, Integer value2) {
-            addCriterion("updaterId between", value1, value2, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdaterIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("updaterId not between", value1, value2, "updaterId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNull() {
-            addCriterion("updatetime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIsNotNull() {
-            addCriterion("updatetime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeEqualTo(Date value) {
-            addCriterion("updatetime =", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotEqualTo(Date value) {
-            addCriterion("updatetime <>", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThan(Date value) {
-            addCriterion("updatetime >", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("updatetime >=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThan(Date value) {
-            addCriterion("updatetime <", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
-            addCriterion("updatetime <=", value, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeIn(List<Date> values) {
-            addCriterion("updatetime in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotIn(List<Date> values) {
-            addCriterion("updatetime not in", values, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
-            addCriterion("updatetime between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
-            addCriterion("updatetime not between", value1, value2, "updatetime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1IsNull() {
-            addCriterion("sd_text1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1IsNotNull() {
-            addCriterion("sd_text1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1EqualTo(String value) {
-            addCriterion("sd_text1 =", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1NotEqualTo(String value) {
-            addCriterion("sd_text1 <>", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1GreaterThan(String value) {
-            addCriterion("sd_text1 >", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1GreaterThanOrEqualTo(String value) {
-            addCriterion("sd_text1 >=", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1LessThan(String value) {
-            addCriterion("sd_text1 <", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1LessThanOrEqualTo(String value) {
-            addCriterion("sd_text1 <=", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1Like(String value) {
-            addCriterion("sd_text1 like", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1NotLike(String value) {
-            addCriterion("sd_text1 not like", value, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1In(List<String> values) {
-            addCriterion("sd_text1 in", values, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1NotIn(List<String> values) {
-            addCriterion("sd_text1 not in", values, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1Between(String value1, String value2) {
-            addCriterion("sd_text1 between", value1, value2, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text1NotBetween(String value1, String value2) {
-            addCriterion("sd_text1 not between", value1, value2, "sd_text1");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2IsNull() {
-            addCriterion("sd_text2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2IsNotNull() {
-            addCriterion("sd_text2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2EqualTo(String value) {
-            addCriterion("sd_text2 =", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2NotEqualTo(String value) {
-            addCriterion("sd_text2 <>", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2GreaterThan(String value) {
-            addCriterion("sd_text2 >", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2GreaterThanOrEqualTo(String value) {
-            addCriterion("sd_text2 >=", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2LessThan(String value) {
-            addCriterion("sd_text2 <", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2LessThanOrEqualTo(String value) {
-            addCriterion("sd_text2 <=", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2Like(String value) {
-            addCriterion("sd_text2 like", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2NotLike(String value) {
-            addCriterion("sd_text2 not like", value, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2In(List<String> values) {
-            addCriterion("sd_text2 in", values, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2NotIn(List<String> values) {
-            addCriterion("sd_text2 not in", values, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2Between(String value1, String value2) {
-            addCriterion("sd_text2 between", value1, value2, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text2NotBetween(String value1, String value2) {
-            addCriterion("sd_text2 not between", value1, value2, "sd_text2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3IsNull() {
-            addCriterion("sd_text3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3IsNotNull() {
-            addCriterion("sd_text3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3EqualTo(String value) {
-            addCriterion("sd_text3 =", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3NotEqualTo(String value) {
-            addCriterion("sd_text3 <>", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3GreaterThan(String value) {
-            addCriterion("sd_text3 >", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3GreaterThanOrEqualTo(String value) {
-            addCriterion("sd_text3 >=", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3LessThan(String value) {
-            addCriterion("sd_text3 <", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3LessThanOrEqualTo(String value) {
-            addCriterion("sd_text3 <=", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3Like(String value) {
-            addCriterion("sd_text3 like", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3NotLike(String value) {
-            addCriterion("sd_text3 not like", value, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3In(List<String> values) {
-            addCriterion("sd_text3 in", values, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3NotIn(List<String> values) {
-            addCriterion("sd_text3 not in", values, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3Between(String value1, String value2) {
-            addCriterion("sd_text3 between", value1, value2, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text3NotBetween(String value1, String value2) {
-            addCriterion("sd_text3 not between", value1, value2, "sd_text3");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4IsNull() {
-            addCriterion("sd_text4 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4IsNotNull() {
-            addCriterion("sd_text4 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4EqualTo(String value) {
-            addCriterion("sd_text4 =", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4NotEqualTo(String value) {
-            addCriterion("sd_text4 <>", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4GreaterThan(String value) {
-            addCriterion("sd_text4 >", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4GreaterThanOrEqualTo(String value) {
-            addCriterion("sd_text4 >=", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4LessThan(String value) {
-            addCriterion("sd_text4 <", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4LessThanOrEqualTo(String value) {
-            addCriterion("sd_text4 <=", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4Like(String value) {
-            addCriterion("sd_text4 like", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4NotLike(String value) {
-            addCriterion("sd_text4 not like", value, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4In(List<String> values) {
-            addCriterion("sd_text4 in", values, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4NotIn(List<String> values) {
-            addCriterion("sd_text4 not in", values, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4Between(String value1, String value2) {
-            addCriterion("sd_text4 between", value1, value2, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text4NotBetween(String value1, String value2) {
-            addCriterion("sd_text4 not between", value1, value2, "sd_text4");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5IsNull() {
-            addCriterion("sd_text5 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5IsNotNull() {
-            addCriterion("sd_text5 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5EqualTo(String value) {
-            addCriterion("sd_text5 =", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5NotEqualTo(String value) {
-            addCriterion("sd_text5 <>", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5GreaterThan(String value) {
-            addCriterion("sd_text5 >", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5GreaterThanOrEqualTo(String value) {
-            addCriterion("sd_text5 >=", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5LessThan(String value) {
-            addCriterion("sd_text5 <", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5LessThanOrEqualTo(String value) {
-            addCriterion("sd_text5 <=", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5Like(String value) {
-            addCriterion("sd_text5 like", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5NotLike(String value) {
-            addCriterion("sd_text5 not like", value, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5In(List<String> values) {
-            addCriterion("sd_text5 in", values, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5NotIn(List<String> values) {
-            addCriterion("sd_text5 not in", values, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5Between(String value1, String value2) {
-            addCriterion("sd_text5 between", value1, value2, "sd_text5");
-            return (Criteria) this;
-        }
-
-        public Criteria andSd_text5NotBetween(String value1, String value2) {
-            addCriterion("sd_text5 not between", value1, value2, "sd_text5");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    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);
-        }
-    }
-}

+ 24 - 17
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -35,6 +35,7 @@ import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Random;
 
 /**
  * @author: guq
@@ -49,10 +50,10 @@ public class SaleServiceImpl implements SaleService{
     private SaleMapper saleMapper;
     @Autowired
     private SaledetailMapper saledetailMapper;
-    @Autowired
+   /* @Autowired
     private MessageLogService messageLogService;
     @Autowired
-    private MaxnumberService maxnumberService;
+    private MaxnumberService maxnumberService;*/
     @Autowired
     private ProdInOutMapper prodInOutMapper;
     @Autowired
@@ -118,7 +119,7 @@ public class SaleServiceImpl implements SaleService{
         sale.setCreateTime(new Date());
 
         //编号校验
-        sa_code = pushMaxnubmer(sa_code, sa_id);
+        //sa_code = pushMaxnubmer(sa_code, sa_id);
         //单号赋值
         sale.setSa_code(sa_code);
         //判断更新与保存动作
@@ -139,7 +140,7 @@ public class SaleServiceImpl implements SaleService{
             }
             baseDTO = getBaseDTOById(sa_id);
             //日志记录
-            messageLogService.save(baseDTO);
+            //messageLogService.save(baseDTO);
             return baseDTO;
         }
         //更新操作
@@ -165,7 +166,7 @@ public class SaleServiceImpl implements SaleService{
         }
         baseDTO = getBaseDTOById(sa_id);
         //日志
-        messageLogService.save(baseDTO);
+        //messageLogService.save(baseDTO);
         return baseDTO;
     }
 
@@ -179,7 +180,7 @@ public class SaleServiceImpl implements SaleService{
         Integer num = saledetailMapper.deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
-        messageLogService.deleteDetail(docBaseDTO);
+        //messageLogService.deleteDetail(docBaseDTO);
         return num;
     }
 
@@ -251,7 +252,7 @@ public class SaleServiceImpl implements SaleService{
 
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
-        messageLogService.audit(docBaseDTO);
+        //messageLogService.audit(docBaseDTO);
     }
 
     private void singleDelete(Long id) {
@@ -262,17 +263,22 @@ public class SaleServiceImpl implements SaleService{
             saleMapper.deleteByPrimaryKey(id);
             DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //日志
-            messageLogService.delete(docBaseDTO);
+            //messageLogService.delete(docBaseDTO);
         }
     }
 
 
     private List<SaleList> getListByMode(ListReqDTO req) {
         List<SaleList> list = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
         if (null == req || StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
-            list = saleListMapper.selectSaleBycondition(req);
+            list = saleListMapper.selectPurchaseBycondition(con, companyId);
         } else {
-            list = saleListMapper.selectPurchaseListByCondition(req);
+            list = saleListMapper.selectPurchaseListByCondition(con, companyId);
         }
         return list;
     }
@@ -284,14 +290,14 @@ public class SaleServiceImpl implements SaleService{
      * @Author: guq
      * @Date: 2018/10/19
      */
-    private String pushMaxnubmer(String code, Long id) {
+   /* private String pushMaxnubmer(String code, Long id) {
         if (null == code) {
             throw new BizException(BizExceptionCode.NULL_CODE);
         }
         Integer count = "0".equals(String.valueOf(id)) ? saleMapper.validateCodeWhenInsert(code) :
                 saleMapper.validateCodeWhenUpdate(code, id);
         return maxnumberService.pushMaxnubmer(count, code, "Purchase").getData();
-    }
+    }*/
 
     /**
      * @Description
@@ -308,7 +314,7 @@ public class SaleServiceImpl implements SaleService{
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(id);
         baseDTO.setCode(code);
-        baseDTO.setName("Purchase");
+        baseDTO.setName("Sale");
         return baseDTO;
     }
 
@@ -337,7 +343,7 @@ public class SaleServiceImpl implements SaleService{
         saleMapper.updateByPrimaryKeySelective(sale);
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
-        messageLogService.close(docBaseDTO);
+        //messageLogService.close(docBaseDTO);
     }
 
     @Override
@@ -372,7 +378,7 @@ public class SaleServiceImpl implements SaleService{
             saleMapper.updateByPrimaryKeySelective(sale);
             DocBaseDTO docBaseDTO = getBaseDTOById(id);
             //日志
-            messageLogService.open(docBaseDTO);
+            //messageLogService.open(docBaseDTO);
         }
     }
 
@@ -411,7 +417,8 @@ public class SaleServiceImpl implements SaleService{
         //插入验收单主表
         ProdInOut prodInOut = new ProdInOut();
         //生成单号
-        Object data = maxnumberService.getMaxnumber("Sale", true).getData();
+        //Object data = maxnumberService.getMaxnumber("Sale", true).getData();
+        Object data = "xxxxx" + (int)(Math.random()*100)+1;
         JSONObject parse = (JSONObject)JSONObject.parse(data.toString());
         String pi_inoutno = String.valueOf(parse.get("code"));
 
@@ -475,7 +482,7 @@ public class SaleServiceImpl implements SaleService{
         saleMapper.updateByPrimaryKeySelective(sale);
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
-        messageLogService.unAudit(docBaseDTO);
+        //messageLogService.unAudit(docBaseDTO);
     }
 
 

+ 17 - 71
applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -50,83 +50,29 @@
         <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
     </resultMap>
 
-    <select id="selectPurchaseListByCondition" parameterType="com.usoftchina.saas.commons.dto.ListReqDTO" resultMap="BaseResultMap">
-        select  *  from sale left join sale on pu_id=pd_puid
+    <select id="selectPurchaseListByCondition" resultMap="BaseResultMap">
+        select  *  from sale left join saledetail on sa_id=sd_said
         <where>
-            <if test="finalCon != null">
-                 ${finalCon}
+            <if test="con != null">
+                ${con}
             </if>
-            order by sa_id,
-        </where>
+            <if test="companyId != null">
+                and   sale.companyId = #{companyId}
+            </if>
+        </where>  order by sd_detno
     </select>
 
-    <select id="selectPurchaseBycondition" parameterType="com.usoftchina.saas.commons.dto.ListReqDTO" resultMap="BaseResultMap">
-        select  *  from purchase
+    <select id="selectPurchaseBycondition" resultMap="BaseResultMap">
+        select  *  from sale
         <where>
-            <if test="finalCon != null">
-                 ${finalCon}
+            <if test="con != null">
+                ${con}
+            </if>
+            <if test="companyId != null">
+                and  companyId = #{companyId}
             </if>
         </where>
-        order by sd_detno
+        order by sa_id
     </select>
-    <insert id="batchInsert" parameterType="java.util.List" >
-        insert into purchasedetail ( PD_PUID, PD_CODE,
-        PD_DETNO, PD_PRODID, PD_PRODCODE,
-        PD_UNIT, PD_QTY, PD_PRICE,
-        PD_TOTAL, PD_TAXTOTAL, PD_ACCEPTQTY,
-        PD_DELIVERY, PD_SALECODE, PD_SALEDETNO,
-        PD_SDID, companyId, updaterId,
-        updateTime, pd_text1, pd_text2,
-        pd_text3, pd_text4, pd_text5,
-        pd_yqty)
-        values
-        <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-            (
-            #{item.pdPuid,jdbcType=INTEGER}, #{item.pdCode,jdbcType=VARCHAR},
-            #{item.pdDetno,jdbcType=INTEGER}, #{item.pdProdid,jdbcType=INTEGER}, #{item.pdProdcode,jdbcType=VARCHAR},
-            #{item.pdUnit,jdbcType=VARCHAR}, #{item.pdQty,jdbcType=DOUBLE}, #{item.pdPrice,jdbcType=DOUBLE},
-            #{item.pdTotal,jdbcType=DOUBLE}, #{item.pdTaxtotal,jdbcType=DOUBLE}, #{item.pdAcceptqty,jdbcType=DOUBLE},
-            #{item.pdDelivery,jdbcType=DOUBLE}, #{item.pdSalecode,jdbcType=VARCHAR}, #{item.pdSaledetno,jdbcType=INTEGER},
-            #{item.pdSdid,jdbcType=INTEGER}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
-            #{item.updateTime,jdbcType=TIMESTAMP}, #{item.pdText1,jdbcType=VARCHAR}, #{item.pdText2,jdbcType=VARCHAR},
-            #{item.pdText3,jdbcType=VARCHAR}, #{item.pdText4,jdbcType=VARCHAR}, #{item.pdText5,jdbcType=VARCHAR},
-            #{item.pdYqty,jdbcType=DOUBLE}
-            )
-        </foreach>
-    </insert>
-    <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.PurchaseDetail" >
-        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
-            update purchasedetail <set>
-            PD_PUID = #{item.pdPuid},
-            PD_CODE = #{item.pdCode},
-            PD_DETNO = #{item.pdDetno},
-            PD_PRODID = #{item.pdProdid},
-            PD_PRODCODE = #{item.pdProdcode},
-            PD_UNIT = #{item.pdUnit},
-            PD_QTY = #{item.pdQty},
-            PD_PRICE = #{item.pdPrice},
-            PD_TOTAL = #{item.pdTotal},
-            PD_TAXTOTAL = #{item.pdTaxtotal},
-            PD_ACCEPTQTY = #{item.pdAcceptqty},
-            PD_DELIVERY = #{item.pdDelivery},
-            PD_SALECODE = #{item.pdSalecode},
-            PD_SALEDETNO = #{item.pdSaledetno},
-            PD_SDID = #{item.pdSdid},
-            companyId = #{item.companyId},
-            updaterId = #{item.updaterId},
-            updateTime = #{item.updateTime},
-            pd_text1 = #{item.pdText1},
-            pd_text2 = #{item.pdText2},
-            pd_text3 = #{item.pdText3},
-            pd_text4 = #{item.pdText4},
-            pd_text5 = #{item.pdText5},
-            pd_yqty = #{item.pdYqty}
-        </set>
-            where PD_ID = #{item.id,jdbcType=INTEGER}
-        </foreach>
-    </update>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-        delete from purchasedetail
-        where PD_ID = #{id}
-    </delete>
+
 </mapper>

+ 30 - 206
applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -20,93 +20,21 @@
     <result column="sa_recorderid" property="sa_recorderid" jdbcType="INTEGER" />
     <result column="sa_recorder" property="sa_recorder" jdbcType="VARCHAR" />
     <result column="sa_recorddate" property="sa_recorddate" jdbcType="TIMESTAMP" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="sa_text1" property="sa_text1" jdbcType="VARCHAR" />
     <result column="sa_text2" property="sa_text2" jdbcType="VARCHAR" />
     <result column="sa_text3" property="sa_text3" jdbcType="VARCHAR" />
     <result column="sa_text4" property="sa_text4" jdbcType="VARCHAR" />
     <result column="sa_text5" property="sa_text5" jdbcType="VARCHAR" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
-    <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" >
-    <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" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
     sa_remark, sa_status, sa_statuscode, sa_sendstatuscode, sa_sendstatus, sa_printstatus, 
     sa_printstatuscode, sa_recorderid, sa_recorder, sa_recorddate, companyid, updaterId, 
     updatetime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.sale.po.SaleExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from sale
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select 
     <include refid="Base_Column_List" />
@@ -117,12 +45,6 @@
     delete from sale
     where sa_id = #{sa_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.sale.po.SaleExample" >
-    delete from sale
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.usoftchina.saas.sale.po.Sale" >
     insert into sale (sa_id, sa_code, sa_custid, 
       sa_custcode, sa_custname, sa_toplace, 
@@ -306,130 +228,6 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.sale.po.SaleExample" resultType="java.lang.Integer" >
-    select count(*) from sale
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    update sale
-    <set >
-      <if test="record.sa_id != null" >
-        sa_id = #{record.sa_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.sa_code != null" >
-        sa_code = #{record.sa_code,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_custid != null" >
-        sa_custid = #{record.sa_custid,jdbcType=INTEGER},
-      </if>
-      <if test="record.sa_custcode != null" >
-        sa_custcode = #{record.sa_custcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_custname != null" >
-        sa_custname = #{record.sa_custname,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_toplace != null" >
-        sa_toplace = #{record.sa_toplace,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_total != null" >
-        sa_total = #{record.sa_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sa_totalupper != null" >
-        sa_totalupper = #{record.sa_totalupper,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_remark != null" >
-        sa_remark = #{record.sa_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_status != null" >
-        sa_status = #{record.sa_status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_statuscode != null" >
-        sa_statuscode = #{record.sa_statuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_sendstatuscode != null" >
-        sa_sendstatuscode = #{record.sa_sendstatuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_sendstatus != null" >
-        sa_sendstatus = #{record.sa_sendstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_printstatus != null" >
-        sa_printstatus = #{record.sa_printstatus,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_printstatuscode != null" >
-        sa_printstatuscode = #{record.sa_printstatuscode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_recorderid != null" >
-        sa_recorderid = #{record.sa_recorderid,jdbcType=INTEGER},
-      </if>
-      <if test="record.sa_recorder != null" >
-        sa_recorder = #{record.sa_recorder,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_recorddate != null" >
-        sa_recorddate = #{record.sa_recorddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterId != null" >
-        updaterId = #{record.updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null" >
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.sa_text1 != null" >
-        sa_text1 = #{record.sa_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_text2 != null" >
-        sa_text2 = #{record.sa_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_text3 != null" >
-        sa_text3 = #{record.sa_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_text4 != null" >
-        sa_text4 = #{record.sa_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sa_text5 != null" >
-        sa_text5 = #{record.sa_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    update sale
-    set sa_id = #{record.sa_id,jdbcType=INTEGER},
-      sa_code = #{record.sa_code,jdbcType=VARCHAR},
-      sa_custid = #{record.sa_custid,jdbcType=INTEGER},
-      sa_custcode = #{record.sa_custcode,jdbcType=VARCHAR},
-      sa_custname = #{record.sa_custname,jdbcType=VARCHAR},
-      sa_toplace = #{record.sa_toplace,jdbcType=VARCHAR},
-      sa_total = #{record.sa_total,jdbcType=DOUBLE},
-      sa_totalupper = #{record.sa_totalupper,jdbcType=VARCHAR},
-      sa_remark = #{record.sa_remark,jdbcType=VARCHAR},
-      sa_status = #{record.sa_status,jdbcType=VARCHAR},
-      sa_statuscode = #{record.sa_statuscode,jdbcType=VARCHAR},
-      sa_sendstatuscode = #{record.sa_sendstatuscode,jdbcType=VARCHAR},
-      sa_sendstatus = #{record.sa_sendstatus,jdbcType=VARCHAR},
-      sa_printstatus = #{record.sa_printstatus,jdbcType=VARCHAR},
-      sa_printstatuscode = #{record.sa_printstatuscode,jdbcType=VARCHAR},
-      sa_recorderid = #{record.sa_recorderid,jdbcType=INTEGER},
-      sa_recorder = #{record.sa_recorder,jdbcType=VARCHAR},
-      sa_recorddate = #{record.sa_recorddate,jdbcType=TIMESTAMP},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      sa_text1 = #{record.sa_text1,jdbcType=VARCHAR},
-      sa_text2 = #{record.sa_text2,jdbcType=VARCHAR},
-      sa_text3 = #{record.sa_text3,jdbcType=VARCHAR},
-      sa_text4 = #{record.sa_text4,jdbcType=VARCHAR},
-      sa_text5 = #{record.sa_text5,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
     update sale
     <set >
@@ -484,8 +282,8 @@
       <if test="sa_recorddate != null" >
         sa_recorddate = #{sa_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="companyid != null" >
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        companyid = #{companyId,jdbcType=INTEGER},
       </if>
       <if test="updaterId != null" >
         updaterId = #{updaterId,jdbcType=INTEGER},
@@ -540,4 +338,30 @@
       sa_text5 = #{sa_text5,jdbcType=VARCHAR}
     where sa_id = #{sa_id,jdbcType=INTEGER}
   </update>
+
+  <select id="validateCodeWhenInsert" resultType="int" parameterType="string" >
+    select count(1) from sale where sa_code = #{code}
+  </select>
+  <select id="validateCodeWhenUpdate" resultType="int" >
+    select count(1) from sale where sa_code = #{code} and sa_id != #{id}
+  </select>
+  <select id="selectCodeById" resultType="string" parameterType="long">
+    select sa_code from sale where sa_id=#{id}
+  </select>
+
+  <select id="validateAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(sa_code) from sale where sa_statuscode='AUDITED' and sa_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateBatchUnAudit" parameterType="com.usoftchina.saas.commons.dto.DocBaseDTO" resultType="java.lang.String">
+    select GROUP_CONCAT(sa_code) from sale where sa_statuscode='UNAUDITED' and sa_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item.id}
+    </foreach>
+  </select>
+  <select id="validateUnAudit" parameterType="long" resultType="java.lang.String">
+    select sa_code from sale where sa_id = #{id} and IFNULL(sa_statuscode,'UNAUDITED')='UNAUDITED'
+  </select>
 </mapper>

+ 74 - 200
applications/sale/sale-server/src/main/resources/mapper/SaledetailMapper.xml

@@ -1,8 +1,8 @@
 <?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.usoftchina.saas.sale.mapper.SaledetailMapper" >
-  <resultMap id="BaseResultMap" type="com.usoftchina.saas.sale.po.Saledetail" >
-    <id column="sd_id" property="sd_id" jdbcType="INTEGER" />
+  <resultMap id="BaseResultMap" type="com.usoftchina.saas.sale.po.SaleDetail" >
+    <id column="sd_id" property="id" jdbcType="INTEGER" />
     <result column="sd_said" property="sd_said" jdbcType="INTEGER" />
     <result column="sd_detno" property="sd_detno" jdbcType="INTEGER" />
     <result column="sd_prodid" property="sd_prodid" jdbcType="INTEGER" />
@@ -17,109 +17,32 @@
     <result column="sd_sendqty" property="sd_sendqty" jdbcType="DOUBLE" />
     <result column="sd_pdqty" property="sd_pdqty" jdbcType="DOUBLE" />
     <result column="sd_remark" property="sd_remark" jdbcType="VARCHAR" />
-    <result column="companyid" property="companyid" jdbcType="INTEGER" />
+    <result column="companyid" property="companyId" jdbcType="INTEGER" />
     <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
     <result column="sd_text1" property="sd_text1" jdbcType="VARCHAR" />
     <result column="sd_text2" property="sd_text2" jdbcType="VARCHAR" />
     <result column="sd_text3" property="sd_text3" jdbcType="VARCHAR" />
     <result column="sd_text4" property="sd_text4" jdbcType="VARCHAR" />
     <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
-    <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" >
-    <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" >
     sd_id, sd_said, sd_detno, sd_prodid, sd_prodcode, sd_qty, sd_price, sd_total, sd_taxrate, 
     sd_netprice, sd_nettotal, sd_delivery, sd_sendqty, sd_pdqty, sd_remark, companyid, 
     updaterId, updatetime, sd_text1, sd_text2, sd_text3, sd_text4, sd_text5
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.sale.po.SaledetailExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from saledetail
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     <include refid="Base_Column_List" />
     from saledetail
     where sd_id = #{sd_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
     delete from saledetail
-    where sd_id = #{sd_id,jdbcType=INTEGER}
+    where sd_id = #{sd_id}
   </delete>
-  <delete id="deleteByExample" parameterType="com.usoftchina.saas.sale.po.SaledetailExample" >
-    delete from saledetail
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.usoftchina.saas.sale.po.Saledetail" >
+
+  <insert id="insert" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
     insert into saledetail (sd_id, sd_said, sd_detno, 
       sd_prodid, sd_prodcode, sd_qty, 
       sd_price, sd_total, sd_taxrate, 
@@ -137,7 +60,7 @@
       #{sd_text1,jdbcType=VARCHAR}, #{sd_text2,jdbcType=VARCHAR}, #{sd_text3,jdbcType=VARCHAR}, 
       #{sd_text4,jdbcType=VARCHAR}, #{sd_text5,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.usoftchina.saas.sale.po.Saledetail" >
+  <insert id="insertSelective" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
     insert into saledetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="sd_id != null" >
@@ -282,119 +205,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.usoftchina.saas.sale.po.SaledetailExample" resultType="java.lang.Integer" >
-    select count(*) from saledetail
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    update saledetail
-    <set >
-      <if test="record.sd_id != null" >
-        sd_id = #{record.sd_id,jdbcType=INTEGER},
-      </if>
-      <if test="record.sd_said != null" >
-        sd_said = #{record.sd_said,jdbcType=INTEGER},
-      </if>
-      <if test="record.sd_detno != null" >
-        sd_detno = #{record.sd_detno,jdbcType=INTEGER},
-      </if>
-      <if test="record.sd_prodid != null" >
-        sd_prodid = #{record.sd_prodid,jdbcType=INTEGER},
-      </if>
-      <if test="record.sd_prodcode != null" >
-        sd_prodcode = #{record.sd_prodcode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sd_qty != null" >
-        sd_qty = #{record.sd_qty,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_price != null" >
-        sd_price = #{record.sd_price,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_total != null" >
-        sd_total = #{record.sd_total,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_taxrate != null" >
-        sd_taxrate = #{record.sd_taxrate,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_netprice != null" >
-        sd_netprice = #{record.sd_netprice,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_nettotal != null" >
-        sd_nettotal = #{record.sd_nettotal,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_delivery != null" >
-        sd_delivery = #{record.sd_delivery,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.sd_sendqty != null" >
-        sd_sendqty = #{record.sd_sendqty,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_pdqty != null" >
-        sd_pdqty = #{record.sd_pdqty,jdbcType=DOUBLE},
-      </if>
-      <if test="record.sd_remark != null" >
-        sd_remark = #{record.sd_remark,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyid != null" >
-        companyid = #{record.companyid,jdbcType=INTEGER},
-      </if>
-      <if test="record.updaterId != null" >
-        updaterId = #{record.updaterId,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null" >
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.sd_text1 != null" >
-        sd_text1 = #{record.sd_text1,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sd_text2 != null" >
-        sd_text2 = #{record.sd_text2,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sd_text3 != null" >
-        sd_text3 = #{record.sd_text3,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sd_text4 != null" >
-        sd_text4 = #{record.sd_text4,jdbcType=VARCHAR},
-      </if>
-      <if test="record.sd_text5 != null" >
-        sd_text5 = #{record.sd_text5,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    update saledetail
-    set sd_id = #{record.sd_id,jdbcType=INTEGER},
-      sd_said = #{record.sd_said,jdbcType=INTEGER},
-      sd_detno = #{record.sd_detno,jdbcType=INTEGER},
-      sd_prodid = #{record.sd_prodid,jdbcType=INTEGER},
-      sd_prodcode = #{record.sd_prodcode,jdbcType=VARCHAR},
-      sd_qty = #{record.sd_qty,jdbcType=DOUBLE},
-      sd_price = #{record.sd_price,jdbcType=DOUBLE},
-      sd_total = #{record.sd_total,jdbcType=DOUBLE},
-      sd_taxrate = #{record.sd_taxrate,jdbcType=DOUBLE},
-      sd_netprice = #{record.sd_netprice,jdbcType=DOUBLE},
-      sd_nettotal = #{record.sd_nettotal,jdbcType=DOUBLE},
-      sd_delivery = #{record.sd_delivery,jdbcType=TIMESTAMP},
-      sd_sendqty = #{record.sd_sendqty,jdbcType=DOUBLE},
-      sd_pdqty = #{record.sd_pdqty,jdbcType=DOUBLE},
-      sd_remark = #{record.sd_remark,jdbcType=VARCHAR},
-      companyid = #{record.companyid,jdbcType=INTEGER},
-      updaterId = #{record.updaterId,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      sd_text1 = #{record.sd_text1,jdbcType=VARCHAR},
-      sd_text2 = #{record.sd_text2,jdbcType=VARCHAR},
-      sd_text3 = #{record.sd_text3,jdbcType=VARCHAR},
-      sd_text4 = #{record.sd_text4,jdbcType=VARCHAR},
-      sd_text5 = #{record.sd_text5,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Saledetail" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
     update saledetail
     <set >
       <if test="sd_said != null" >
@@ -466,7 +277,7 @@
     </set>
     where sd_id = #{sd_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.sale.po.Saledetail" >
+  <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
     update saledetail
     set sd_said = #{sd_said,jdbcType=INTEGER},
       sd_detno = #{sd_detno,jdbcType=INTEGER},
@@ -492,4 +303,67 @@
       sd_text5 = #{sd_text5,jdbcType=VARCHAR}
     where sd_id = #{sd_id,jdbcType=INTEGER}
   </update>
+
+  <insert id="batchInsert" parameterType="java.util.List" >
+    insert into saledetail (sd_said, sd_detno,
+    sd_prodid, sd_prodcode, sd_qty,
+    sd_price, sd_total, sd_taxrate,
+    sd_netprice, sd_nettotal, sd_delivery,
+    sd_sendqty, sd_pdqty, sd_remark,
+    companyid, updaterId, updatetime,
+    sd_text1, sd_text2, sd_text3,
+    sd_text4, sd_text5)
+    values
+    <foreach collection="list" item="item" index="index" open="" close="" separator=",">
+      (
+      (#{item.sd_said,jdbcType=INTEGER}, #{item.sd_detno,jdbcType=INTEGER},
+      #{item.sd_prodid,jdbcType=INTEGER}, #{item.sd_prodcode,jdbcType=VARCHAR}, #{item.sd_qty,jdbcType=DOUBLE},
+      #{item.sd_price,jdbcType=DOUBLE}, #{item.sd_total,jdbcType=DOUBLE}, #{item.sd_taxrate,jdbcType=DOUBLE},
+      #{item.sd_netprice,jdbcType=DOUBLE}, #{item.sd_nettotal,jdbcType=DOUBLE}, #{item.sd_delivery,jdbcType=TIMESTAMP},
+      #{item.sd_sendqty,jdbcType=DOUBLE}, #{item.sd_pdqty,jdbcType=DOUBLE}, #{item.sd_remark,jdbcType=VARCHAR},
+      #{item.companyid,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER}, #{item.updatetime,jdbcType=TIMESTAMP},
+      #{item.sd_text1,jdbcType=VARCHAR}, #{item.sd_text2,jdbcType=VARCHAR}, #{item.sd_text3,jdbcType=VARCHAR},
+      #{item.sd_text4,jdbcType=VARCHAR}, #{item.sd_text5,jdbcType=VARCHAR})
+      )
+    </foreach>
+  </insert>
+  <update id="batchUpdate" parameterType="com.usoftchina.saas.sale.po.SaleDetail" >
+    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+      update saledetail <set>
+      set sd_said = #{item.sd_said,jdbcType=INTEGER},
+      sd_detno = #{item.sd_detno,jdbcType=INTEGER},
+      sd_prodid = #{item.sd_prodid,jdbcType=INTEGER},
+      sd_prodcode = #{item.sd_prodcode,jdbcType=VARCHAR},
+      sd_qty = #{item.sd_qty,jdbcType=DOUBLE},
+      sd_price = #{item.sd_price,jdbcType=DOUBLE},
+      sd_total = #{item.sd_total,jdbcType=DOUBLE},
+      sd_taxrate = #{item.sd_taxrate,jdbcType=DOUBLE},
+      sd_netprice = #{item.sd_netprice,jdbcType=DOUBLE},
+      sd_nettotal = #{item.sd_nettotal,jdbcType=DOUBLE},
+      sd_delivery = #{item.sd_delivery,jdbcType=TIMESTAMP},
+      sd_sendqty = #{item.sd_sendqty,jdbcType=DOUBLE},
+      sd_pdqty = #{item.sd_pdqty,jdbcType=DOUBLE},
+      sd_remark = #{item.sd_remark,jdbcType=VARCHAR},
+      companyid = #{item.companyid,jdbcType=INTEGER},
+      updaterId = #{item.updaterId,jdbcType=INTEGER},
+      updatetime = #{item.updatetime,jdbcType=TIMESTAMP},
+      sd_text1 = #{item.sd_text1,jdbcType=VARCHAR},
+      sd_text2 = #{item.sd_text2,jdbcType=VARCHAR},
+      sd_text3 = #{item.sd_text3,jdbcType=VARCHAR},
+      sd_text4 = #{item.sd_text4,jdbcType=VARCHAR},
+      sd_text5 = #{item.sd_text5,jdbcType=VARCHAR},
+      sd_yqty = #{item.sd_yqty,jdbcType=DOUBLE},
+      sd_code = #{item.sd_code,jdbcType=VARCHAR}
+    </set>
+      where sd_id = #{item.id,jdbcType=INTEGER}
+    </foreach>
+  </update>
+  <delete id="deleteByForeignKey" parameterType="java.lang.Long">
+    delete from saledetail where sd_said=#{id}
+  </delete>
+
+  <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
+    select * from saledetail
+    where sd_said=#{id} order by sd_detno
+  </select>
 </mapper>

+ 4 - 0
applications/storage/storage-dto/pom.xml

@@ -24,6 +24,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>document-dto</artifactId>
+        </dependency>
     </dependencies>
 
 

+ 2 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/entities/ProdIODetail.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.storage.entities;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.entities.Product;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -80,4 +81,5 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private Long pd_ioid;
 
+    private Product product;
 }