修改单据的物料信息关联

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

@@ -76,12 +76,10 @@ public class PurchaseForecastDetail {
 		item.setNumber(this.pfd_detno);		
 		item.setQty(this.pfd_qty);
 		item.setVendUU(this.ve_uu);
-		item.setVendUserUU(this.ve_contactuu);//买方ERP中供应商资料中的供应商联系人
+		// 买方ERP中供应商资料中的供应商联系人
+		item.setVendUserUU(this.ve_contactuu);
 		item.setRemark(pfd_remark);
-		Product product = new Product();
-		product.setCode(this.pfd_prodcode);
-		product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
-		item.setProduct(product);
+		item.setProductCode(this.pfd_prodcode);
 		item.setSendStatus((short) Status.NOT_UPLOAD.value());
 		return item;
 	}

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

@@ -16,7 +16,7 @@ import java.util.Date;
 		@Index(name = "make_order_code_enuu_index", columnList = "ma_code,ma_enuu", unique = true)
 })
 @Entity
-public class MakeOrder implements Serializable {
+public class MakeOrder extends AbstractOrderProduct implements Serializable {
 
 	/**
 	 * 
@@ -102,13 +102,6 @@ public class MakeOrder implements Serializable {
 	@Column(name = "ma_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 需求日期
 	 */
@@ -377,22 +370,16 @@ public class MakeOrder implements Serializable {
 		this.vendUserUU = vendUserUU;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Date getDelivery() {
 		return delivery;
 	}

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

@@ -27,7 +27,7 @@ import com.uas.platform.core.model.Constant;
  */
 @Table(name = "make$changeitems")
 @Entity
-public class MakeOrderChangeItem {
+public class MakeOrderChangeItem extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -71,13 +71,6 @@ public class MakeOrderChangeItem {
 	@Column(name = "mcd_macode")
 	private String orderCode;
 
-	/**
-	 * 生产的物料
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "mcd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 生产物料id
 	 */
@@ -303,14 +296,6 @@ public class MakeOrderChangeItem {
 		this.orderCode = orderCode;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Date getDate() {
 		return date;
 	}
@@ -423,10 +408,12 @@ public class MakeOrderChangeItem {
 		this.vendUserUU = vendUserUU;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}

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

@@ -24,7 +24,7 @@ import org.hibernate.annotations.Where;
 @Table(name = "make$orders")
 @Where(clause = "ma_status=201")
 @Entity
-public class MakeOrderDone {
+public class MakeOrderDone extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -104,13 +104,6 @@ public class MakeOrderDone {
 	 */
 	@Column(name = "ma_prid")
 	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_prid", insertable = false, updatable = false)
-	private Product product;
 	
 	/**
 	 * 需求日期
@@ -354,22 +347,16 @@ public class MakeOrderDone {
 		this.vendUserUU = vendUserUU;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Date getDelivery() {
 		return delivery;
 	}

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

@@ -24,7 +24,7 @@ import org.hibernate.annotations.Where;
 @Table(name = "make$orders")
 @Where(clause = "ma_end = 1")
 @Entity
-public class MakeOrderEnd  {
+public class MakeOrderEnd extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -104,13 +104,6 @@ public class MakeOrderEnd  {
 	 */
 	@Column(name = "ma_prid")
 	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_prid", insertable = false, updatable = false)
-	private Product product;
 	
 	/**
 	 * 需求日期
@@ -354,22 +347,16 @@ public class MakeOrderEnd  {
 		this.vendUserUU = vendUserUU;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Date getDelivery() {
 		return delivery;
 	}

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

@@ -18,7 +18,7 @@ import java.util.Set;
  */
 @Table(name = "make$orderitems")
 @Entity
-public class MakeOrderItem implements Serializable {
+public class MakeOrderItem extends AbstractOrderProduct implements Serializable {
 
 	/**
 	 * 
@@ -41,13 +41,6 @@ public class MakeOrderItem implements Serializable {
 	 */
 	@Column(name = "mai_prid")
 	private Long productId;
-
-	/**
-	 * 用料
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "mai_prid", insertable = false, updatable = false)
-	private Product product;
 	
 	/**
 	 * 单位用量
@@ -104,22 +97,16 @@ public class MakeOrderItem implements Serializable {
 		this.number = number;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Double getPerQty() {
 		return perQty;
 	}

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

@@ -25,7 +25,7 @@ import org.hibernate.annotations.Where;
 @Table(name = "make$orders" , indexes = { @Index(name = "make$orders_date", columnList = "ma_date") })
 @Where(clause = "ma_status=200")
 @Entity
-public class MakeOrderTodo {
+public class MakeOrderTodo extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -105,13 +105,6 @@ public class MakeOrderTodo {
 	 */
 	@Column(name = "ma_prid")
 	private Long productId;
-
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "ma_prid", insertable = false, updatable = false)
-	private Product product;
 	
 	/**
 	 * 需求日期
@@ -355,22 +348,16 @@ public class MakeOrderTodo {
 		this.vendUserUU = vendUserUU;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Date getDelivery() {
 		return delivery;
 	}

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

@@ -14,7 +14,7 @@ import java.util.*;
  */
 @Table(name = "purc$acceptitem")
 @Entity
-public class PurchaseAcceptItem {
+public class PurchaseAcceptItem extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -86,13 +86,6 @@ public class PurchaseAcceptItem {
 	@Column(name = "pai_erpdate")
 	private Date erpDate;
 
-	/**
-	 * 物料资料
-	 */
-	@OneToOne(optional = true, cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pai_prodid", insertable = false, updatable = false, nullable = true)
-	private Product product;
-
 	@Column(name = "pai_prodid")
 	private Long prodId;
 
@@ -226,14 +219,6 @@ public class PurchaseAcceptItem {
 		this.prodId = prodId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public String getProdcode() {
 		return prodcode;
 	}
@@ -249,4 +234,14 @@ public class PurchaseAcceptItem {
 	public void setCheckQty(Integer checkQty) {
 		this.checkQty = checkQty;
 	}
+
+	@Override
+	public Long getProductId() {
+		return this.prodId;
+	}
+
+	@Override
+	public void setProductId(Long productId) {
+		this.prodId = productId;
+	}
 }

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

@@ -14,7 +14,7 @@ import java.util.*;
  */
 @Table(name = "purc$apbillitem")
 @Entity
-public class PurchaseApBillItem {
+public class PurchaseApBillItem extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -45,13 +45,6 @@ public class PurchaseApBillItem {
 	@Column(name = "papi_pdinoutno")
 	private String pdinoutNo;
 
-	/**
-	 * 物料
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "papi_product", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 物料id
 	 */
@@ -186,14 +179,6 @@ public class PurchaseApBillItem {
 		this.pdinoutNo = pdinoutNo;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Double getThisvoQty() {
 		return thisvoQty;
 	}
@@ -308,10 +293,12 @@ public class PurchaseApBillItem {
 		this.yQty = yQty;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}

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

@@ -12,7 +12,7 @@ import java.util.Date;
  */
 @Table(name = "purc$forecastitems")
 @Entity
-public class PurchaseForecastAllItem implements Serializable {
+public class PurchaseForecastAllItem extends AbstractOrderProduct implements Serializable {
 
 	/**
 	 * 
@@ -43,13 +43,6 @@ public class PurchaseForecastAllItem implements Serializable {
 	@Column(name = "pfd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pfd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 数量
 	 */
@@ -131,22 +124,16 @@ public class PurchaseForecastAllItem implements Serializable {
 		this.order = order;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Double getQty() {
 		return qty;
 	}

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

@@ -37,7 +37,7 @@ import com.uas.platform.core.model.Status;
  */
 @Table(name = "purc$inquiryitems")
 @Entity
-public class PurchaseInquiryItemInfo {
+public class PurchaseInquiryItemInfo extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -87,13 +87,6 @@ public class PurchaseInquiryItemInfo {
 	@Column(name = "id_usercode")
 	private String userCode;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "id_prid", insertable = false, updatable = false)
-	private Product product;
-
 	@Column(name = "id_prid")
 	private Long productId;
 
@@ -315,18 +308,12 @@ public class PurchaseInquiryItemInfo {
 		this.inquiry = inquiry;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}

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

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @Table(name = "purc$orderitems")
 @Entity
-public class PurchaseOrderCartItem {
+public class PurchaseOrderCartItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -34,13 +34,6 @@ public class PurchaseOrderCartItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 数量
 	 */
@@ -167,22 +160,16 @@ public class PurchaseOrderCartItem {
 		this.number = number;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Double getQty() {
 		return qty;
 	}

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

@@ -17,7 +17,7 @@ import java.util.*;
 @Entity
 @OptimisticLocking(type = OptimisticLockType.ALL)
 @DynamicUpdate(value = true)
-public class PurchaseOrderItem {
+public class PurchaseOrderItem extends AbstractOrderProduct {
 
 	@Id
 	@Column(name = "pd_id")
@@ -43,13 +43,6 @@ public class PurchaseOrderItem {
 	@Column(name = "pd_prid")
 	private Long productId;
 
-	/**
-	 * 产品
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pd_prid", insertable = false, updatable = false)
-	private Product product;
-
 	/**
 	 * 产品的附件
 	 */
@@ -198,22 +191,16 @@ public class PurchaseOrderItem {
 		this.order = order;
 	}
 
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public Set<Attach> getAttachs() {
 		return attachs;
 	}

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

@@ -32,7 +32,7 @@ import com.alibaba.fastjson.annotation.JSONField;
  */
 @Table(name = "purc$proofing", indexes = {@Index(name = "unique_enuu_code", columnList = "pp_enuu,pp_code",unique = true)})
 @Entity
-public class PurchaseProofing implements Serializable {
+public class PurchaseProofing extends AbstractOrderProduct implements Serializable {
 
 	/**
 	 * 序列号
@@ -88,13 +88,6 @@ public class PurchaseProofing implements Serializable {
 	@Column(name = "pp_recorder")
 	private String recorder;
 
-	/**
-	 * 物料(买方物料)
-	 */
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pp_prid", insertable = false, updatable = false)
-	private Product product;
-
 	@Column(name = "pp_prid")
 	private Long productId;
 
@@ -215,18 +208,12 @@ public class PurchaseProofing implements Serializable {
 		this.recorder = recorder;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
+	@Override
 	public Long getProductId() {
 		return productId;
 	}
 
+	@Override
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}

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

@@ -14,15 +14,7 @@ import java.util.*;
  */
 @Table(name = "purc$returnitem")
 @Entity
-public class PurchaseReturnItem {
-
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
+public class PurchaseReturnItem extends AbstractOrderProduct {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -100,13 +92,6 @@ public class PurchaseReturnItem {
 	@Column(name = "pri_erpdate")
 	private Date erpDate;
 
-	/**
-	 * 物料Id
-	 */
-	@OneToOne(optional = true, cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pri_prodid", insertable = false, updatable = false, nullable = true)
-	private Product product;
-
 	@Column(name = "pri_prodid")
 	private Long prodId;
 
@@ -277,4 +262,14 @@ public class PurchaseReturnItem {
 	public void setCheckQty(Integer checkQty) {
 		this.checkQty = checkQty;
 	}
+
+	@Override
+	public Long getProductId() {
+		return this.prodId;
+	}
+
+	@Override
+	public void setProductId(Long productId) {
+		this.prodId = productId;
+	}
 }

src/main/java/com/uas/platform/b2b/temporary/model/OrderItems.java

@@ -14,7 +14,7 @@ public class OrderItems {
 	//物料来源，默认导入的归属于客户，新增的归属于供应商
 	private String  prodsource;
 	// 下面是product的信息
-	private Product product;
+//	private Product product;
 	private String code;
 	private Long enUU;
 	private Long prid;
@@ -164,14 +164,6 @@ public class OrderItems {
 		this.taxrate = taxrate;
 	}
 
-	public Product getProduct() {
-		return product;
-	}
-
-	public void setProduct(Product product) {
-		this.product = product;
-	}
-
 	public String getProdsource() {
 		return prodsource;
 	}