修改物料信息类

src/main/java/com/uas/platform/b2b/erp/service/ObjectEvaluate.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.erp.service;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.model.Product;
+import com.uas.platform.b2b.model.ProductInfo;
 import com.uas.platform.b2b.model.PurcOrderInfoItem;
 
 import java.lang.reflect.InvocationTargetException;
@@ -93,7 +94,7 @@ public class ObjectEvaluate {
     }
 
     public static void main(String[] args) {
-        Product product = new Product();
+        ProductInfo product = new ProductInfo();
         product.setId(1L);
         product.setBrand("brand001");
         product.setCmpCode("cmpCode001");
@@ -101,7 +102,7 @@ public class ObjectEvaluate {
         product.setUnit("PCS");
         product.setSpec("spec001");
         PurcOrderInfoItem orderItem = new PurcOrderInfoItem();
-        orderItem = ObjectEvaluate.covert(orderItem, product);
+        orderItem.setProduct(product);
         System.out.println(JSON.toJSONString(orderItem));
     }
 }

src/main/java/com/uas/platform/b2b/model/AbstractProduct.java → src/main/java/com/uas/platform/b2b/model/AbstractOrderProduct.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.model;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
 
 /**
  * 通用物料信息
@@ -13,7 +14,13 @@ import javax.persistence.MappedSuperclass;
  * @date 2018-07-18 13:37
  */
 @MappedSuperclass
-public abstract class AbstractProduct {
+public abstract class AbstractOrderProduct {
+
+    /**
+     * 物料id
+     */
+    @Transient
+    protected  Long productId;
 
     /**
      * 编号
@@ -53,6 +60,9 @@ public abstract class AbstractProduct {
     @Column(name = "pr_cmpcode")
     protected String productCmpCode;
 
+    @Transient
+    protected ProductInfo product;
+
     public String getProductCode() {
         return productCode;
     }
@@ -101,4 +111,38 @@ public abstract class AbstractProduct {
         this.productCmpCode = productCmpCode;
     }
 
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public ProductInfo getProduct() {
+        if (product == null) {
+            product = new ProductInfo();
+            product.setId(productId);
+            product.setTitle(productTitle);
+            product.setCode(productCode);
+            product.setSpec(productSpec);
+            product.setUnit(productUnit);
+            product.setBrand(productBrand);
+            product.setCmpCode(productCmpCode);
+        }
+        return product;
+    }
+
+    public void setProduct(ProductInfo product) {
+        if (product != null) {
+            this.productId = product.getId();
+            this.productTitle = product.getTitle();
+            this.productCode = product.getCode();
+            this.productSpec = product.getSpec();
+            this.productUnit = product.getUnit();
+            this.productBrand = product.getBrand();
+            this.productCmpCode = product.getCmpCode();
+        }
+        this.product = product;
+    }
 }

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

@@ -62,6 +62,18 @@ public class ProductInfo {
 	 */
 	private String pcmpcode;
 
+	/**
+	 * 品牌（ERP)
+	 */
+	private String brand;
+
+	/**
+	 * 原厂型号(erp)
+	 *
+	 * @return
+	 */
+	private String cmpCode;
+
 	/**
 	 * 是否是标准物料<br>
 	 * 1.YES<br>
@@ -167,4 +179,20 @@ public class ProductInfo {
 	public void setStandard(Short standard) {
 		this.standard = standard;
 	}
+
+	public String getBrand() {
+		return brand;
+	}
+
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+
+	public String getCmpCode() {
+		return cmpCode;
+	}
+
+	public void setCmpCode(String cmpCode) {
+		this.cmpCode = cmpCode;
+	}
 }

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

@@ -14,7 +14,7 @@ import java.util.*;
  */
 @Table(name = "purc$orderitems")
 @Entity
-public class PurcOrderInfoItem extends AbstractProduct {
+public class PurcOrderInfoItem extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -40,13 +40,6 @@ public class PurcOrderInfoItem extends AbstractProduct {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 产品的附件
 	 */
@@ -197,20 +190,14 @@ public class PurcOrderInfoItem extends AbstractProduct {
 		this.order = order;
 	}
 
+	@Override
 	public Long getProductId() {
-		return productId;
+		return super.getProductId();
 	}
 
+	@Override
 	public void setProductId(Long productId) {
-		this.productId = productId;
-	}
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
+		super.setProductId(productId);
 	}
 
 	public Set<Attach> getAttachs() {