处理询价单存在不能继续新增的bug

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

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

@@ -1,14 +1,33 @@
 package com.uas.platform.b2b.model;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.OrderBy;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.springframework.util.CollectionUtils;
+
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2b.core.util.DateUtils;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.springframework.util.CollectionUtils;
-
-import javax.persistence.*;
-import java.util.*;
 
 /**
  * 平台里面，以供应商的角度来查看采购询价单明细
@@ -42,9 +61,12 @@ public class PurchaseInquiryItem {
 	 * 询价单
 	 */
 	@ManyToOne(cascade = CascadeType.ALL, optional = true)
-	@JoinColumn(name = "id_inid", nullable = false)
+	@JoinColumn(name = "id_inid", nullable = false, insertable = false, updatable = false)
 	private PurchaseInquiry inquiry;
 
+	@Column(name = "id_inid")
+	private Long inid;
+
 	/**
 	 * 买家采购员UU
 	 */
@@ -483,6 +505,14 @@ public class PurchaseInquiryItem {
 		this.enterprise = enterprise;
 	}
 
+	public Long getInid() {
+		return inid;
+	}
+
+	public void setInid(Long inid) {
+		this.inid = inid;
+	}
+
 	/**
 	 * 回复记录的描述
 	 * 

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

@@ -526,7 +526,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 					if (null != purcInquiryItem) {
 						PurchaseInquiryItem item = new PurchaseInquiryItem();
 						Product product = productDao.findOne(purcInquiryItem.getProductId());
-						item.setInquiry(inquiry);
+						item.setInid(inquiry.getId());
 						item.setProduct(product);
 						item.setNumber((short) (inquiry.getInquiryItems().size() + 1));
 						item.setCurrency(purcInquiryItem.getCurrency());

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -512,7 +512,7 @@ input[type="radio"], input[type="checkbox"] {
                         <div ng-bind="::inquiryItem.inquiry.code"></div>
                     </div>
                     <div class = "col-xs-4">
-                        <div class="tender-desc">招标企业：</div>
+                        <div class="tender-desc">询价企业：</div>
                         <div ng-bind="::inquiryItem.inquiry.enterprise.enName"></div>
                     </div>
                     <div class = "col-xs-4">