修改采购验收单关联物料的方法

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

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

@@ -133,6 +133,7 @@ public class PurchaseProdInOutDetail {
 		acceptItem.setOrderPrice(this.pd_orderprice);
 		acceptItem.setTaxrate(this.pd_taxrate);
 		acceptItem.setWhname(this.pd_whname);
+		acceptItem.setProdcode(this.pd_prodcode);
 		if (StringUtils.hasText(this.pd_ordercode)) {
 			PurchaseOrder order = new PurchaseOrder();
 			order.setCode(this.pd_ordercode);

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseProdInOutServiceImpl.java

@@ -92,11 +92,17 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 							item.setOrderItemId(purchaseOrderItems.get(0).getId());
 							item.setAccept(accept);// 设置主记录
 							item.setErpDate(new Date());
+							item.setProdcode(purchaseOrderItems.get(0).getProduct().getCode());
 							acceptItems.add(item);
 						} else {
 							it.remove();
 						}
 					} else {
+						List<Product> prod = productDao.findByEnUUAndCode(enUU, item.getProdcode());
+						if (prod.size() > 0) {
+							item.setProduct(prod.get(0));
+							item.setProdId(prod.get(0).getId());
+						}
 						item.setAccept(accept);
 						item.setErpDate(new Date());
 						acceptItems.add(item);
@@ -127,6 +133,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 							returnItem.setOrderItemId(purchaseOrderItems.get(0).getId());
 							returnItem.setProduct(purchaseOrderItems.get(0).getProduct());
 							returnItem.setProdId(purchaseOrderItems.get(0).getProductId());
+							returnItem.setProdCode(purchaseOrderItems.get(0).getProduct().getCode());
 						}
 					} else {
 						List<Product> prod = productDao.findByEnUUAndCode(enUU, returnItem.getProdCode());

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

@@ -175,11 +175,20 @@ public class Product {
 
 	/**
 	 * 是否可卖<br>
-	 * 1. 可以卖 0. 不可
+	 * 1. 可以卖 <br>
+	 * 0. 不可
 	 */
 	@Column(name = "pr_issale")
 	private Short isSale;
 
+	/**
+	 * 是否可买<br>
+	 * 1. 可以卖<br>
+	 * 0. 不可
+	 */
+	@Column(name = "pr_ispurchase")
+	private Short isPurchase;
+
 	/**
 	 * 附件
 	 */
@@ -387,4 +396,12 @@ public class Product {
 		this.isSale = isSale;
 	}
 
+	public Short getIsPurchase() {
+		return isPurchase;
+	}
+
+	public void setIsPurchase(Short isPurchase) {
+		this.isPurchase = isPurchase;
+	}
+
 }

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

@@ -213,4 +213,44 @@ public class PurchaseAcceptItem {
 		return accepts;
 	}
 
+	/**
+	 * 物料资料
+	 */
+	@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;
+
+	public Long getProdId() {
+		return prodId;
+	}
+
+	public void setProdId(Long prodId) {
+		this.prodId = prodId;
+	}
+
+	/**
+	 * 物料编号
+	 */
+	@Column(name = "pai_prodcode")
+	private String prodcode;
+
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+	public String getProdcode() {
+		return prodcode;
+	}
+
+	public void setProdcode(String prodcode) {
+		this.prodcode = prodcode;
+	}
+
 }