主动报价和采购询价单传输问题解决

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

src/main/java/com/uas/platform/b2b/erp/model/Inquiry.java

@@ -33,6 +33,7 @@ public class Inquiry {
 	private String in_environment;//环保要求
 	private Date in_enddate;
 	private String in_remark;
+	private String in_pricetype;
 	private List<InquiryDetail> details;
 	/**
 	 * 主动报价时，平台的主动报价单SaleQuotation的ID
@@ -59,6 +60,14 @@ public class Inquiry {
 	public Date getIn_date() {
 		return in_date;
 	}
+	
+	public String getIn_pricetype() {
+		return in_pricetype;
+	}
+
+	public void setIn_pricetype(String in_pricetype) {
+		this.in_pricetype = in_pricetype;
+	}
 
 	public void setIn_date(Date in_date) {
 		this.in_date = in_date;
@@ -161,6 +170,7 @@ public class Inquiry {
 		inquiry.setRemark(this.in_remark);
 		inquiry.setEnvironment(this.in_environment);
 		inquiry.setSourceId(this.in_id);
+		inquiry.setPriceType(this.in_pricetype);
 		if (!CollectionUtils.isEmpty(this.details)) {
 			Set<PurchaseInquiryItem> inquiryItems = new HashSet<PurchaseInquiryItem>();
 			for (InquiryDetail detail : details) {
@@ -188,6 +198,7 @@ public class Inquiry {
 		this.in_remark = quotation.getRemark();
 		this.b2b_qu_id = quotation.getId();
 		this.in_buyeruu = quotation.getCustUserUU();
+		this.in_environment = quotation.getEnvironment();
 		if (!CollectionUtils.isEmpty(quotation.getQuotationItems())) {
 			this.details = new ArrayList<InquiryDetail>();
 			for (SaleQuotationItem item : quotation.getQuotationItems()) {

src/main/java/com/uas/platform/b2b/erp/model/InquiryDetail.java

@@ -236,6 +236,8 @@ public class InquiryDetail {
 		inquiryItem.setSourceId(this.id_id);
 		inquiryItem.setStatus((short) Status.NOT_REPLY.value());
 		inquiryItem.setSendStatus((short) Status.NOT_UPLOAD.value());
+		inquiryItem.setFromDate(this.id_myfromdate);
+		inquiryItem.setToDate(this.id_mytodate);
 		if (!CollectionUtils.isEmpty(this.dets)) {// 都不会为空
 			Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();
 			for (InquiryDetailDet det : this.dets) {

src/main/java/com/uas/platform/b2b/erp/model/Quotation.java

@@ -33,6 +33,7 @@ public class Quotation {
 	private Float qu_taxrate;
 	private String qu_remark;
 	private Long b2b_qu_id;
+	private String qu_environment;
 	private List<QuotationDetail> details;
 
 	public long getCu_uu() {
@@ -43,6 +44,14 @@ public class Quotation {
 		this.cu_uu = cu_uu;
 	}
 	
+	public String getQu_environment() {
+		return qu_environment;
+	}
+
+	public void setQu_environment(String qu_environment) {
+		this.qu_environment = qu_environment;
+	}
+
 	public Long getQu_useruu() {
 		return qu_useruu;
 	}
@@ -160,6 +169,7 @@ public class Quotation {
 		quotation.setBackStatus((short) Status.DOWNLOADED.value());
 		quotation.setStatus((short) Status.SUBMITTED.value());
 		quotation.setTaxrate(this.qu_taxrate);
+		quotation.setEnvironment(this.qu_environment);
 		Set<SaleQuotationItem> quotationItems = new HashSet<SaleQuotationItem>();
 		if (!CollectionUtils.isEmpty(this.details)) {
 			for (QuotationDetail detail : this.details)

src/main/java/com/uas/platform/b2b/erp/model/QuotationDown.java

@@ -42,6 +42,7 @@ public class QuotationDown {
 	private String qu_brand;//物料品牌
 	private String qu_prodcode;//供应商物料编号
 	private Long qu_leadtime;//供应商交货周期
+	private String qu_pricetype;
 	private List<RemoteFile> files;
 	private List<QuotationDownDetail> details;
 
@@ -61,6 +62,14 @@ public class QuotationDown {
 		this.qu_custuu = qu_custuu;
 	}
 
+	public String getQu_pricetype() {
+		return qu_pricetype;
+	}
+
+	public void setQu_pricetype(String qu_pricetype) {
+		this.qu_pricetype = qu_pricetype;
+	}
+
 	public String getQu_code() {
 		return qu_code;
 	}
@@ -293,8 +302,10 @@ public class QuotationDown {
 		this.qu_prodcode = item.getVendorprodcode();
 		this.qu_leadtime = item.getLeadtime();
 		this.qu_environment = item.getInquiry().getEnvironment();
+		this.qu_pricetype = item.getInquiry().getPriceType();
 		this.qu_todate = item.getVendToDate();
 		this.qu_custlap = item.getCustLap();
+		this.qu_pricetype = item.getInquiry().getPriceType();
 		this.details = new ArrayList<QuotationDownDetail>();
 		if (!CollectionUtils.isEmpty(item.getReplies())) {
 			for (PurchaseInquiryReply reply : item.getReplies()) {

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

@@ -106,6 +106,12 @@ public class PurchaseInquiry implements Serializable {
 	 */
 	@Column(name = "in_environment")
 	private String environment;
+	
+	/*
+	 * 价格类型
+	 */
+	@Column(name = "in_pricetype")
+	private String priceType;
 
 	/**
 	 * 询价明细
@@ -147,6 +153,14 @@ public class PurchaseInquiry 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;
 	}

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

@@ -56,6 +56,9 @@ public class SaleQuotation implements Serializable {
 	@Column(name = "qu_enuu")
 	private Long enUU;
 	
+	@Column(name = "qu_environment")
+	private String environment;
+	
 	/**
 	 * 所属用户(卖家)UU
 	 */
@@ -172,6 +175,14 @@ public class SaleQuotation implements Serializable {
 		this.code = code;
 	}
 
+	public String getEnvironment() {
+		return environment;
+	}
+
+	public void setEnvironment(String environment) {
+		this.environment = environment;
+	}
+
 	public Long getEnUU() {
 		return enUU;
 	}

src/main/java/com/uas/platform/b2b/service/impl/PurchaseInquiryServiceImpl.java

@@ -135,6 +135,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 				item.setRemark(String.valueOf(System.currentTimeMillis()));
 				item.setBrand(down.getQu_brand());// 供应商物料品牌
 				item.setVendorprodcode(down.getQu_prodcode());// 供应商物料编号
+				item.setLeadtime(down.getQu_leadtime());//交货日期
 				if (!CollectionUtils.isEmpty(down.getDetails())) {
 					purchaseInquiryReplyDao.delete(item.getReplies());
 					Set<PurchaseInquiryReply> replies = new HashSet<PurchaseInquiryReply>();