询价实体多余字段删除

src/main/java/com/uas/ps/inquiry/entity/BatchInquiry.java

@@ -248,15 +248,13 @@ public class BatchInquiry {
         PurcInquiry inquiry = new PurcInquiry();
         inquiry.setEnteryStatus(Status.ENABLED.value());
         inquiry.setCode(this.getBi_code());
-        inquiry.setPriceType(this.bi_pricetype);
+//        inquiry.setPriceType(this.bi_pricetype);
         inquiry.setDate(this.bi_date);
         inquiry.setEndDate(this.bi_enddate);
         inquiry.setEnvironment(this.bi_environment);
         inquiry.setInquirytype("公共询价");
-        inquiry.setIsOpen(Constant.YES);
         inquiry.setRemark(this.bi_remark);
         inquiry.setRecorder(this.bi_recorder);
-        inquiry.setAuditor(this.bi_auditor);
         inquiry.setRecorderUU(this.bi_recorduu);
         inquiry.setErpdate(new Date());
         inquiry.setErpid(this.bi_id);

src/main/java/com/uas/ps/inquiry/entity/InquiryDetail.java

@@ -374,7 +374,6 @@ public class InquiryDetail {
         this.id_prodcode = item.getProdCode();
         this.id_currency = item.getCurrency();
         this.ve_uu = item.getVendUU();
-        this.id_remark = item.getRemark();
         if (this.id_prodcode == null && item.getProduct() != null) {
         	this.id_prodcode = item.getProduct().getCode();
 		}

src/main/java/com/uas/ps/inquiry/entity/InquiryDetailInfo.java

@@ -40,11 +40,11 @@ public class InquiryDetailInfo {
 	 * 录入人
 	 */
 	private String recorder;
-
-	/**
-	 * 审核人
-	 */
-	private String auditor;
+//
+//	/**
+//	 * 审核人
+//	 */
+//	private String auditor;
 
 	/**
 	 * 报价截止日期
@@ -61,10 +61,10 @@ public class InquiryDetailInfo {
 	 */
 	private String environment;
 
-	/**
-	 * 价格类型
-	 */
-	private String priceType;
+//	/**
+//	 * 价格类型
+//	 */
+//	private String priceType;
 
 	/**
 	 * 来源系统单据ID
@@ -76,22 +76,22 @@ public class InquiryDetailInfo {
 	 */
 	private Set<com.uas.ps.inquiry.model.Attach> attachs;
 
-	/**
-	 * 客户已提交
-	 */
-	private Short check;
+//	/**
+//	 * 客户已提交
+//	 */
+//	private Short check;
 
 	/**
 	 * 是否过期
 	 */
 	private Short overdue;
 
-	/**
-	 * 是否公开<br>
-	 * 1、 公共<br>
-	 * 0、 不用开
-	 */
-	private Short isOpen;
+//	/**
+//	 * 是否公开<br>
+//	 * 1、 公共<br>
+//	 * 0、 不用开
+//	 */
+//	private Short isOpen;
 
 	/**
 	 * 应用来源，主要是为了平台公共询价做处理
@@ -174,14 +174,6 @@ public class InquiryDetailInfo {
 		this.recorder = recorder;
 	}
 
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
 	public Date getEndDate() {
 		return endDate;
 	}
@@ -206,14 +198,6 @@ public class InquiryDetailInfo {
 		this.environment = environment;
 	}
 
-	public String getPriceType() {
-		return priceType;
-	}
-
-	public void setPriceType(String priceType) {
-		this.priceType = priceType;
-	}
-
 	public Long getSourceId() {
 		return sourceId;
 	}
@@ -230,14 +214,6 @@ public class InquiryDetailInfo {
 		this.attachs = attachs;
 	}
 
-	public Short getCheck() {
-		return check;
-	}
-
-	public void setCheck(Short check) {
-		this.check = check;
-	}
-
 	public Short getOverdue() {
 		return overdue;
 	}
@@ -246,14 +222,6 @@ public class InquiryDetailInfo {
 		this.overdue = overdue;
 	}
 
-	public Short getIsOpen() {
-		return isOpen;
-	}
-
-	public void setIsOpen(Short isOpen) {
-		this.isOpen = isOpen;
-	}
-
 	public String getSourceApp() {
 		return sourceApp;
 	}

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

@@ -76,12 +76,6 @@ public class PublicInquiry implements Serializable {
 	@Column(name = "in_recorder")
 	private String recorder;
 
-	/**
-	 * 审核人
-	 */
-	@Column(name = "in_auditor")
-	private String auditor;
-
 	/**
 	 * 报价截止日期
 	 */
@@ -100,12 +94,6 @@ public class PublicInquiry implements Serializable {
 	@Column(name = "in_environment")
 	private String environment;
 
-	/**
-	 * 价格类型
-	 */
-	@Column(name = "in_pricetype")
-	private String priceType;
-
 	/**
 	 * 询价明细
 	 */
@@ -127,26 +115,12 @@ public class PublicInquiry implements Serializable {
 	@JoinTable(name = "publicinquiry$attach", joinColumns = @JoinColumn(name = "in_id", referencedColumnName = "in_id"), inverseJoinColumns = @JoinColumn(name="at_id", referencedColumnName = "at_id"))
 	private Set<Attach> attachs;
 
-	/**
-	 * 客户已提交 1 为已提交 否则为未提交
-	 */
-	@Column(name = "in_checked")
-	private Short check;
-
 	/**
 	 * 是否过期 1 为过期 否则为未过期
 	 */
 	@Column(name = "in_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
-	/**
-	 * 是否公开<br>
-	 * 1、 公共<br>
-	 * 0、 不用开
-	 */
-	@Column(name = "in_isopen")
-	private Short isOpen;
-
 	/**
 	 * 应用来源，主要是为了平台公共询价做处理
 	 */
@@ -173,12 +147,6 @@ public class PublicInquiry implements Serializable {
 	@Column(name = "in_inquirytype")
 	private String inquirytype;
 
-	/**
-	 * 询价种类（公共或其他）
-	 */
-	@Column(name = "in_kind")
-	private String kind;
-
 	@Transient
 	private Long quteId;
 
@@ -194,14 +162,6 @@ public class PublicInquiry implements Serializable {
 		return code;
 	}
 
-	public String getPriceType() {
-		return priceType;
-	}
-
-	public void setPriceType(String priceType) {
-		this.priceType = priceType;
-	}
-
 	public void setCode(String code) {
 		this.code = code;
 	}
@@ -222,14 +182,6 @@ public class PublicInquiry implements Serializable {
 		this.recorder = recorder;
 	}
 
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
 	public Date getEndDate() {
 		return endDate;
 	}
@@ -312,14 +264,6 @@ public class PublicInquiry implements Serializable {
 		this.environment = environment;
 	}
 
-	public Short getCheck() {
-		return check;
-	}
-
-	public void setCheck(Short check) {
-		this.check = check;
-	}
-
 	public Short getOverdue() {
 		return overdue;
 	}
@@ -328,14 +272,6 @@ public class PublicInquiry implements Serializable {
 		this.overdue = overdue;
 	}
 
-	public Short getIsOpen() {
-		return isOpen;
-	}
-
-	public void setIsOpen(Short isOpen) {
-		this.isOpen = isOpen;
-	}
-
 	public String getSourceApp() {
 		return sourceApp;
 	}
@@ -368,14 +304,6 @@ public class PublicInquiry implements Serializable {
 		this.inquirytype = inquirytype;
 	}
 
-	public String getKind() {
-		return kind;
-	}
-
-	public void setKind(String kind) {
-		this.kind = kind;
-	}
-
 	public Long getQuteId() {
 		return quteId;
 	}
@@ -388,7 +316,6 @@ public class PublicInquiry implements Serializable {
 	}
 
 	public PublicInquiry(PurcInquiryInfo inquiry) {
-        this.auditor = inquiry.getAuditor();
         if (null != inquiry.getAttachs()) {
         	Set<Attach> attachSet = new HashSet<Attach>();
         	Attach attach = new Attach();
@@ -409,8 +336,6 @@ public class PublicInquiry implements Serializable {
         this.environment = inquiry.getEnvironment();
         this.inquirytype = inquiry.getInquirytype();
         this.invoice = inquiry.getInvoice();
-        this.isOpen = inquiry.getIsOpen();
-        this.priceType = inquiry.getPriceType();
         this.recorderUU = inquiry.getRecorderUU();
         this.recorder = inquiry.getRecorder();
         this.sourceApp = inquiry.getSourceapp();

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

@@ -74,12 +74,6 @@ public class PublicInquiryInfo implements Serializable {
 	@Column(name = "in_recorder")
 	private String recorder;
 
-	/**
-	 * 审核人
-	 */
-	@Column(name = "in_auditor")
-	private String auditor;
-
 	/**
 	 * 报价截止日期
 	 */
@@ -98,12 +92,6 @@ public class PublicInquiryInfo implements Serializable {
 	@Column(name = "in_environment")
 	private String environment;
 
-	/**
-	 * 价格类型
-	 */
-	@Column(name = "in_pricetype")
-	private String priceType;
-
 	/**
 	 * 询价明细
 	 */
@@ -118,33 +106,12 @@ public class PublicInquiryInfo implements Serializable {
 	@Column(name = "in_sourceid")
 	private Long sourceId;
 
-	/**
-	 * 附件
-	 */
-//	@OneToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
-//	@JoinTable(name = "publicinquiry$attach", 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_overdue", insertable = false, updatable = false)
 	private Short overdue;
 
-	/**
-	 * 是否公开<br>
-	 * 1、 公共<br>
-	 * 0、 不用开
-	 */
-	@Column(name = "in_isopen")
-	private Short isOpen;
-
 	/**
 	 * 应用来源，主要是为了平台公共询价做处理
 	 */
@@ -171,12 +138,6 @@ public class PublicInquiryInfo implements Serializable {
 	@Column(name = "in_inquirytype")
 	private String inquirytype;
 
-	/**
-	 * 询价种类（公共或其他）
-	 */
-	@Column(name = "in_kind")
-	private String kind;
-
 	public Long getId() {
 		return id;
 	}
@@ -189,14 +150,6 @@ public class PublicInquiryInfo implements Serializable {
 		return code;
 	}
 
-	public String getPriceType() {
-		return priceType;
-	}
-
-	public void setPriceType(String priceType) {
-		this.priceType = priceType;
-	}
-
 	public void setCode(String code) {
 		this.code = code;
 	}
@@ -217,14 +170,6 @@ public class PublicInquiryInfo implements Serializable {
 		this.recorder = recorder;
 	}
 
-	public String getAuditor() {
-		return auditor;
-	}
-
-	public void setAuditor(String auditor) {
-		this.auditor = auditor;
-	}
-
 	public Date getEndDate() {
 		return endDate;
 	}
@@ -291,14 +236,6 @@ public class PublicInquiryInfo implements Serializable {
 		this.inquiryItems = inquiryItems;
 	}
 
-//	public Set<Attach> getAttachs() {
-//		return attachs;
-//	}
-//
-//	public void setAttachs(Set<Attach> attachs) {
-//		this.attachs = attachs;
-//	}
-
 	public String getEnvironment() {
 		return environment;
 	}
@@ -307,14 +244,6 @@ public class PublicInquiryInfo implements Serializable {
 		this.environment = environment;
 	}
 
-	public Short getCheck() {
-		return check;
-	}
-
-	public void setCheck(Short check) {
-		this.check = check;
-	}
-
 	public Short getOverdue() {
 		return overdue;
 	}
@@ -323,14 +252,6 @@ public class PublicInquiryInfo implements Serializable {
 		this.overdue = overdue;
 	}
 
-	public Short getIsOpen() {
-		return isOpen;
-	}
-
-	public void setIsOpen(Short isOpen) {
-		this.isOpen = isOpen;
-	}
-
 	public String getSourceApp() {
 		return sourceApp;
 	}
@@ -362,12 +283,4 @@ public class PublicInquiryInfo implements Serializable {
 	public void setInquirytype(String inquirytype) {
 		this.inquirytype = inquirytype;
 	}
-
-	public String getKind() {
-		return kind;
-	}
-
-	public void setKind(String kind) {
-		this.kind = kind;
-	}
 }

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

@@ -69,12 +69,6 @@ public class PublicInquiryItem implements Serializable {
     @Column(name = "id_usertel")
     private String userTel;
 
-    /**
-     * 联系人编号
-     */
-    @Column(name = "id_usercode")
-    private String userCode;
-
     /**
      * 产品id
      */
@@ -99,12 +93,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_taxrate")
 	private Float taxrate;
 
-	/**
-	 * 备注
-	 */
-	@Column(name = "id_remark")
-	private String remark;
-
 	/**
 	 * 供应商UU
 	 */
@@ -137,12 +125,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_fromdate")
 	private Date fromDate;
 
-	/**
-	 * （买家预先提供的）有效期止
-	 */
-	@Column(name = "id_todate")
-	private Date toDate;
-
 	/**
 	 * （卖家报的）最小订购量
 	 */
@@ -155,12 +137,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_minpackqty")
 	private Double minPackQty;
 
-	/**
-	 * （卖家报的）物料品牌
-	 */
-	@Column(name = "id_brand")
-	private String brand;
-
 	/**
 	 * （卖家报的）供应商物料编号
 	 */
@@ -211,7 +187,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_agreed")
 	private Short agreed;
 
-
 	/**
 	 * 拒绝采纳理由
 	 */
@@ -236,12 +211,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_invalidstatus")
 	private Short invalidStatus;
 
-	/**
-	 * 是否买家已设置分段数
-	 */
-	@Column(name = "id_custlap")
-	private Short custLap;
-
 	/**
 	 * 录入时间
 	 *
@@ -249,12 +218,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_date")
 	private Date date;
 
-	/**
-	 *   是否已过期
-	 */
-	@Column(name = "id_overdue", insertable = false, updatable = false)
-	private Short overdue;
-
 	/**
 	 * 保存询价的应用
 	 */
@@ -292,12 +255,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_erpstatus")
     private Short erpstatus;
 
-	/**
-	 * 询价种类
-	 */
-	@Column(name = "id_kind")
-	private String kind;
-
 	/*这下面是供应商报价时存的相关信息；
 	* 因为存在非客户报价，而且公共服务里面没有企业信息，现存入相关字段，后续处理*/
 	/**
@@ -318,24 +275,6 @@ public class PublicInquiryItem implements Serializable {
 	@Column(name = "id_offertime")
 	private Date offerTime;
 
-    /**
-     * 单价预算
-     */
-    @Column(name = "id_unitprice")
-    private Double unitPrice;
-
-	/**
-	 * 产品生产日期
-	 */
-	@Column(name = "id_producedate")
-	private String produceDate;
-
-    /**
-     * 封装
-     */
-    @Column(name = "id_encapsulation")
-    private String encapsulation;
-
     /**
      * 报价截止日期
      */
@@ -363,12 +302,6 @@ public class PublicInquiryItem implements Serializable {
     @Column(name = "id_prodspec")
     private String spec;
 
-    /**
-     * 单位
-     */
-    @Column(name = "id_unit")
-    private String unit;
-
     /**
      * 型号
      */
@@ -391,12 +324,6 @@ public class PublicInquiryItem implements Serializable {
 	@Transient
 	private Long remainingTime;
 
-	/**
-	 * 审批状态，公共询价单采用明细单独做审批状态
-	 */
-	@Column(name = "id_checked")
-	private Short checked;
-
 	/**
 	 * 附件链接
 	 */
@@ -530,14 +457,6 @@ public class PublicInquiryItem implements Serializable {
 		this.taxrate = taxrate;
 	}
 
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
 	public Date getFromDate() {
 		return fromDate;
 	}
@@ -546,14 +465,6 @@ public class PublicInquiryItem implements Serializable {
 		this.fromDate = fromDate;
 	}
 
-	public Date getToDate() {
-		return toDate;
-	}
-
-	public void setToDate(Date toDate) {
-		this.toDate = toDate;
-	}
-
 	public Long getVendUU() {
 		return vendUU;
 	}
@@ -666,14 +577,6 @@ public class PublicInquiryItem implements Serializable {
 		this.decideDownStatus = decideDownStatus;
 	}
 
-	public Short getCustLap() {
-		return custLap;
-	}
-
-	public void setCustLap(Short custLap) {
-		this.custLap = custLap;
-	}
-
 	public Long getUserUU() {
 		return userUU;
 	}
@@ -698,22 +601,6 @@ public class PublicInquiryItem implements Serializable {
         this.userTel = userTel;
     }
 
-    public String getUserCode() {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode) {
-        this.userCode = userCode;
-    }
-
-    public String getBrand() {
-		return brand;
-	}
-
-	public void setBrand(String brand) {
-		this.brand = brand;
-	}
-
 	public String getVendorprodcode() {
 		return vendorprodcode;
 	}
@@ -778,14 +665,6 @@ public class PublicInquiryItem implements Serializable {
 		this.needquantity = needquantity;
 	}
 
-	public Short getOverdue() {
-		return overdue;
-	}
-
-	public void setOverdue(Short overdue) {
-		this.overdue = overdue;
-	}
-
     public Short getErpstatus() {
         return erpstatus;
     }
@@ -795,14 +674,6 @@ public class PublicInquiryItem implements Serializable {
 	    this.erpstatus = erpstatus ;
     }
 
-	public String getKind() {
-		return kind;
-	}
-
-	public void setKind(String kind) {
-		this.kind = kind;
-	}
-
 	public String getVendName() {
 		return vendName;
 	}
@@ -827,30 +698,6 @@ public class PublicInquiryItem implements Serializable {
 		this.offerTime = offerTime;
 	}
 
-    public Double getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(Double unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
-    public String getProduceDate() {
-		return produceDate;
-	}
-
-	public void setProduceDate(String produceDate) {
-		this.produceDate = produceDate;
-	}
-
-    public String getEncapsulation() {
-        return encapsulation;
-    }
-
-    public void setEncapsulation(String encapsulation) {
-        this.encapsulation = encapsulation;
-    }
-
     public Date getEndDate() {
         return endDate;
     }
@@ -875,14 +722,6 @@ public class PublicInquiryItem implements Serializable {
         this.spec = spec;
     }
 
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
     public String getCmpCode() {
         return cmpCode;
     }
@@ -906,14 +745,6 @@ public class PublicInquiryItem implements Serializable {
 		return null;
 	}
 
-	public Short getChecked() {
-		return checked;
-	}
-
-	public void setChecked(Short checked) {
-		this.checked = checked;
-	}
-
 	public String getAttachUrl() {
 		return attachUrl;
 	}
@@ -998,28 +829,21 @@ public class PublicInquiryItem implements Serializable {
 	public PublicInquiryItem(PurcInquiryItemInfo item) {
 		this.date = item.getDate();
 		this.offerTime = new Date(System.currentTimeMillis());
-//		this.agreed = item.getAgreed();
 		this.sourceId = item.getId();
 		this.currency = item.getCurrency();
 		this.productId = item.getProductId();
 		this.needquantity = item.getNeedquantity();
 		this.fromDate = item.getFromDate();
 		this.taxrate = item.getTaxrate();
-		this.toDate = item.getToDate();
 		this.id = item.getId();
 		this.userName = item.getUserName();
-		this.userCode = item.getUserCode();
 		this.userTel = item.getUserTel();
 		this.prodCode = item.getProdCode();
 		this.source = item.getSource();
-		this.unitPrice = item.getUnitPrice();
-		this.produceDate = item.getProduceDate();
 		this.endDate = item.getEndDate();
-		this.encapsulation = item.getEncapsulation();
 		this.prodTitle = item.getProdTitle();
 		this.spec = item.getSpec();
 		this.inbrand = item.getInbrand();
-		this.unit = item.getUnit();
 		this.cmpCode = item.getCmpCode();
 	}
 
@@ -1034,9 +858,10 @@ public class PublicInquiryItem implements Serializable {
 	public String replyDescription() {
 		if (!CollectionUtils.isEmpty(this.replies)) {
 			StringBuffer sb = new StringBuffer();
-			for (PublicInquiryReply reply : this.replies)
+			for (PublicInquiryReply reply : this.replies) {
 				sb.append("分段数：").append(reply.getLapQty()).append("，").append("价格：").append(reply.getPrice())
 						.append("；");
+			}
 			return sb.toString();
 		}
 		return null;
@@ -1062,11 +887,9 @@ public class PublicInquiryItem implements Serializable {
 					.compare(this.inquiry.getEndDate(), new Date(),
 							DateUtils.COMPARE_DAY) >= 0
 					&& (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
-							&& (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES)
 							&& this.agreed == null) && this.erpstatus != Constant.NO);
 		}
 		return null != status && (this.status == Status.NOT_REPLY.value() || (this.status == Status.REPLIED.value()
-				&& (null != this.inquiry && (this.inquiry.getCheck() == null || this.inquiry.getCheck() != Constant.YES))
 				&& this.agreed == null) && this.erpstatus != Constant.NO);
 	}
 
@@ -1092,21 +915,17 @@ public class PublicInquiryItem implements Serializable {
 				", userUU=" + userUU +
 				", userName='" + userName + '\'' +
 				", userTel='" + userTel + '\'' +
-				", userCode='" + userCode + '\'' +
 				", productId=" + productId +
 				", product=" + product +
 				", currency='" + currency + '\'' +
 				", taxrate=" + taxrate +
-				", remark='" + remark + '\'' +
 				", vendUU=" + vendUU +
 				", enterprise=" + enterprise +
 				", vendUserUU=" + vendUserUU +
 				", user=" + user +
 				", fromDate=" + fromDate +
-				", toDate=" + toDate +
 				", minOrderQty=" + minOrderQty +
 				", minPackQty=" + minPackQty +
-				", brand='" + brand + '\'' +
 				", vendorprodcode='" + vendorprodcode + '\'' +
 				", leadtime=" + leadtime +
 				", replies=" + replies +
@@ -1119,30 +938,22 @@ public class PublicInquiryItem implements Serializable {
 				", decideStatus=" + decideStatus +
 				", decideDownStatus=" + decideDownStatus +
 				", invalidStatus=" + invalidStatus +
-				", custLap=" + custLap +
 				", date=" + date +
-				", overdue=" + overdue +
 				", source='" + source + '\'' +
 				", qutoApp='" + qutoApp + '\'' +
 				", attaches=" + attaches +
 				", needquantity=" + needquantity +
 				", erpstatus=" + erpstatus +
-				", kind='" + kind + '\'' +
 				", vendName='" + vendName + '\'' +
 				", businessCode='" + businessCode + '\'' +
 				", offerTime=" + offerTime +
-				", unitPrice=" + unitPrice +
-				", produceDate='" + produceDate + '\'' +
-				", encapsulation='" + encapsulation + '\'' +
 				", endDate=" + endDate +
 				", prodCode='" + prodCode + '\'' +
 				", prodTitle='" + prodTitle + '\'' +
 				", spec='" + spec + '\'' +
-				", unit='" + unit + '\'' +
 				", cmpCode='" + cmpCode + '\'' +
 				", inbrand='" + inbrand + '\'' +
 				", remainingTime=" + remainingTime +
-				", checked=" + checked +
 				", attachUrl='" + attachUrl + '\'' +
 				", attachName='" + attachName + '\'' +
 				", custCurrency='" + custCurrency + '\'' +

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

@@ -72,12 +72,6 @@ public class PurcInquiry implements Serializable {
     @Column(name = "in_recorder")
     private String recorder;
 
-    /**
-     * 审核人
-     */
-    @Column(name = "in_auditor")
-    private String auditor;
-
     /**
      * 报价截止日期
      */
@@ -96,12 +90,6 @@ public class PurcInquiry implements Serializable {
     @Column(name = "in_environment")
     private String environment;
 
-    /**
-     * 价格类型
-     */
-    @Column(name = "in_pricetype")
-    private String priceType;
-
     /**
      * 询价明细
      */
@@ -122,12 +110,6 @@ public class PurcInquiry implements Serializable {
     @Column(name = "in_enterystatus")
     private Integer enteryStatus;
 
-    /**
-     * 是否公开
-     */
-    @Column(name = "in_isopen")
-    private Short isOpen;
-
     /**
      * 收货地址
      */
@@ -284,14 +266,6 @@ public class PurcInquiry implements Serializable {
         this.recorder = recorder;
     }
 
-    public String getAuditor() {
-        return auditor;
-    }
-
-    public void setAuditor(String auditor) {
-        this.auditor = auditor;
-    }
-
     public Date getEndDate() {
         return endDate;
     }
@@ -316,14 +290,6 @@ public class PurcInquiry implements Serializable {
         this.environment = environment;
     }
 
-    public String getPriceType() {
-        return priceType;
-    }
-
-    public void setPriceType(String priceType) {
-        this.priceType = priceType;
-    }
-
     public Set<PurcInquiryItem> getInquiryItems() {
         return inquiryItems;
     }
@@ -348,14 +314,6 @@ public class PurcInquiry implements Serializable {
         this.enteryStatus = enteryStatus;
     }
 
-    public Short getIsOpen() {
-        return isOpen;
-    }
-
-    public void setIsOpen(Short isOpen) {
-        this.isOpen = isOpen;
-    }
-
     public String getShip() {
         return ship;
     }

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

@@ -74,12 +74,6 @@ public class PurcInquiryInfo implements Serializable {
     @Column(name = "in_recorder")
     private String recorder;
 
-    /**
-     * 审核人
-     */
-    @Column(name = "in_auditor")
-    private String auditor;
-
     /**
      * 报价截止日期
      */
@@ -98,12 +92,6 @@ public class PurcInquiryInfo implements Serializable {
     @Column(name = "in_environment")
     private String environment;
 
-    /**
-     * 价格类型
-     */
-    @Column(name = "in_pricetype")
-    private String priceType;
-
     /**
      * 询价明细
      */
@@ -124,12 +112,6 @@ public class PurcInquiryInfo implements Serializable {
     @Column(name = "in_enterystatus")
     private Integer enteryStatus;
 
-    /**
-     * 是否公开
-     */
-    @Column(name = "in_isopen")
-    private Short isOpen;
-
     /**
      * 收货地址
      */
@@ -262,14 +244,6 @@ public class PurcInquiryInfo implements Serializable {
         this.recorder = recorder;
     }
 
-    public String getAuditor() {
-        return auditor;
-    }
-
-    public void setAuditor(String auditor) {
-        this.auditor = auditor;
-    }
-
     public Date getEndDate() {
         return endDate;
     }
@@ -294,14 +268,6 @@ public class PurcInquiryInfo implements Serializable {
         this.environment = environment;
     }
 
-    public String getPriceType() {
-        return priceType;
-    }
-
-    public void setPriceType(String priceType) {
-        this.priceType = priceType;
-    }
-
     @JsonIgnore
     @JSONField(serialize = false)
     public Set<PurcInquiryItemInfo> getInquiryItems() {
@@ -328,14 +294,6 @@ public class PurcInquiryInfo implements Serializable {
         this.enteryStatus = enteryStatus;
     }
 
-    public Short getIsOpen() {
-        return isOpen;
-    }
-
-    public void setIsOpen(Short isOpen) {
-        this.isOpen = isOpen;
-    }
-
     public String getShip() {
         return ship;
     }

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

@@ -53,12 +53,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_usertel")
 	private String userTel;
 
-    /**
-     * 联系人编号
-     */
-	@Column(name = "id_usercode")
-    private String userCode;
-
 	/**
 	 * 产品id
 	 */
@@ -94,12 +88,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_prodspec")
 	private String spec;
 
-	/**
-	 * 单位
-	 */
-	@Column(name = "id_unit")
-	private String unit;
-
 	/**
 	 * 型号
 	 */
@@ -127,24 +115,12 @@ public class PurcInquiryItem {
 	@Column(name = "id_taxrate")
 	private Float taxrate;
 
-	/**
-	 * 备注
-	 */
-	@Column(name = "id_remark")
-	private String remark;
-
 	/**
 	 * （买家预先提供的）有效期始
 	 */
 	@Column(name = "id_fromdate")
 	private Date fromDate;
 
-	/**
-	 * （买家预先提供的）有效期止
-	 */
-	@Column(name = "id_todate")
-	private Date toDate;
-
 	/**
 	 * 分段报价明细
 	 */
@@ -179,12 +155,6 @@ public class PurcInquiryItem {
 	@Column(name = "id_source")
 	private String source;
 
-	/**
-	 * 是否公开
-	 */
-	@Column(name = "id_isopen")
-	private Short isOpen;
-
 	/**
 	 * 需求数量
 	 */
@@ -209,30 +179,12 @@ public class PurcInquiryItem {
 	@Column(name = "id_enuu")
 	private Long enuu;
 
-	/**
-	 * 单价预算
-	 */
-	@Column(name = "id_unitprice")
-	private Double unitPrice;
-
-	/**
-	 * 产品生产日期
-	 */
-	@Column(name = "id_producedate")
-	private String produceDate;
-
     /**
      * 物料报价数量（记录多少人或企业对该物料进行报价）
      */
 	@Column(name = "id_offeramount")
     private Integer offerAmount;
 
-    /**
-     * 封装
-     */
-	@Column(name = "id_encapsulation")
-    private String encapsulation;
-
     /**
      * 截止日期
      */
@@ -245,12 +197,6 @@ public class PurcInquiryItem {
 	@Transient
 	private Long remainingTime;
 
-	/**
-	 * 买家发出公共询价单时录入的币别
-	 */
-	@Column(name = "id_cust_currency")
-	private String custCurrency;
-
 	/**
 	 * 是否有效  1有效  0 无效
 	 */
@@ -307,23 +253,6 @@ public class PurcInquiryItem {
 		this.userTel = userTel;
 	}
 
-	public Double getUnitPrice() {
-		return unitPrice;
-	}
-
-	public void setUnitPrice(Double unitPrice) {
-		this.unitPrice = unitPrice;
-	}
-
-
-    public String getUserCode() {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode) {
-        this.userCode = userCode;
-    }
-
     public Long getProductId() {
 		return productId;
 	}
@@ -356,14 +285,6 @@ public class PurcInquiryItem {
 		this.taxrate = taxrate;
 	}
 
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
 	public Date getFromDate() {
 		return fromDate;
 	}
@@ -372,14 +293,6 @@ public class PurcInquiryItem {
 		this.fromDate = fromDate;
 	}
 
-	public Date getToDate() {
-		return toDate;
-	}
-
-	public void setToDate(Date toDate) {
-		this.toDate = toDate;
-	}
-
 	public List<PurchaseInquiryReply> getReplies() {
 		return replies;
 	}
@@ -420,14 +333,6 @@ public class PurcInquiryItem {
 		this.source = source;
 	}
 
-	public Short getIsOpen() {
-		return isOpen;
-	}
-
-	public void setIsOpen(Short isOpen) {
-		this.isOpen = isOpen;
-	}
-
 	public String getProdCode() {
 		return prodCode;
 	}
@@ -452,14 +357,6 @@ public class PurcInquiryItem {
 		this.spec = spec;
 	}
 
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
 	public String getCmpCode() {
 		return cmpCode;
 	}
@@ -508,14 +405,6 @@ public class PurcInquiryItem {
 		this.enuu = enuu;
 	}
 
-    public String getProduceDate() {
-        return produceDate;
-    }
-
-    public void setProduceDate(String produceDate) {
-        this.produceDate = produceDate;
-    }
-
     public Integer getOfferAmount() {
         return offerAmount;
     }
@@ -524,14 +413,6 @@ public class PurcInquiryItem {
         this.offerAmount = offerAmount;
     }
 
-    public String getEncapsulation() {
-        return encapsulation;
-    }
-
-    public void setEncapsulation(String encapsulation) {
-        this.encapsulation = encapsulation;
-    }
-
     public Date getEndDate() {
         return endDate;
     }
@@ -540,14 +421,6 @@ public class PurcInquiryItem {
         this.endDate = endDate;
     }
 
-	public String getCustCurrency() {
-		return custCurrency;
-	}
-
-	public void setCustCurrency(String custCurrency) {
-		this.custCurrency = custCurrency;
-	}
-
 	public Long getRemainingTime() {
 		if (endDate != null) {
 			return endDate.getTime() - System.currentTimeMillis();
@@ -555,6 +428,10 @@ public class PurcInquiryItem {
 		return null;
 	}
 
+	public void setRemainingTime(Long remainingTime) {
+		this.remainingTime = remainingTime;
+	}
+
 	@Override
 	public String toString() {
 		return "PurcInquiryItem{" +
@@ -564,37 +441,28 @@ public class PurcInquiryItem {
 				", 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 + '\'' +
 				", valid=" + valid +
 				'}';
 	}

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

@@ -52,12 +52,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_usertel")
 	private String userTel;
 
-	/**
-	 * 联系人编号
-	 */
-	@Column(name = "id_usercode")
-	private String userCode;
-
 	/**
 	 * 产品id
 	 */
@@ -91,12 +85,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_prodspec")
 	private String spec;
 
-	/**
-	 * 单位
-	 */
-	@Column(name = "id_unit")
-	private String unit;
-
 	/**
 	 * 型号
 	 */
@@ -136,12 +124,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_fromdate")
 	private Date fromDate;
 
-	/**
-	 * （买家预先提供的）有效期止
-	 */
-	@Column(name = "id_todate")
-	private Date toDate;
-
 	/**
 	 * 分段报价明细
 	 */
@@ -157,10 +139,8 @@ public class PurcInquiryItemInfo {
 	private Short status;
 
 	/**
-	 * search项目进行是否已过期时实际根据主表中enddate与当前时间的比较获取，但是数据库无字段会报“标识符无效”的错误
-	 * 所以建立此字段，但是此字段不会赋值。
+	 * 1已过期 0 未过期
 	 * 
-	 * @return
 	 */
 	@Column(name = "id_overdue")
 	private Short overdue;
@@ -171,12 +151,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_source")
 	private String source;
 
-	/**
-	 * 是否公开
-	 */
-	@Column(name = "id_isopen")
-	private Short isOpen;
-
 	/**
 	 * 需求数量
 	 */
@@ -201,24 +175,6 @@ public class PurcInquiryItemInfo {
 	@Column(name = "id_enuu")
 	private Long enuu;
 
-	/**
-	 * 产品生产日期
-	 */
-	@Column(name = "id_producedate")
-	private String produceDate;
-
-    /**
-     * 封装
-     */
-    @Column(name = "id_encapsulation")
-    private String encapsulation;
-
-    /**
-     * 单价预算
-     */
-    @Column(name = "id_unitprice")
-    private Double unitPrice;
-
     /**
      * 截止时间
      */
@@ -269,12 +225,6 @@ public class PurcInquiryItemInfo {
 	@Transient
 	private PublicInquiryItem quotation;
 
-	/**
-	 * 买家发出公共询价单时录入的币别
-	 */
-	@Column(name = "id_cust_currency")
-	private String custCurrency;
-
 	/**
 	 * 是否有效  1有效  0 无效
 	 */
@@ -384,14 +334,6 @@ public class PurcInquiryItemInfo {
 		this.fromDate = fromDate;
 	}
 
-	public Date getToDate() {
-		return toDate;
-	}
-
-	public void setToDate(Date toDate) {
-		this.toDate = toDate;
-	}
-
 	public List<PurchaseInquiryReply> getReplies() {
 		return replies;
 	}
@@ -432,14 +374,6 @@ public class PurcInquiryItemInfo {
 		this.source = source;
 	}
 
-	public Short getIsOpen() {
-		return isOpen;
-	}
-
-	public void setIsOpen(Short isOpen) {
-		this.isOpen = isOpen;
-	}
-
 	public String getProdCode() {
 		return prodCode;
 	}
@@ -464,14 +398,6 @@ public class PurcInquiryItemInfo {
 		this.spec = spec;
 	}
 
-	public String getUnit() {
-		return unit;
-	}
-
-	public void setUnit(String unit) {
-		this.unit = unit;
-	}
-
 	public String getCmpCode() {
 		return cmpCode;
 	}
@@ -536,38 +462,6 @@ public class PurcInquiryItemInfo {
 		this.userTel = userTel;
 	}
 
-	public String getUserCode() {
-		return userCode;
-	}
-
-	public void setUserCode(String userCode) {
-		this.userCode = userCode;
-	}
-
-	public String getProduceDate() {
-		return produceDate;
-	}
-
-	public void setProduceDate(String produceDate) {
-		this.produceDate = produceDate;
-	}
-
-    public String getEncapsulation() {
-        return encapsulation;
-    }
-
-    public void setEncapsulation(String encapsulation) {
-        this.encapsulation = encapsulation;
-    }
-
-    public Double getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(Double unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
     public Date getEndDate() {
         return endDate;
     }
@@ -619,14 +513,6 @@ public class PurcInquiryItemInfo {
 		this.qutations = qutations;
 	}
 
-	public String getCustCurrency() {
-		return custCurrency;
-	}
-
-	public void setCustCurrency(String custCurrency) {
-		this.custCurrency = custCurrency;
-	}
-
 	public PublicInquiryItem getQuotation() {
 		return quotation;
 	}
@@ -646,32 +532,25 @@ public class PurcInquiryItemInfo {
 				", 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 +
@@ -680,7 +559,6 @@ public class PurcInquiryItemInfo {
 				", agreed=" + agreed +
 				", qutations=" + qutations +
 				", quotation=" + quotation +
-				", custCurrency='" + custCurrency + '\'' +
 				", valid=" + valid +
 				", allotStatus=" + allotStatus +
 				'}';

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -150,12 +150,12 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         if (null != existInquiry) {
             throw new IllegalOperatorException("单据已报价，不能重复报价");
         }
-        jdbcTemplate.update("insert into public$inquiryitems(id_id,id_number,id_currency,id_fromdate,id_todate,id_taxrate,id_prid,id_venduu,"
-                        + "id_venduseruu,id_sourceapp,id_status,id_custlap,id_sendstatus,id_sourceid,id_inid,id_kind,id_replace_cmpcode,id_replace_spec,id_replace_brand,id_isreplace) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
-                item.getId(), item.getNumber(), item.getCurrency(), item.getFromDate(), item.getToDate(),
+        jdbcTemplate.update("insert into public$inquiryitems(id_id,id_number,id_currency,id_fromdate,id_taxrate,id_prid,id_venduu,"
+                        + "id_venduseruu,id_sourceapp,id_status,id_sendstatus,id_sourceid,id_inid,id_replace_cmpcode,id_replace_spec,id_replace_brand,id_isreplace) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                item.getId(), item.getNumber(), item.getCurrency(), item.getFromDate(),
                 item.getTaxrate(), item.getProductId(), item.getVendUU(), item.getVendUserUU(),
-                item.getSource(), item.getStatus(), item.getCustLap(), item.getSendStatus(),
-                item.getSourceId(), item.getInquiry().getId(), item.getInquiry().getKind(),
+                item.getSource(), item.getStatus(), item.getSendStatus(),
+                item.getSourceId(), item.getInquiry().getId(),
                 item.getReplaceCmpCode(), item.getReplaceSpec(), item.getReplaceBrand(), item.getIsReplace());
         //回复清单更新
         if(item.getReplies().size() > 0) {
@@ -394,7 +394,6 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
         inquiryItem.setOfferTime(new Date(System.currentTimeMillis()));
         inquiryItem.setInquiry(inquiry);
         inquiryItem.setNumber((short) number);
-        inquiryItem.setCustLap(Constant.NO);
         inquiryItem.setSendStatus((short) Status.NOT_UPLOAD.value());
         inquiryItem.setSourceId(inquiryItem.getId());
         inquiryItem.setId(null);

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -295,7 +295,6 @@ public class InquiryServiceImpl implements InquiryService {
                     item.setValid(IS_VALID);
                     item.setOfferAmount(INITIALISE_AMOUNT);
                     item.setStatus((short) Status.NOT_REPLY.value());
-                    item.setIsOpen(Constant.YES);
                     item.setEnuu(inquiry.getEnUU());
                     item.setDate(submitDate);
                     // 这里设置物料信息的冗余字段
@@ -567,8 +566,6 @@ public class InquiryServiceImpl implements InquiryService {
         InquiryDetailInfo inquiryInfo = new InquiryDetailInfo();
         if (inquiry != null) {
             inquiryInfo.setAttachs(inquiry.getAttachs());
-            inquiryInfo.setAuditor(inquiry.getAuditor());
-            inquiryInfo.setCheck(inquiry.getCheck());
             inquiryInfo.setCode(inquiry.getCode());
             inquiryInfo.setDate(inquiry.getDate());
             inquiryInfo.setEndDate(inquiry.getEndDate());
@@ -576,9 +573,7 @@ public class InquiryServiceImpl implements InquiryService {
             inquiryInfo.setEnUU(inquiry.getEnUU());
             inquiryInfo.setEnvironment(inquiry.getEnvironment());
             inquiryInfo.setId(inquiry.getId());
-            inquiryInfo.setIsOpen(inquiry.getIsOpen());
             inquiryInfo.setOverdue(inquiry.getOverdue());
-            inquiryInfo.setPriceType(inquiry.getPriceType());
             inquiryInfo.setRecorder(inquiry.getRecorder());
             inquiryInfo.setRecorderUU(inquiry.getRecorderUU());
             inquiryInfo.setRemark(inquiry.getRemark());
@@ -602,7 +597,7 @@ public class InquiryServiceImpl implements InquiryService {
                         productInfo.setSpec(item.getSpec());
                         productInfo.setCode(item.getProdCode());
                         productInfo.setTitle(item.getProdTitle());
-                        productInfo.setUnit(item.getUnit());
+                        productInfo.setUnit("PCS");
                         productInfo.setCmpCode(item.getCmpCode());
                         products.add(productInfo);
                         for (PublicInquiryItem item1 : inquiry.getInquiryItems()) {

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -595,18 +595,14 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                                 item.setSpec(batch.getPr_spec());
                             }
                             item.setProdCode(batch.getBip_prodcode());
-                            item.setRemark(batch.getBip_remark());
                             item.setNumber(batch.getBip_detno());
                             item.setFromDate(new Date(System.currentTimeMillis()));
-                            item.setToDate(purcInquiry.getEndDate());
                             item.setStatus((short) Status.NOT_REPLY.value());
-                            item.setIsOpen(Constant.YES);
                             item.setSource("ERP");
                             item.setSourceid(batch.getBip_id());
                             item.setCurrency(batch.getBip_currency());
                             item.setUserName(batch.getEm_name());
                             item.setUserTel(batch.getBip_mobile());
-                            item.setUserCode(batch.getBip_buyercode());
                             item.setOfferAmount(0);
                             item.setEndDate(inquiry.getBi_enddate());
                             item.setNeedquantity(batch.getYcgqty());
@@ -619,9 +615,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             } else {
                                 item.setDate(new Date(System.currentTimeMillis()));
                             }
-                            if (item.getCustCurrency() == null) {
-                                item.setCustCurrency("RMB");
-                            }
                             purcInquiryItems.add(item);
                         }
                     }
@@ -1056,11 +1049,8 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             saleInquiry.setEnUU(purcInquiry.getEnUU());
             saleInquiry.setRecorder(purcInquiry.getRecorder());
             saleInquiry.setRecorderUU(purcInquiry.getRecorderUU());
-            saleInquiry.setAuditor(purcInquiry.getAuditor());
             saleInquiry.setSourceApp(SOURCERAPP);
-            saleInquiry.setKind(INQUIRYKIND);
             saleInquiry.setSourceId(purcInquiry.getId());
-            saleInquiry.setPriceType(purcInquiry.getPriceType());
             saleInquiry.setInvoice(purcInquiry.getInvoice());
             saleInquiry.setShip(purcInquiry.getShip());
             saleInquiry.setEndDate(purcInquiry.getEndDate());
@@ -1093,15 +1083,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 item.setNumber(i);
                 item.setCurrency(purcInquiryItem.getCurrency());
                 item.setFromDate(new Date());
-                item.setToDate(purcInquiryItem.getToDate());
                 item.setTaxrate(purcInquiryItem.getTaxrate());
-                item.setRemark(purcInquiryItem.getRemark());
                 item.setProductId(purcInquiryItem.getProductId());
                 item.setStatus((short) Status.NOT_REPLY.value());
                 item.setVendUU(enuu);
                 item.setVendUserUU(useruu);
                 item.setSource(purcInquiryItem.getSource());
-                item.setCustLap(Constant.NO);
                 item.setSendStatus((short) Status.NOT_UPLOAD.value());
                 item.setSourceId(id);
                 List<PublicInquiryReply> replies = new ArrayList<PublicInquiryReply>();
@@ -1110,7 +1097,6 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                 replies.add(reply);
                 item.setReplies(replies);
                 item.setNeedquantity(purcInquiryItem.getNeedquantity());
-                item.setKind(INQUIRYKIND);
                 item.setProdCode(purcInquiryItem.getProdCode());
                 items.add(item);
                 i++;
@@ -1137,19 +1123,15 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         item.setNumber((short) (purcInquiry.getInquiryItems().size() + 1));
                         item.setCurrency(purcInquiryItem.getCurrency());
                         item.setFromDate(new Date());
-                        item.setToDate(purcInquiryItem.getToDate());
                         item.setTaxrate(purcInquiryItem.getTaxrate());
-                        item.setRemark(purcInquiryItem.getRemark());
                         item.setProductId(purcInquiryItem.getProductId());
                         item.setVendUU(enuu);
                         item.setVendUserUU(useruu);
                         item.setSource(purcInquiryItem.getSource());
                         item.setStatus((short) Status.NOT_REPLY.value());
-                        item.setCustLap(Constant.NO);
                         item.setSendStatus((short) Status.NOT_UPLOAD.value());
                         item.setSourceId(id);
                         item.setProdCode(purcInquiryItem.getProdCode());
-                        item.setKind(INQUIRYKIND);
                         item.setNeedquantity(purcInquiryItem.getNeedquantity());
                         List<PublicInquiryReply> replies = new ArrayList<PublicInquiryReply>();
                         List<PublicInquiryReply> purcReplies = new ArrayList<PublicInquiryReply>();
@@ -1162,12 +1144,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         Long idid = jdbcTemplate.queryForObject("select public$inquiryitems_seq.nextval from dual", Long.class);
                         try {
                             jdbcTemplate.update(
-                                    "insert into public$inquiryitems(id_id,id_number,id_currency,id_fromdate,id_todate,id_taxrate,id_prid,id_venduu,"
-                                            + "id_venduseruu,id_sourceapp,id_status,id_custlap,id_sendstatus,id_sourceid,id_inid,id_kind) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
-                                    idid, item.getNumber(), item.getCurrency(), item.getFromDate(), item.getToDate(),
+                                    "insert into public$inquiryitems(id_id,id_number,id_currency,id_fromdate,id_taxrate,id_prid,id_venduu,"
+                                            + "id_venduseruu,id_sourceapp,id_status,id_sendstatus,id_sourceid,id_inid) values (?,?,?,?,?,?,?,?,?,?,?,?,?)",
+                                    idid, item.getNumber(), item.getCurrency(), item.getFromDate(),
                                     item.getTaxrate(), item.getProductId(), item.getVendUU(), item.getVendUserUU(),
-                                    item.getSource(), item.getStatus(), item.getCustLap(), item.getSendStatus(),
-                                    item.getSourceId(), inquiry.getId(), inquiry.getKind());
+                                    item.getSource(), item.getStatus(), item.getSendStatus(),
+                                    item.getSourceId(), inquiry.getId());
                         } catch (DataAccessException e) {
                             map.put("info", "转客户询价单失败");
                         }