模具询价单新加税率字段

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

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

@@ -56,7 +56,7 @@ public class InquiryMould {
 	/**
 	 * 税率
 	 */
-	private Float in_tax;
+	private Float in_taxrate;
 
 	/**
 	 * 备注
@@ -309,11 +309,11 @@ public class InquiryMould {
 	}
 
 	public Float getIn_tax() {
-		return in_tax;
+		return in_taxrate;
 	}
 
-	public void setIn_tax(Float in_tax) {
-		this.in_tax = in_tax;
+	public void setIn_tax(Float in_taxrate) {
+		this.in_taxrate = in_taxrate;
 	}
 
 	public String getIn_sourcecode() {
@@ -394,7 +394,7 @@ public class InquiryMould {
 		inquiryMould.setSourceId(this.in_sourceid);
 		inquiryMould.setSourceType(this.in_sourcetype);
 		inquiryMould.setStatusCode(this.in_statuscode);
-		inquiryMould.setTaxrate(this.in_tax);
+		inquiryMould.setTaxrate(this.in_taxrate);
 		inquiryMould.setVendName(this.in_vendname);
 		inquiryMould.setVenduu(this.in_veuu);
 		// 记录传入时间为当前时间
@@ -465,7 +465,7 @@ public class InquiryMould {
 		this.in_sourcetype = mould.getSourceType();
 		// this.in_status = mould.getStatus();
 		this.in_statuscode = mould.getStatusCode();
-		this.in_tax = mould.getTaxrate();
+		this.in_taxrate = mould.getTaxrate();
 		if (!CollectionUtils.isEmpty(mould.getInquiryMouldItems())) {
 			items = new ArrayList<InquiryMouldDet>();
 			for (PurchaseInquiryMouldItem item : mould.getInquiryMouldItems()) {