询价单实体字段整理

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

@@ -388,7 +388,6 @@ public class PublicInquiry implements Serializable {
 	}
 
 	public PublicInquiry(PurcInquiryInfo inquiry) {
-        this.check = inquiry.getCheck();
         this.auditor = inquiry.getAuditor();
         if (null != inquiry.getAttachs()) {
         	Set<Attach> attachSet = new HashSet<Attach>();
@@ -411,7 +410,6 @@ public class PublicInquiry implements Serializable {
         this.inquirytype = inquiry.getInquirytype();
         this.invoice = inquiry.getInvoice();
         this.isOpen = inquiry.getIsOpen();
-        this.overdue = inquiry.getOverdue();
         this.priceType = inquiry.getPriceType();
         this.recorderUU = inquiry.getRecorderUU();
         this.recorder = inquiry.getRecorder();

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

@@ -143,18 +143,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_todate")
 	private Date toDate;
 
-	/**
-	 * （卖家报的）有效期始
-	 */
-	@Column(name = "id_vendfromdate")
-	private Date vendFromDate;
-
-	/**
-	 * （卖家报的）有效期止
-	 */
-	@Column(name = "id_vendtodate")
-	private Date vendToDate;
-
 	/**
 	 * （卖家报的）最小订购量
 	 */
@@ -254,14 +242,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_custlap")
 	private Short custLap;
 
-	/**
-	 * 保存erp传入数据的时间
-	 * 
-	 * @return
-	 */
-	@Column(name = "id_erpdate")
-	private Date erpDate;
-
 	/**
 	 * 录入时间(取主表日期字段)
 	 *
@@ -576,22 +556,6 @@ public class PublicInquiryItem implements Serializable {
 		this.toDate = toDate;
 	}
 
-	public Date getVendFromDate() {
-		return vendFromDate;
-	}
-
-	public void setVendFromDate(Date vendFromDate) {
-		this.vendFromDate = vendFromDate;
-	}
-
-	public Date getVendToDate() {
-		return vendToDate;
-	}
-
-	public void setVendToDate(Date vendToDate) {
-		this.vendToDate = vendToDate;
-	}
-
 	public Long getVendUU() {
 		return vendUU;
 	}
@@ -768,14 +732,6 @@ public class PublicInquiryItem implements Serializable {
 		this.leadtime = leadtime;
 	}
 
-	public Date getErpDate() {
-		return erpDate;
-	}
-
-	public void setErpDate(Date erpDate) {
-		this.erpDate = erpDate;
-	}
-
 	public Date getDate() {
 		return date;
 	}
@@ -1045,11 +1001,8 @@ public class PublicInquiryItem implements Serializable {
 		this.date = item.getDate();
 		this.offerTime = new Date(System.currentTimeMillis());
 		this.agreed = item.getAgreed();
-		this.brand = item.getBrand();
 		this.sourceId = item.getId();
 		this.currency = item.getCurrency();
-		this.custLap = item.getCustLap();
-		this.leadtime = item.getLeadtime();
 		this.productId = item.getProductId();
 		this.needquantity = item.getNeedquantity();
 		this.fromDate = item.getFromDate();
@@ -1153,8 +1106,6 @@ public class PublicInquiryItem implements Serializable {
 				", user=" + user +
 				", fromDate=" + fromDate +
 				", toDate=" + toDate +
-				", vendFromDate=" + vendFromDate +
-				", vendToDate=" + vendToDate +
 				", minOrderQty=" + minOrderQty +
 				", minPackQty=" + minPackQty +
 				", brand='" + brand + '\'' +
@@ -1168,9 +1119,9 @@ public class PublicInquiryItem implements Serializable {
 				", agreed=" + agreed +
 				", refusereason='" + refusereason + '\'' +
 				", decideStatus=" + decideStatus +
+				", decideDownStatus=" + decideDownStatus +
 				", invalidStatus=" + invalidStatus +
 				", custLap=" + custLap +
-				", erpDate=" + erpDate +
 				", date=" + date +
 				", overdue=" + overdue +
 				", invalid=" + invalid +
@@ -1198,6 +1149,10 @@ public class PublicInquiryItem implements Serializable {
 				", attachUrl='" + attachUrl + '\'' +
 				", attachName='" + attachName + '\'' +
 				", custCurrency='" + custCurrency + '\'' +
+				", replaceCmpCode='" + replaceCmpCode + '\'' +
+				", replaceSpec='" + replaceSpec + '\'' +
+				", replaceBrand='" + replaceBrand + '\'' +
+				", isReplace=" + isReplace +
 				'}';
 	}
 }

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

@@ -132,18 +132,6 @@ public class PublicInquiryItemInfo implements Serializable {
 	@Column(name = "id_todate")
 	private Date toDate;
 
-	/**
-	 * （卖家报的）有效期始
-	 */
-	@Column(name = "id_vendfromdate")
-	private Date vendFromDate;
-
-	/**
-	 * （卖家报的）有效期止
-	 */
-	@Column(name = "id_vendtodate")
-	private Date vendToDate;
-
 	/**
 	 * （卖家报的）最小订购量
 	 */
@@ -222,14 +210,6 @@ public class PublicInquiryItemInfo implements Serializable {
 	@Column(name = "id_custlap")
 	private Short custLap;
 
-	/**
-	 * 保存erp传入数据的时间
-	 * 
-	 * @return
-	 */
-	@Column(name = "id_erpdate")
-	private Date erpDate;
-
 	/**
 	 * 录入时间(取主表日期字段)
 	 *
@@ -566,22 +546,6 @@ public class PublicInquiryItemInfo implements Serializable {
 		this.toDate = toDate;
 	}
 
-	public Date getVendFromDate() {
-		return vendFromDate;
-	}
-
-	public void setVendFromDate(Date vendFromDate) {
-		this.vendFromDate = vendFromDate;
-	}
-
-	public Date getVendToDate() {
-		return vendToDate;
-	}
-
-	public void setVendToDate(Date vendToDate) {
-		this.vendToDate = vendToDate;
-	}
-
 	public Long getVendUU() {
 		return vendUU;
 	}
@@ -734,14 +698,6 @@ public class PublicInquiryItemInfo implements Serializable {
 		this.leadtime = leadtime;
 	}
 
-	public Date getErpDate() {
-		return erpDate;
-	}
-
-	public void setErpDate(Date erpDate) {
-		this.erpDate = erpDate;
-	}
-
 	public Date getDate() {
 		return date;
 	}
@@ -1023,8 +979,6 @@ public class PublicInquiryItemInfo implements Serializable {
 				", vendUserUU=" + vendUserUU +
 				", fromDate=" + fromDate +
 				", toDate=" + toDate +
-				", vendFromDate=" + vendFromDate +
-				", vendToDate=" + vendToDate +
 				", minOrderQty=" + minOrderQty +
 				", minPackQty=" + minPackQty +
 				", brand='" + brand + '\'' +
@@ -1038,7 +992,6 @@ public class PublicInquiryItemInfo implements Serializable {
 				", decideStatus=" + decideStatus +
 				", invalidStatus=" + invalidStatus +
 				", custLap=" + custLap +
-				", erpDate=" + erpDate +
 				", date=" + date +
 				", overdue=" + overdue +
 				", invalid=" + invalid +
@@ -1068,6 +1021,10 @@ public class PublicInquiryItemInfo implements Serializable {
 				", user=" + user +
 				", custCurrency='" + custCurrency + '\'' +
 				", refusereason='" + refusereason + '\'' +
+				", replaceCmpCode='" + replaceCmpCode + '\'' +
+				", replaceSpec='" + replaceSpec + '\'' +
+				", replaceBrand='" + replaceBrand + '\'' +
+				", isReplace=" + isReplace +
 				'}';
 	}
 }

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

@@ -116,24 +116,12 @@ public class PurcInquiry implements Serializable {
     @JoinTable(name = "purc$puinquiryattach", joinColumns = @JoinColumn(name = "in_id", referencedColumnName = "in_id") , inverseJoinColumns = @JoinColumn(name = "at_id", referencedColumnName = "at_id") )
     private Set<Attach> attachs;
 
-    /**
-     * 采纳结果
-     */
-    @Column(name = "in_checked")
-    private Short check;
-
     /**
      * 单据状态（已提交、在录入)
      */
     @Column(name = "in_enterystatus")
     private Integer enteryStatus;
 
-    /**
-     * 是否过期
-     */
-    @Column(name = "in_overdue", insertable = false, updatable = false)
-    private Short overdue;
-
     /**
      * 是否公开
      */
@@ -196,12 +184,6 @@ public class PurcInquiry implements Serializable {
     @Column(name = "in_amount")
     private Integer amount;
 
-    /**
-     * 是否是标准 1、 是 0 否
-     */
-    @Column(name = "in_standard")
-    private Integer standard;
-
     /**
      * 已报价明细数
      */
@@ -334,14 +316,6 @@ public class PurcInquiry implements Serializable {
         this.attachs = attachs;
     }
 
-    public Short getCheck() {
-        return check;
-    }
-
-    public void setCheck(Short check) {
-        this.check = check;
-    }
-
     public Integer getEnteryStatus() {
         return enteryStatus;
     }
@@ -350,14 +324,6 @@ public class PurcInquiry implements Serializable {
         this.enteryStatus = enteryStatus;
     }
 
-    public Short getOverdue() {
-        return overdue;
-    }
-
-    public void setOverdue(Short overdue) {
-        this.overdue = overdue;
-    }
-
     public Short getIsOpen() {
         return isOpen;
     }
@@ -438,14 +404,6 @@ public class PurcInquiry implements Serializable {
         this.amount = amount;
     }
 
-    public Integer getStandard() {
-        return standard;
-    }
-
-    public void setStandard(Integer standard) {
-        this.standard = standard == null ? 0 : standard;
-    }
-
     public Integer getQuotedAmount() {
         return quotedAmount;
     }

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

@@ -118,24 +118,12 @@ public class PurcInquiryInfo implements Serializable {
     @JoinTable(name = "purc$puinquiryattach", joinColumns = @JoinColumn(name = "in_id", referencedColumnName = "in_id") , inverseJoinColumns = @JoinColumn(name = "at_id", referencedColumnName = "at_id") )
     private Set<Attach> attachs;
 
-    /**
-     * 采纳结果
-     */
-    @Column(name = "in_checked")
-    private Short check;
-
     /**
      * 单据状态（已提交、在录入)
      */
     @Column(name = "in_enterystatus")
     private Integer enteryStatus;
 
-    /**
-     * 是否过期
-     */
-    @Column(name = "in_overdue", insertable = false, updatable = false)
-    private Short overdue;
-
     /**
      * 是否公开
      */
@@ -320,14 +308,6 @@ public class PurcInquiryInfo implements Serializable {
         this.attachs = attachs;
     }
 
-    public Short getCheck() {
-        return check;
-    }
-
-    public void setCheck(Short check) {
-        this.check = check;
-    }
-
     public Integer getEnteryStatus() {
         return enteryStatus;
     }
@@ -336,14 +316,6 @@ public class PurcInquiryInfo implements Serializable {
         this.enteryStatus = enteryStatus;
     }
 
-    public Short getOverdue() {
-        return overdue;
-    }
-
-    public void setOverdue(Short overdue) {
-        this.overdue = overdue;
-    }
-
     public Short getIsOpen() {
         return isOpen;
     }

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

@@ -133,18 +133,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_remark")
 	private String remark;
 
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "id_venduu")
-	private Long vendUU;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "id_venduseruu")
-	private Long vendUserUU;
-
 	/**
 	 * （买家预先提供的）有效期始
 	 */
@@ -157,48 +145,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_todate")
 	private Date toDate;
 
-	/**
-	 * （卖家报的）有效期始
-	 */
-	@Column(name = "id_vendfromdate")
-	private Date vendFromDate;
-
-	/**
-	 * （卖家报的）有效期止
-	 */
-	@Column(name = "id_vendtodate")
-	private Date vendToDate;
-
-	/**
-	 * （卖家报的）最小订购量
-	 */
-	@Column(name = "id_minorderqty")
-	private Double minOrderQty;
-
-	/**
-	 * （卖家报的）最小包装量
-	 */
-	@Column(name = "id_minpackqty")
-	private Double minPackQty;
-
-	/**
-	 * （卖家报的）物料品牌
-	 */
-	@Column(name = "id_brand")
-	private String brand;
-
-	/**
-	 * （卖家报的）供应商物料编号
-	 */
-	@Column(name = "id_vendorprodcode")
-	private String vendorprodcode;
-
-	/**
-	 * （卖家报的）交货周期（天数）
-	 */
-	@Column(name = "id_leadtime")
-	private Long leadtime;
-
 	/**
 	 * 分段报价明细
 	 */
@@ -219,12 +165,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_agreed")
 	private Short agreed;
 
-	/**
-	 * 是否买家已设置分段数
-	 */
-	@Column(name = "id_custlap")
-	private Short custLap;
-
 	/**
 	 * 是否已过期 1为已过期，0为未过期 已过期单据无法报价
 	 * 
@@ -233,14 +173,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_overdue")
 	private Short overdue;
 
-	/**
-	 * 是否已过期上传状态  待下载   已下载
-	 *
-	 * @return
-	 */
-	@Column(name = "id_overduedownloadstatus")
-	private Short overdueDownloadStatus;
-
 	/**
 	 * 来源ERP或B2B
 	 */
@@ -283,18 +215,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_unitprice")
 	private Double unitPrice;
 
-    /**
-     * 报价时间
-     */
-	@Column(name = "id_offertime")
-    private Date offerTime;
-
-	/**
-	 * 封装
-	 */
-	@Column(name = "id_sort")
-	private String sort;
-
 	/**
 	 * 产品生产日期
 	 */
@@ -389,13 +309,6 @@ public class PurcInquiryItem {
 		this.unitPrice = unitPrice;
 	}
 
-	public Date getOfferTime() {
-		return offerTime;
-	}
-
-	public void setOfferTime(Date offerTime) {
-		this.offerTime = offerTime;
-	}
 
     public String getUserCode() {
         return userCode;
@@ -445,22 +358,6 @@ public class PurcInquiryItem {
 		this.remark = remark;
 	}
 
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-	public Long getVendUserUU() {
-		return vendUserUU;
-	}
-
-	public void setVendUserUU(Long vendUserUU) {
-		this.vendUserUU = vendUserUU;
-	}
-
 	public Date getFromDate() {
 		return fromDate;
 	}
@@ -477,62 +374,6 @@ public class PurcInquiryItem {
 		this.toDate = toDate;
 	}
 
-	public Date getVendFromDate() {
-		return vendFromDate;
-	}
-
-	public void setVendFromDate(Date vendFromDate) {
-		this.vendFromDate = vendFromDate;
-	}
-
-	public Date getVendToDate() {
-		return vendToDate;
-	}
-
-	public void setVendToDate(Date vendToDate) {
-		this.vendToDate = vendToDate;
-	}
-
-	public Double getMinOrderQty() {
-		return minOrderQty;
-	}
-
-	public void setMinOrderQty(Double minOrderQty) {
-		this.minOrderQty = minOrderQty;
-	}
-
-	public Double getMinPackQty() {
-		return minPackQty;
-	}
-
-	public void setMinPackQty(Double minPackQty) {
-		this.minPackQty = minPackQty;
-	}
-
-	public String getBrand() {
-		return brand;
-	}
-
-	public void setBrand(String brand) {
-		this.brand = brand;
-	}
-
-	public String getVendorprodcode() {
-		return vendorprodcode;
-	}
-
-	public void setVendorprodcode(String vendorprodcode) {
-		this.vendorprodcode = vendorprodcode;
-	}
-
-	public Long getLeadtime() {
-		return leadtime;
-	}
-
-	public void setLeadtime(Long leadtime) {
-		this.leadtime = leadtime;
-	}
-
 	public List<PurchaseInquiryReply> getReplies() {
 		return replies;
 	}
@@ -557,14 +398,6 @@ public class PurcInquiryItem {
 		this.agreed = agreed;
 	}
 
-	public Short getCustLap() {
-		return custLap;
-	}
-
-	public void setCustLap(Short custLap) {
-		this.custLap = custLap;
-	}
-
 	public Short getOverdue() {
 		return overdue;
 	}
@@ -669,14 +502,6 @@ public class PurcInquiryItem {
 		this.enuu = enuu;
 	}
 
-    public String getSort() {
-        return sort;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
     public String getProduceDate() {
         return produceDate;
     }
@@ -724,57 +549,47 @@ public class PurcInquiryItem {
 		return null;
 	}
 
-    @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 + '\'' +
-                ", offerAmount=" + offerAmount +
-                ", encapsulation='" + encapsulation + '\'' +
-                ", endDate=" + endDate +
-                '}';
-    }
+	@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 + '\'' +
+				", fromDate=" + fromDate +
+				", toDate=" + toDate +
+				", replies=" + replies +
+				", status=" + status +
+				", agreed=" + agreed +
+				", overdue=" + overdue +
+				", source='" + source + '\'' +
+				", isOpen=" + isOpen +
+				", needquantity=" + needquantity +
+				", sourceid=" + sourceid +
+				", date=" + date +
+				", enuu=" + enuu +
+				", unitPrice=" + unitPrice +
+				", produceDate='" + produceDate + '\'' +
+				", offerAmount=" + offerAmount +
+				", encapsulation='" + encapsulation + '\'' +
+				", endDate=" + endDate +
+				", remainingTime=" + remainingTime +
+				", custCurrency='" + custCurrency + '\'' +
+				'}';
+	}
 
 }

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

@@ -130,25 +130,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_remark")
 	private String remark;
 
-	/**
-	 * 供应商UU
-	 */
-	@Column(name = "id_venduu")
-	private Long vendUU;
-
-    /**
-     * 报价企业信息
-     */
-    @OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
-    @JoinColumn(name = "id_venduu", insertable = false, updatable = false)
-    private Enterprise enterprise;
-
-	/**
-	 * 供应商联系人UU
-	 */
-	@Column(name = "id_venduseruu")
-	private Long vendUserUU;
-
 	/**
 	 * （买家预先提供的）有效期始
 	 */
@@ -161,48 +142,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_todate")
 	private Date toDate;
 
-	/**
-	 * （卖家报的）有效期始
-	 */
-	@Column(name = "id_vendfromdate")
-	private Date vendFromDate;
-
-	/**
-	 * （卖家报的）有效期止
-	 */
-	@Column(name = "id_vendtodate")
-	private Date vendToDate;
-
-	/**
-	 * （卖家报的）最小订购量
-	 */
-	@Column(name = "id_minorderqty")
-	private Double minOrderQty;
-
-	/**
-	 * （卖家报的）最小包装量
-	 */
-	@Column(name = "id_minpackqty")
-	private Double minPackQty;
-
-	/**
-	 * （卖家报的）物料品牌
-	 */
-	@Column(name = "id_brand")
-	private String brand;
-
-	/**
-	 * （卖家报的）供应商物料编号
-	 */
-	@Column(name = "id_vendorprodcode")
-	private String vendorprodcode;
-
-	/**
-	 * （卖家报的）交货周期（天数）
-	 */
-	@Column(name = "id_leadtime")
-	private Long leadtime;
-
 	/**
 	 * 分段报价明细
 	 */
@@ -217,12 +156,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_status")
 	private Short status;
 
-	/**
-	 * 是否买家已设置分段数
-	 */
-	@Column(name = "id_custlap")
-	private Short custLap;
-
 	/**
 	 * search项目进行是否已过期时实际根据主表中enddate与当前时间的比较获取，但是数据库无字段会报“标识符无效”的错误
 	 * 所以建立此字段，但是此字段不会赋值。
@@ -268,18 +201,6 @@ public class PurcInquiryItemInfo {
 	@Transient
 	private Long enuu;
 
-	/**
-	 * 报价时间
-	 */
-	@Column(name = "id_offertime")
-	private Date offerTime;
-
-	/**
-	 * 封装
-	 */
-	@Column(name = "id_sort")
-	private String sort;
-
 	/**
 	 * 产品生产日期
 	 */
@@ -449,30 +370,6 @@ public class PurcInquiryItemInfo {
 		this.remark = remark;
 	}
 
-	public Long getVendUU() {
-		return vendUU;
-	}
-
-	public void setVendUU(Long vendUU) {
-		this.vendUU = vendUU;
-	}
-
-    public Enterprise getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(Enterprise enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public Long getVendUserUU() {
-		return vendUserUU;
-	}
-
-	public void setVendUserUU(Long vendUserUU) {
-		this.vendUserUU = vendUserUU;
-	}
-
 	public Date getFromDate() {
 		return fromDate;
 	}
@@ -489,62 +386,6 @@ public class PurcInquiryItemInfo {
 		this.toDate = toDate;
 	}
 
-	public Date getVendFromDate() {
-		return vendFromDate;
-	}
-
-	public void setVendFromDate(Date vendFromDate) {
-		this.vendFromDate = vendFromDate;
-	}
-
-	public Date getVendToDate() {
-		return vendToDate;
-	}
-
-	public void setVendToDate(Date vendToDate) {
-		this.vendToDate = vendToDate;
-	}
-
-	public Double getMinOrderQty() {
-		return minOrderQty;
-	}
-
-	public void setMinOrderQty(Double minOrderQty) {
-		this.minOrderQty = minOrderQty;
-	}
-
-	public Double getMinPackQty() {
-		return minPackQty;
-	}
-
-	public void setMinPackQty(Double minPackQty) {
-		this.minPackQty = minPackQty;
-	}
-
-	public String getBrand() {
-		return brand;
-	}
-
-	public void setBrand(String brand) {
-		this.brand = brand;
-	}
-
-	public String getVendorprodcode() {
-		return vendorprodcode;
-	}
-
-	public void setVendorprodcode(String vendorprodcode) {
-		this.vendorprodcode = vendorprodcode;
-	}
-
-	public Long getLeadtime() {
-		return leadtime;
-	}
-
-	public void setLeadtime(Long leadtime) {
-		this.leadtime = leadtime;
-	}
-
 	public List<PurchaseInquiryReply> getReplies() {
 		return replies;
 	}
@@ -569,14 +410,6 @@ public class PurcInquiryItemInfo {
 		this.agreed = agreed;
 	}
 
-	public Short getCustLap() {
-		return custLap;
-	}
-
-	public void setCustLap(Short custLap) {
-		this.custLap = custLap;
-	}
-
 	public Short getOverdue() {
 		return overdue;
 	}
@@ -681,14 +514,6 @@ public class PurcInquiryItemInfo {
 		this.enuu = enuu;
 	}
 
-	public Date getOfferTime() {
-		return offerTime;
-	}
-
-	public void setOfferTime(Date offerTime) {
-		this.offerTime = offerTime;
-	}
-
 	public String getUserName() {
 		return userName;
 	}
@@ -713,14 +538,6 @@ public class PurcInquiryItemInfo {
 		this.userCode = userCode;
 	}
 
-	public String getSort() {
-		return sort;
-	}
-
-	public void setSort(String sort) {
-		this.sort = sort;
-	}
-
 	public String getProduceDate() {
 		return produceDate;
 	}
@@ -813,57 +630,50 @@ public class PurcInquiryItemInfo {
 	}
 
 	@Override
-    public String toString() {
-        return "PurcInquiryItemInfo{" +
-                "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 +
-                ", enterprise=" + enterprise +
-                ", 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 +
-                ", offerTime=" + offerTime +
-                ", sort='" + sort + '\'' +
-                ", produceDate='" + produceDate + '\'' +
-                ", encapsulation='" + encapsulation + '\'' +
-                ", unitPrice=" + unitPrice +
-                ", endDate=" + endDate +
-                ", remainingTime=" + remainingTime +
-                ", offerAmount=" + offerAmount +
-                '}';
-    }
+	public String toString() {
+		return "PurcInquiryItemInfo{" +
+				"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 + '\'' +
+				", fromDate=" + fromDate +
+				", toDate=" + toDate +
+				", replies=" + replies +
+				", status=" + status +
+				", overdue=" + overdue +
+				", source='" + source + '\'' +
+				", isOpen=" + isOpen +
+				", needquantity=" + needquantity +
+				", sourceid=" + sourceid +
+				", date=" + date +
+				", enuu=" + enuu +
+				", produceDate='" + produceDate + '\'' +
+				", encapsulation='" + encapsulation + '\'' +
+				", unitPrice=" + unitPrice +
+				", endDate=" + endDate +
+				", remainingTime=" + remainingTime +
+				", offerAmount=" + offerAmount +
+				", quoted=" + quoted +
+				", quteId=" + quteId +
+				", agreed=" + agreed +
+				", qutations=" + qutations +
+				", quotation=" + quotation +
+				", custCurrency='" + custCurrency + '\'' +
+				", allotStatus=" + allotStatus +
+				'}';
+	}
 }