Просмотр исходного кода

因为更新索引时不再对数据进行比较,所以删除equals方法

sunyj 9 лет назад
Родитель
Сommit
d98dfbf7b6
24 измененных файлов с 1 добавлено и 380 удалено
  1. 0 10
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/EnterpriseSimpleInfo.java
  2. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeAcceptSimpleInfo.java
  3. 0 20
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeOrderChangeItemSimpleInfo.java
  4. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeOrderSimpleInfo.java
  5. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeReturnSimpleInfo.java
  6. 0 18
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurcProofingapprovalSimpleInfo.java
  7. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurcProofingsendSimpleInfo.java
  8. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseAcceptSimpleInfo.java
  9. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApCheckSimpleInfo.java
  10. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApbillSimpleInfo.java
  11. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseBadinSimpleInfo.java
  12. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseBadoutSimpleInfo.java
  13. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseChangesSimpleInfo.java
  14. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseForecastSimpleInfo.java
  15. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryItemSimpleInfo.java
  16. 0 19
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryMouldSimpleInfo.java
  17. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseMrbSimpleInfo.java
  18. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseNoticeSimpleInfo.java
  19. 0 17
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderSimpleInfo.java
  20. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseProofingItemSimpleInfo.java
  21. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseReturnSimpleInfo.java
  22. 1 17
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/SaleArcheckSimpleInfo.java
  23. 0 16
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/SaleQuotationSimpleInfo.java
  24. 0 15
      search-console-b2b/src/main/java/com/uas/search/console/b2b/model/SaleSendSimpleInfo.java

+ 0 - 10
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/EnterpriseSimpleInfo.java

