Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2b/model/B2bCodeSet.java

@@ -75,7 +75,7 @@ public class B2bCodeSet implements Serializable{
 	@Column(name = "bc_prtypepreix")
 	private String prtypepreix;
 	
-	@Column(name = "bc_fromerp")
+	@Column(name = "bc_fromerp", nullable = false)
 	private String fromerp;
 	
 	@Column(name = "bc_fromplat")

src/main/java/com/uas/platform/b2b/model/Customer.java

@@ -36,7 +36,7 @@ public class Customer implements Serializable {
 	/**
 	 * 我的企业UU
 	 */
-	@Column(name = "cu_myenuu")
+	@Column(name = "cu_myenuu", nullable = false)
 	private Long myEnUU;
 
 	/**
@@ -50,14 +50,14 @@ public class Customer implements Serializable {
 	 * 客户企业UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cu_custenuu")
+	@JoinColumn(name = "cu_custenuu", nullable = false)
 	private Enterprise customerEnterprise;
 
 	/**
 	 * 客户联系人UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "cu_custuseruu")
+	@JoinColumn(name = "cu_custuseruu", nullable = false)
 	@OtherUserUU
 	private UserBaseInfo customerUser;
 

src/main/java/com/uas/platform/b2b/model/ReportConfig.java

@@ -5,7 +5,6 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
@@ -17,7 +16,7 @@ public class ReportConfig {
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(unique = true, name = "re_id")
+	@Column(name = "re_id")
 	private Long id;
 	
 	/**

src/main/java/com/uas/platform/b2b/model/Resource.java

@@ -2,7 +2,6 @@ package com.uas.platform.b2b.model;
 
 import java.io.Serializable;
 import java.util.Set;
-
 import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -14,9 +13,8 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
+import javax.validation.constraints.NotNull;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
@@ -66,7 +64,8 @@ public class Resource implements Serializable{
 	/**
 	 * 权限显示排序下标
 	 */
-	@Column(name = "res_index")
+	@Column(name = "res_index", unique = true)
+	@NotNull
 	private Long index;
 
 	public Long getId() {

src/main/java/com/uas/platform/b2b/model/ResourceItem.java

@@ -39,7 +39,7 @@ public class ResourceItem implements Serializable{
 	/**
 	 * 资源名称
 	 */
-	@Column(name = "item_name")
+	@Column(name = "item_name", unique = true)
 	private String name;
 	/**
 	 * 资源类型GET、POST、PUT、DELETE等

src/main/java/com/uas/platform/b2b/model/SaleSend.java

@@ -1,6 +1,10 @@
 package com.uas.platform.b2b.model;
 
+import static com.alibaba.druid.sql.ast.expr.SQLUnaryOperator.Not;
+import static org.springframework.data.jpa.domain.AbstractPersistable_.id;
+
 import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.CollectionUtils;
 
@@ -16,7 +20,7 @@ import java.util.Set;
  * @author yingp
  * 
  */
-@Table(name = "sale$send")
+@Table(name = "sale$send", indexes = {@Index(name = "index_salesend_back", columnList = "ss_backstatus"), @Index(name = "index_salesend_send", columnList = "ss_sendstatus")})
 @Entity
 public class SaleSend implements Serializable {
 
@@ -148,7 +152,8 @@ public class SaleSend implements Serializable {
 	/**
 	 * 每次产生送货单时记录一个唯一标识，防止重复
 	 */
-	@Column(name = "ss_uuid")
+	@Column(name = "ss_uuid", unique = true)
+	@NotNull
 	private String uuid;
 
 	public SaleSend() {

src/main/java/com/uas/platform/b2b/model/UserOrders.java

@@ -1,16 +1,14 @@
 package com.uas.platform.b2b.model;
 
+import com.uas.platform.core.model.Status;
 import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
-import com.uas.platform.core.model.Status;
+import javax.validation.constraints.NotNull;
 
 /**
  * 记录客户单据的未读状态
@@ -28,38 +26,44 @@ public class UserOrders {
     /**
      * 客户UU号
      */
+    @NotNull
     @Column(name = "puo_useruu")
     private Long userUU;
 
     /**
      * 客户企业UU号
      */
+    @NotNull
     @Column(name = "puo_enuu")
     private Long enUU;
 
     /**
      * 单据id（用于查询单据属性）
      */
+    @NotNull
     @Column(name = "puo_sourceid")
     private Long sourceId;
 
     /**
      * 单据分类（purc or sale）
      */
+    @NotNull
     @Column(name = "puo_category")
     private String category;
 
     /**
      * 单据表名（用于区分单据）、
      */
+    @NotNull
     @Column(name = "puo_table")
     private String table;
 
     /**
      * 阅读状态（201表示已读, 200表示未读）
      */
+    @NotNull
     @Column(name = "puo_readstatus")
-    private Short readStatus;
+    private Short readStatus = (short) Status.NOT_READ.value();
 
     /**
      * 单据阅读时间（用于定期删除）

src/main/java/com/uas/platform/b2b/model/Vendor.java

@@ -9,6 +9,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Index;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.SequenceGenerator;
@@ -16,6 +17,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import com.uas.platform.b2b.erp.model.InquiryVendorInfo;
+import javax.validation.constraints.NotNull;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -27,7 +29,7 @@ import com.uas.platform.core.persistence.StatusColumn;
 import com.uas.platform.core.persistence.UserUU;
 
 @Entity
-@Table(name = "purc$vendors")
+@Table(name = "purc$vendors", indexes = {@Index(name = "index_vendor_status", columnList = "ve_status"), @Index(name = "index_vendor_myen_venden", columnList = "ve_myenuu, ve_vendenuu", unique = true)})
 @Logger(enUU = "ve_myenuu", userUU = "ve_myuseruu")
 @Cacheable
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE, region = "com.uas.platform.b2b.model.Vendor")
@@ -60,7 +62,7 @@ public class Vendor implements Serializable {
 	 * 我的企业
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "ve_myenuu", insertable = false, updatable = false)
+	@JoinColumn(name = "ve_myenuu", insertable = false, updatable = false, nullable = false)
 	private Enterprise myEnterprise;
 
 	/**
@@ -84,7 +86,7 @@ public class Vendor implements Serializable {
 	 * 供应商的企业UU
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH, CascadeType.MERGE })
-	@JoinColumn(name = "ve_vendenuu", insertable = false, updatable = false)
+	@JoinColumn(name = "ve_vendenuu", insertable = false, updatable = false, nullable = false)
 	private Enterprise vendorEnterprise;
 
 	@Column(name = "ve_venduseruu")

src/main/java/com/uas/platform/b2b/model/VendorPerformanceAssess.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.model;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import javax.validation.constraints.NotNull;
 
 /**
  * 供应商绩效考核
@@ -25,6 +26,7 @@ public class VendorPerformanceAssess implements Serializable {
      * 采购员号
      */
     @Column(name = "enuu")
+    @NotNull
     private Long enUU;
 
     /**
@@ -35,9 +37,11 @@ public class VendorPerformanceAssess implements Serializable {
     private EnterpriseInfo enterprise;
 
     @Column(name = "vpa_id")
+    @NotNull
     private Long vpaId;
 
     @Column(name = "vpa_code")
+    @NotNull
     private String vpaCode;
 
     @Column(name = "vpa_status")
@@ -212,6 +216,7 @@ public class VendorPerformanceAssess implements Serializable {
      * 供应商号
      */
     @Column(name = "vpa_veuu")
+    @NotNull
     private Long vpaVeuu;
 
     public Long getId() {

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -1,64 +1,11 @@
 package com.uas.platform.b2b.service.impl;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.DateUtils;
-import com.uas.platform.b2b.core.util.SplitArray;
-import com.uas.platform.b2b.core.util.StringUtil;
-import com.uas.platform.b2b.core.util.ThreadTask;
-import com.uas.platform.b2b.dao.CommonDao;
-import com.uas.platform.b2b.dao.DistributeDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.PagingReleaseDao;
-import com.uas.platform.b2b.dao.PrintLogDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.ProductTempDao;
-import com.uas.platform.b2b.dao.PurcOrderInfoItemDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
-import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
-import com.uas.platform.b2b.dao.PurchaseOrderItemDao;
-import com.uas.platform.b2b.dao.PurchaseOrderReceivedDao;
-import com.uas.platform.b2b.dao.PurchaseOrderReplyDao;
-import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
-import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
-import com.uas.platform.b2b.dao.RoleDao;
-import com.uas.platform.b2b.dao.UserBaseInfoDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.dao.UserOrderDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.core.util.*;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.event.PurchaseOrderEndReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderReplyReleaseEvent;
 import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
-import com.uas.platform.b2b.model.Distribute;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.PrintLog;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.ProductTemp;
-import com.uas.platform.b2b.model.PurcOrderInfoItem;
-import com.uas.platform.b2b.model.PurchaseOrder;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.PurchaseOrderDone;
-import com.uas.platform.b2b.model.PurchaseOrderDoneItem;
-import com.uas.platform.b2b.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.model.PurchaseOrderEndItem;
-import com.uas.platform.b2b.model.PurchaseOrderInfo;
-import com.uas.platform.b2b.model.PurchaseOrderItem;
-import com.uas.platform.b2b.model.PurchaseOrderReceived;
-import com.uas.platform.b2b.model.PurchaseOrderReceivedItem;
-import com.uas.platform.b2b.model.PurchaseOrderReply;
-import com.uas.platform.b2b.model.PurchaseOrderTodo;
-import com.uas.platform.b2b.model.PurchaseOrderTodoItem;
-import com.uas.platform.b2b.model.PurchaseOrderWaiting;
-import com.uas.platform.b2b.model.PurchaseOrderWaitingItem;
-import com.uas.platform.b2b.model.Role;
-import com.uas.platform.b2b.model.SearchFilter;
-import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.UserBaseInfo;
-import com.uas.platform.b2b.model.UserOrders;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.ps.ProductUtils;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductUsersService;
@@ -84,20 +31,8 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.SetJoin;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import javax.persistence.criteria.*;
+import java.util.*;
 
 @Service
 @Transactional
@@ -178,13 +113,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 	@Autowired
 	private ProductTempDao productTempDao;
 
-//	@Autowired
-//    private SaleOrderForProdItemDao saleOrderForProdItemDao;
 
 	@Override
 	public void save(List<PurcOrderInfoItem> orderItems) {
 		List<PurcOrderInfoItem> newOrderItems = purcOrderInfoItemDao.save(orderItems);
-//		ContextUtils.publishEvent(new PurchaseOrderSaveEvent(PurchaseOrderAllItem.distinct(newOrderItems)));
 		List<PurchaseOrderInfo> orderAlls = PurcOrderInfoItem.distinct(newOrderItems);
 		List<PurchaseOrderInfo> newOrderAlls = new ArrayList<>();
 		for (PurchaseOrderInfo orderAll : orderAlls) {