git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1102 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -79,6 +79,9 @@ public class PurchaseMRBIndex {
 		this.keyword = keyword;
 	}
 	
+	public PurchaseMRBIndex() {
+	}
+	
 	public PurchaseMRBIndex(long enUU, long key, String keyword) {
 		this.enUU = enUU;
 		this.key = key;

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

@@ -3,12 +3,9 @@ package com.uas.platform.b2b.model;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.hibernate.annotations.Where;
@@ -25,8 +22,6 @@ import org.hibernate.annotations.Where;
 public class PurchaseProofingItemDone {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$proofingitems_gen")
-	@SequenceGenerator(name = "purc$proofingitems_gen", sequenceName = "purc$proofingitems_seq", allocationSize = 1)
 	@Column(name = "ppi_id")
 	private Long id;
 

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

@@ -3,12 +3,9 @@ package com.uas.platform.b2b.model;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.hibernate.annotations.Where;
@@ -25,8 +22,6 @@ import org.hibernate.annotations.Where;
 public class PurchaseProofingItemTodo {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$proofingitems_gen")
-	@SequenceGenerator(name = "purc$proofingitems_gen", sequenceName = "purc$proofingitems_seq", allocationSize = 1)
 	@Column(name = "ppi_id")
 	private Long id;
 

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

@@ -8,12 +8,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
@@ -33,8 +30,6 @@ public class SaleSendAll implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$send_gen")
-	@SequenceGenerator(name = "sale$send_gen", sequenceName = "sale$send_seq", allocationSize = 1)
 	@Column(name = "ss_id")
 	private Long id;
 

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

@@ -79,6 +79,9 @@ public class SaleSendIndex {
 		this.keyword = keyword;
 	}
 	
+	public SaleSendIndex() {
+	}
+	
 	public SaleSendIndex(long enUU, long key, String keyword) {
 		this.enUU = enUU;
 		this.key = key;

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

@@ -3,13 +3,10 @@ package com.uas.platform.b2b.model;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
@@ -27,8 +24,6 @@ import com.alibaba.fastjson.annotation.JSONField;
 public class SaleSendItemAll {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$senditem_gen")
-	@SequenceGenerator(name = "sale$senditem_gen", sequenceName = "sale$senditem_seq", allocationSize = 1)
 	@Column(name = "si_id")
 	private Long id;
 
@@ -47,14 +42,14 @@ public class SaleSendItemAll {
 
 	@Column(name = "si_noticeid")
 	private Long noticeId;
-	
+
 	/**
 	 * 客户采购单明细（可能存在不通过送货提醒发货的情况，所以需要能直接关联客户采购单明细）
 	 */
 	@OneToOne(cascade = { CascadeType.REFRESH })
 	@JoinColumn(name = "si_pdid", insertable = false, updatable = false, nullable = false)
 	private PurchaseOrderItem orderItem;
-	
+
 	@Column(name = "si_pdid")
 	private Long orderItemId;
 
@@ -82,13 +77,13 @@ public class SaleSendItemAll {
 	 */
 	@Column(name = "si_remark")
 	private String remark;
-	
+
 	/**
 	 * 客户确认信息
 	 */
 	@Column(name = "si_replyremark")
 	private String replyRemark;
-	
+
 	/**
 	 * 客户收料数
 	 */