询价明细增加封装和生产日期字段【商城】

src/main/java/com/uas/ps/inquiry/model/PublicInquiryItem.java

@@ -348,6 +348,18 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_offertime")
 	private Date offerTime;
 
+	/**
+	 * 封装
+	 */
+	@Column(name = "id_sort")
+	private String sort;
+
+	/**
+	 * 产品生产日期
+	 */
+	@Column(name = "id_producedate")
+	private String produceDate;
+
 	public Long getId() {
 		return id;
 	}
@@ -743,6 +755,22 @@ public class PublicInquiryItem implements Serializable {
 		this.offerTime = offerTime;
 	}
 
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getProduceDate() {
+		return produceDate;
+	}
+
+	public void setProduceDate(String produceDate) {
+		this.produceDate = produceDate;
+	}
+
 	/**
 	 * 将公共询价单转成报价单
 	 *
@@ -768,6 +796,8 @@ public class PublicInquiryItem implements Serializable {
 		this.userTel = item.getUserTel();
 		this.prodCode = item.getProdCode();
 		this.source = item.getSource();
+		this.sort = item.getSort();
+		this.produceDate = item.getProduceDate();
 	}
 
 	public PublicInquiryItem() {
@@ -828,4 +858,61 @@ public class PublicInquiryItem implements Serializable {
 		}
 		return inquiries;
     }
+
+	@Override
+	public String toString() {
+		return "PublicInquiryItem{" +
+				"id=" + id +
+				", sourceId=" + sourceId +
+				", number=" + number +
+				", inquiry=" + inquiry +
+				", userUU=" + userUU +
+				", userName='" + userName + '\'' +
+				", userTel='" + userTel + '\'' +
+				", userCode='" + userCode + '\'' +
+				", productId=" + productId +
+				", product=" + product +
+				", prodCode='" + prodCode + '\'' +
+				", currency='" + currency + '\'' +
+				", taxrate=" + taxrate +
+				", remark='" + remark + '\'' +
+				", vendUU=" + vendUU +
+				", enterprise=" + enterprise +
+				", vendUserUU=" + vendUserUU +
+				", user=" + user +
+				", fromDate=" + fromDate +
+				", toDate=" + toDate +
+				", vendFromDate=" + vendFromDate +
+				", vendToDate=" + vendToDate +
+				", minOrderQty=" + minOrderQty +
+				", minPackQty=" + minPackQty +
+				", brand='" + brand + '\'' +
+				", vendorprodcode='" + vendorprodcode + '\'' +
+				", leadtime=" + leadtime +
+				", replies=" + replies +
+				", status=" + status +
+				", sendStatus=" + sendStatus +
+				", backStatus=" + backStatus +
+				", replySendStatus=" + replySendStatus +
+				", agreed=" + agreed +
+				", decideStatus=" + decideStatus +
+				", invalidStatus=" + invalidStatus +
+				", custLap=" + custLap +
+				", erpDate=" + erpDate +
+				", date=" + date +
+				", overdue=" + overdue +
+				", invalid=" + invalid +
+				", source='" + source + '\'' +
+				", qutoApp='" + qutoApp + '\'' +
+				", attaches=" + attaches +
+				", needquantity=" + needquantity +
+				", erpstatus=" + erpstatus +
+				", kind='" + kind + '\'' +
+				", vendName='" + vendName + '\'' +
+				", businessCode='" + businessCode + '\'' +
+				", offerTime=" + offerTime +
+				", sort='" + sort + '\'' +
+				", produceDate='" + produceDate + '\'' +
+				'}';
+	}
 }

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItem.java

@@ -280,6 +280,17 @@ public class PurcInquiryItem {
 	@Column(name = "id_offertime")
     private Date offerTime;
 
+	/**
+	 * 封装
+	 */
+	@Column(name = "id_sort")
+	private String sort;
+
+	/**
+	 * 产品生产日期
+	 */
+	@Column(name = "id_producedate")
+	private String produceDate;
 
 	public Long getId() {
 		return id;
@@ -619,7 +630,23 @@ public class PurcInquiryItem {
 		this.enuu = enuu;
 	}
 
-	public static List<PurcInquiry> distinct(List<PurcInquiryItem> inquiryItems) {
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getProduceDate() {
+        return produceDate;
+    }
+
+    public void setProduceDate(String produceDate) {
+        this.produceDate = produceDate;
+    }
+
+    public static List<PurcInquiry> distinct(List<PurcInquiryItem> inquiryItems) {
 		List<PurcInquiry> inquiries = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();
 		for (PurcInquiryItem item : inquiryItems) {
@@ -631,46 +658,53 @@ public class PurcInquiryItem {
 		return inquiries;
     }
 
-	@Override
-	public String toString() {
-		return "PurcInquiryItem{" +
-				"id=" + id +
-				", number=" + number +
-				", inquiry=" + inquiry +
-				", userUU=" + userUU +
-				", productId=" + productId +
-				", product=" + product +
-				", prodCode='" + prodCode + '\'' +
-				", prodTitle='" + prodTitle + '\'' +
-				", spec='" + spec + '\'' +
-				", unit='" + unit + '\'' +
-				", cmpCode='" + cmpCode + '\'' +
-				", inbrand='" + inbrand + '\'' +
-				", currency='" + currency + '\'' +
-				", taxrate=" + taxrate +
-				", remark='" + remark + '\'' +
-				", vendUU=" + vendUU +
-				", vendUserUU=" + vendUserUU +
-				", fromDate=" + fromDate +
-				", toDate=" + toDate +
-				", vendFromDate=" + vendFromDate +
-				", vendToDate=" + vendToDate +
-				", minOrderQty=" + minOrderQty +
-				", minPackQty=" + minPackQty +
-				", brand='" + brand + '\'' +
-				", vendorprodcode='" + vendorprodcode + '\'' +
-				", leadtime=" + leadtime +
-				", replies=" + replies +
-				", status=" + status +
-				", agreed=" + agreed +
-				", custLap=" + custLap +
-				", overdue=" + overdue +
-				", source='" + source + '\'' +
-				", isOpen=" + isOpen +
-				", needquantity=" + needquantity +
-				", sourceid=" + sourceid +
-				", date=" + date +
-				", enuu=" + enuu +
-				'}';
-	}
+    @Override
+    public String toString() {
+        return "PurcInquiryItem{" +
+                "id=" + id +
+                ", number=" + number +
+                ", inquiry=" + inquiry +
+                ", userUU=" + userUU +
+                ", userName='" + userName + '\'' +
+                ", userTel='" + userTel + '\'' +
+                ", userCode='" + userCode + '\'' +
+                ", productId=" + productId +
+                ", product=" + product +
+                ", prodCode='" + prodCode + '\'' +
+                ", prodTitle='" + prodTitle + '\'' +
+                ", spec='" + spec + '\'' +
+                ", unit='" + unit + '\'' +
+                ", cmpCode='" + cmpCode + '\'' +
+                ", inbrand='" + inbrand + '\'' +
+                ", currency='" + currency + '\'' +
+                ", taxrate=" + taxrate +
+                ", remark='" + remark + '\'' +
+                ", vendUU=" + vendUU +
+                ", vendUserUU=" + vendUserUU +
+                ", fromDate=" + fromDate +
+                ", toDate=" + toDate +
+                ", vendFromDate=" + vendFromDate +
+                ", vendToDate=" + vendToDate +
+                ", minOrderQty=" + minOrderQty +
+                ", minPackQty=" + minPackQty +
+                ", brand='" + brand + '\'' +
+                ", vendorprodcode='" + vendorprodcode + '\'' +
+                ", leadtime=" + leadtime +
+                ", replies=" + replies +
+                ", status=" + status +
+                ", agreed=" + agreed +
+                ", custLap=" + custLap +
+                ", overdue=" + overdue +
+                ", source='" + source + '\'' +
+                ", isOpen=" + isOpen +
+                ", needquantity=" + needquantity +
+                ", sourceid=" + sourceid +
+                ", date=" + date +
+                ", enuu=" + enuu +
+                ", unitPrice=" + unitPrice +
+                ", offerTime=" + offerTime +
+                ", sort='" + sort + '\'' +
+                ", produceDate='" + produceDate + '\'' +
+                '}';
+    }
 }

src/main/java/com/uas/ps/inquiry/model/PurcInquiryItemInfo.java

@@ -279,6 +279,18 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_offertime")
 	private Date offerTime;
 
+	/**
+	 * 封装
+	 */
+	@Column(name = "id_sort")
+	private String sort;
+
+	/**
+	 * 产品生产日期
+	 */
+	@Column(name = "id_producedate")
+	private String produceDate;
+
 	public Long getId() {
 		return id;
 	}
@@ -615,6 +627,22 @@ public class PurcInquiryItemInfo {
 		this.userCode = userCode;
 	}
 
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getProduceDate() {
+		return produceDate;
+	}
+
+	public void setProduceDate(String produceDate) {
+		this.produceDate = produceDate;
+	}
+
 	public static List<PurcInquiryInfo> distinct(List<PurcInquiryItemInfo> inquiryItems) {
 		List<PurcInquiryInfo> inquiries = new ArrayList<>();
 		Set<Long> keys = new HashSet<>();
@@ -634,6 +662,9 @@ public class PurcInquiryItemInfo {
 				", number=" + number +
 				", inquiry=" + inquiry +
 				", userUU=" + userUU +
+				", userName='" + userName + '\'' +
+				", userTel='" + userTel + '\'' +
+				", userCode='" + userCode + '\'' +
 				", productId=" + productId +
 				", product=" + product +
 				", prodCode='" + prodCode + '\'' +
@@ -669,6 +700,8 @@ public class PurcInquiryItemInfo {
 				", date=" + date +
 				", enuu=" + enuu +
 				", offerTime=" + offerTime +
+				", sort='" + sort + '\'' +
+				", produceDate='" + produceDate + '\'' +
 				'}';
 	}
 }