@@ -3,7 +3,6 @@
 package com.uas.search.console.b2b.model;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -51,15 +50,6 @@ public class EnterpriseSimpleInfo implements Serializable {
 		this.enName = enName;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject || otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof EnterpriseSimpleInfo)) {
-			return true;
-		}
-		EnterpriseSimpleInfo other = (EnterpriseSimpleInfo) otherObject;
-		return Objects.equals(uu, other.getUu()) && Objects.equals(enName, other.getEnName());
-	}
-
 	@Override
 	public String toString() {
 		return "EnterpriseSimpleInfo [uu=" + uu + ", enName=" + enName + "]";

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeAcceptSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -163,21 +162,6 @@ public class MakeAcceptSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof MakeAcceptSimpleInfo)) {
-			return false;
-		}
-		MakeAcceptSimpleInfo other = (MakeAcceptSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "MakeAcceptSimpleInfo [id=" + id + ", code=" + code + ", sendCode=" + sendCode + ", vend=" + vend

+ 0 - 20
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeOrderChangeItemSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.b2b.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -72,12 +71,10 @@ public class MakeOrderChangeItemSimpleInfo {
 	@JoinColumn(name = MAKE_FIELD, insertable = false, updatable = false)
 	private MakeChangesSimpleInfo makeChanges;
 
-
 	public Long getId() {
 		return id;
 	}
 
-
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -94,22 +91,18 @@ public class MakeOrderChangeItemSimpleInfo {
 		return orderCode;
 	}
 
-
 	public void setOrderCode(String orderCode) {
 		this.orderCode = orderCode;
 	}
 
-
 	public ProductSimpleInfo getProduct() {
 		return product;
 	}
 
-
 	public void setProduct(ProductSimpleInfo product) {
 		this.product = product;
 	}
 
-
 	public MakeChangesSimpleInfo getMakeChanges() {
 		return makeChanges;
 	}
@@ -137,17 +130,4 @@ public class MakeOrderChangeItemSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof MakeOrderChangeItemSimpleInfo)) {
-			return false;
-		}
-		MakeOrderChangeItemSimpleInfo other = (MakeOrderChangeItemSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(orderCode, other.getOrderCode());
-	}
-
 }

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeOrderSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -174,20 +173,6 @@ public class MakeOrderSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof MakeOrderSimpleInfo)) {
-			return false;
-		}
-		MakeOrderSimpleInfo other = (MakeOrderSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(status, other.getStatus()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "MakeOrderSimpleInfo [id=" + id + ", code=" + code + ", status=" + status + ", end=" + end + ", date="

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/MakeReturnSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -164,20 +163,6 @@ public class MakeReturnSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof MakeReturnSimpleInfo)) {
-			return false;
-		}
-		MakeReturnSimpleInfo other = (MakeReturnSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sendCode, other.getSendCode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "MakeReturnSimpleInfo [id=" + id + ", code=" + code + ", sendCode=" + sendCode + ", date=" + date

+ 0 - 18
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurcProofingapprovalSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -203,23 +202,6 @@ public class PurcProofingapprovalSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurcProofingapprovalSimpleInfo)) {
-			return false;
-		}
-		PurcProofingapprovalSimpleInfo other = (PurcProofingapprovalSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sscode, other.getSscode()) && Objects.equals(prodDetail, other.getProdDetail())
-				&& Objects.equals(prodCode, other.getProdCode()) && Objects.equals(prodSpec, other.getProdSpec())
-				&& Objects.equals(pscode, other.getPscode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurcProofingapprovalSimpleInfo [id=" + id + ", code=" + code + ", pscode=" + pscode + ", sscode="

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurcProofingsendSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -123,20 +122,6 @@ public class PurcProofingsendSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurcProofingsendSimpleInfo)) {
-			return false;
-		}
-		PurcProofingsendSimpleInfo other = (PurcProofingsendSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(brand, other.getBrand()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurcProofingsendSimpleInfo [id=" + id + ", code=" + code + ", date=" + date + ", proofingItem="

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseAcceptSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -163,20 +162,6 @@ public class PurchaseAcceptSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseAcceptSimpleInfo)) {
-			return false;
-		}
-		PurchaseAcceptSimpleInfo other = (PurchaseAcceptSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate()) && Objects.equals(sendCode, other.getSendCode());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseAcceptSimpleInfo [id=" + id + ", code=" + code + ", date=" + date + ", enterprise=" + enterprise

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApCheckSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -182,18 +181,4 @@ public class PurchaseApCheckSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseApCheckSimpleInfo)) {
-			return false;
-		}
-		PurchaseApCheckSimpleInfo other = (PurchaseApCheckSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate()) && Objects.equals(checkstatus, other.getCheckstatus());
-	}
-
 }

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseApbillSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -145,21 +144,6 @@ public class PurchaseApbillSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseApbillSimpleInfo)) {
-			return false;
-		}
-		PurchaseApbillSimpleInfo other = (PurchaseApbillSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseApbillSimpleInfo [id=" + id + ", code=" + code + ", date=" + date + ", enterprise=" + enterprise

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseBadinSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -163,21 +162,6 @@ public class PurchaseBadinSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseBadinSimpleInfo)) {
-			return false;
-		}
-		PurchaseBadinSimpleInfo other = (PurchaseBadinSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sendCode, other.getSendCode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseBadinSimpleInfo [id=" + id + ", code=" + code + ", sendCode=" + sendCode + ", date=" + date

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseBadoutSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -163,21 +162,6 @@ public class PurchaseBadoutSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseBadoutSimpleInfo)) {
-			return false;
-		}
-		PurchaseBadoutSimpleInfo other = (PurchaseBadoutSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sendCode, other.getSendCode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseBadoutSimpleInfo [id=" + id + ", code=" + code + ", sendCode=" + sendCode + ", date=" + date

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseChangesSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -179,21 +178,6 @@ public class PurchaseChangesSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseChangesSimpleInfo)) {
-			return false;
-		}
-		PurchaseChangesSimpleInfo other = (PurchaseChangesSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(status, other.getStatus()) && Objects.equals(status, other.getDate())
-				&& Objects.equals(orderCode, other.getOrderCode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseChangesSimpleInfo [id=" + id + ", date=" + date + ", enterprise=" + enterprise + ", vend="

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseForecastSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -122,21 +121,6 @@ public class PurchaseForecastSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseForecastSimpleInfo)) {
-			return false;
-		}
-		PurchaseForecastSimpleInfo other = (PurchaseForecastSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseForecastSimpleInfo [id=" + id + ", date=" + date + ", vend=" + vend + ", code=" + code

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryItemSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.b2b.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -136,21 +135,6 @@ public class PurchaseInquiryItemSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseInquiryItemSimpleInfo)) {
-			return false;
-		}
-		PurchaseInquiryItemSimpleInfo other = (PurchaseInquiryItemSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(enterprise, other.getEnterprise())
-				&& Objects.equals(sendStatus, other.getSendStatus()) && Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseInquiryItemSimpleInfo [id=" + id + ", enterprise=" + enterprise + ", product=" + product

+ 0 - 19
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseInquiryMouldSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -252,22 +251,4 @@ public class PurchaseInquiryMouldSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseInquiryMouldSimpleInfo)) {
-			return false;
-		}
-		PurchaseInquiryMouldSimpleInfo other = (PurchaseInquiryMouldSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(status, other.getStatus()) && Objects.equals(date, other.getDate())
-				&& Objects.equals(adoptstatus, other.getAdoptstatus())
-				&& Objects.equals(sendstatus, other.getSendstatus()) && Objects.equals(valid, other.getValid())
-				&& Objects.equals(overdue, other.getOverdue());
-	}
-
 }

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseMrbSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -176,20 +175,6 @@ public class PurchaseMrbSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseMrbSimpleInfo)) {
-			return false;
-		}
-		PurchaseMrbSimpleInfo other = (PurchaseMrbSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sendCode, other.getSendCode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseMrbSimpleInfo [id=" + id + ", code=" + code + ", date=" + date + ", enterprise=" + enterprise

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseNoticeSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -173,21 +172,6 @@ public class PurchaseNoticeSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseNoticeSimpleInfo)) {
-			return false;
-		}
-		PurchaseNoticeSimpleInfo other = (PurchaseNoticeSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(status, other.getStatus())
-				&& Objects.equals(date, other.getDate()) && Objects.equals(waiting, other.getWaiting())
-				&& Objects.equals(end, other.getEnd());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseNoticeSimpleInfo [id=" + id + ", date=" + date + ", enterprise=" + enterprise + ", vend=" + vend

+ 0 - 17
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -214,22 +213,6 @@ public class PurchaseOrderSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseOrderSimpleInfo)) {
-			return false;
-		}
-		PurchaseOrderSimpleInfo other = (PurchaseOrderSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(status, other.getStatus()) && Objects.equals(date, other.getDate())
-				&& Objects.equals(end, other.getEnd()) && Objects.equals(reply, other.getReply());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseOrderSimpleInfo [id=" + id + ", code=" + code + ", status=" + status + ", reply=" + reply

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseProofingItemSimpleInfo.java

@@ -2,7 +2,6 @@ package com.uas.search.console.b2b.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -123,20 +122,6 @@ public class PurchaseProofingItemSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseProofingItemSimpleInfo)) {
-			return false;
-		}
-		PurchaseProofingItemSimpleInfo other = (PurchaseProofingItemSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(status, other.getStatus());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseProofingItemSimpleInfo [id=" + id + ", sourceId=" + sourceId + ", status=" + status

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseReturnSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -162,20 +161,6 @@ public class PurchaseReturnSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseReturnSimpleInfo)) {
-			return false;
-		}
-		PurchaseReturnSimpleInfo other = (PurchaseReturnSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(sendCode, other.getSendCode()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "PurchaseReturnSimpleInfo [id=" + id + ", code=" + code + ", sendCode=" + sendCode + ", date=" + date

+ 1 - 17
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/SaleArcheckSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -39,7 +38,7 @@ public class SaleArcheckSimpleInfo {
 	public static final String CODE_FIELD = "sac_code";
 
 	public static final String VEND_FIELD = "sac_venduu";
-	
+
 	public static final String STATUS_FIELD = "sac_status";
 
 	public static final String ITEMS_FIELD = "saci_sacid";
@@ -64,7 +63,6 @@ public class SaleArcheckSimpleInfo {
 	@Column(name = "sac_status")
 	private Short status;
 
-
 	/**
 	 * 日期
 	 */
@@ -161,20 +159,6 @@ public class SaleArcheckSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof PurchaseOrderSimpleInfo)) {
-			return false;
-		}
-		PurchaseOrderSimpleInfo other = (PurchaseOrderSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "SaleArcheckSimpleInfo [id=" + id + ", code=" + code + ", status=" + status + ", date=" + date

+ 0 - 16
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/SaleQuotationSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -162,21 +161,6 @@ public class SaleQuotationSimpleInfo {
 		return fields;
 	}
 
-	// TODO 每个主表必须重写equals方法
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof SaleQuotationSimpleInfo)) {
-			return false;
-		}
-		SaleQuotationSimpleInfo other = (SaleQuotationSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(status, other.getStatus()) && Objects.equals(date, other.getDate());
-	}
-
 	@Override
 	public String toString() {
 		return "SaleQuotationSimpleInfo [id=" + id + ", code=" + code + ", status=" + status + ", date=" + date

+ 0 - 15
search-console-b2b/src/main/java/com/uas/search/console/b2b/model/SaleSendSimpleInfo.java

@@ -3,7 +3,6 @@ package com.uas.search.console.b2b.model;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import javax.persistence.CascadeType;
@@ -161,20 +160,6 @@ public class SaleSendSimpleInfo {
 		return fields;
 	}
 
-	public boolean equals(Object otherObject) {
-		if (this == otherObject) {
-			return true;
-		}
-		if (otherObject == null || getClass() != otherObject.getClass()
-				|| !(otherObject instanceof SaleSendSimpleInfo)) {
-			return false;
-		}
-		SaleSendSimpleInfo other = (SaleSendSimpleInfo) otherObject;
-		// 不对从表的数据进行比较
-		return Objects.equals(id, other.getId()) && Objects.equals(code, other.getCode())
-				&& Objects.equals(verifystatus, other.getVerifystatus());
-	}
-
 	@Override
 	public String toString() {
 		return "SaleSendSimpleInfo [id=" + id + ", code=" + code + ", date=" + date + ", enterprise=" + enterprise