|
|
@@ -30,7 +30,7 @@ import com.alibaba.fastjson.annotation.JSONField;
|
|
|
*/
|
|
|
@Table(name = "sale$quotationitem")
|
|
|
@Entity
|
|
|
-public class SaleQuotationItemAll {
|
|
|
+public class SaleQuotationItemAll extends AbstractOrderProduct {
|
|
|
|
|
|
@Id
|
|
|
@GeneratedValue(strategy = GenerationType.AUTO)
|
|
|
@@ -50,13 +50,6 @@ public class SaleQuotationItemAll {
|
|
|
@JoinColumn(name = "qd_quid", nullable = false)
|
|
|
private SaleQuotationAll quotation;
|
|
|
|
|
|
- /**
|
|
|
- * 产品
|
|
|
- */
|
|
|
- @OneToOne(cascade = { CascadeType.REFRESH })
|
|
|
- @JoinColumn(name = "qd_prid", insertable = false, updatable = false)
|
|
|
- private Product product;
|
|
|
-
|
|
|
@Column(name = "qd_prid")
|
|
|
private Long productId;
|
|
|
|
|
|
@@ -148,14 +141,6 @@ public class SaleQuotationItemAll {
|
|
|
this.quotation = quotation;
|
|
|
}
|
|
|
|
|
|
- public Product getProduct() {
|
|
|
- return product;
|
|
|
- }
|
|
|
-
|
|
|
- public void setProduct(Product product) {
|
|
|
- this.product = product;
|
|
|
- }
|
|
|
-
|
|
|
public String getCustProductCode() {
|
|
|
return custProductCode;
|
|
|
}
|
|
|
@@ -164,10 +149,12 @@ public class SaleQuotationItemAll {
|
|
|
this.custProductCode = custProductCode;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
public Long getProductId() {
|
|
|
return productId;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
public void setProductId(Long productId) {
|
|
|
this.productId = productId;
|
|
|
}
|
|
|
@@ -245,7 +232,7 @@ public class SaleQuotationItemAll {
|
|
|
}
|
|
|
|
|
|
public String replyDescription() {
|
|
|
- return "客户UU:" + this.quotation.getCustUU() + ",物料编号:" + this.product.getCode();
|
|
|
+ return "客户UU:" + this.quotation.getCustUU() + ",物料编号:" + this.productCode;
|
|
|
}
|
|
|
|
|
|
}
|