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

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

@@ -41,18 +41,23 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 			List<PurchaseOrder> orders = purchaseOrderDao.findByEnUUAndCode(enUU, change.getPc_purccode());
 			if (orders.size() > 0) {
 				orderChange.setOrder(orders.get(0));
+				orderChange.setOrderId(orders.get(0).getId());
 				if (!CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
 					for (PurchaseOrderChangeItem item : orderChange.getOrderChangeItems()) {
 						// 取订单明细ID
 						List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU, orderChange
 								.getOrder().getCode(), item.getOrderItem().getNumber());
-						if (orderItems.size() > 0)
+						if (orderItems.size() > 0) {
 							item.setOrderItem(orderItems.get(0));
+							item.setOrderItemId(orderItems.get(0).getId());
+						}
 						// 取平台的产品ID
 						Product newProduct = item.getNewProduct();
 						List<Product> products = productDao.findByEnUUAndCode(newProduct.getEnUU(), newProduct.getCode());
-						if (products.size() > 0)
+						if (products.size() > 0) {
 							item.setNewProduct(products.get(0));
+							item.setNewProductId(products.get(0).getId());
+						}
 						item.setOrderChange(orderChange);
 					}
 					changeItems.addAll(orderChange.getOrderChangeItems());

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

@@ -81,7 +81,7 @@ public class PurchaseOrderChange implements Serializable {
 	 */
 	@Column(name = "pc_sendstatus")
 	private Short sendStatus;
-	
+
 	/**
 	 * 从平台传回复内容到供应商ERP的状态
 	 */
@@ -105,7 +105,7 @@ public class PurchaseOrderChange implements Serializable {
 	 */
 	@Column(name = "pc_replyremark")
 	private String replyRemark;
-	
+
 	/**
 	 * 从平台传回复信息到买方ERP的状态
 	 */
@@ -137,6 +137,9 @@ public class PurchaseOrderChange implements Serializable {
 	@JoinColumn(name = "pc_puid", insertable = false, updatable = false)
 	private PurchaseOrder order;
 
+	@Column(name = "pc_puid")
+	private Long orderId;
+
 	/**
 	 * 采购变更单明细
 	 */
@@ -288,4 +291,12 @@ public class PurchaseOrderChange implements Serializable {
 		this.replySendStatus = replySendStatus;
 	}
 
+	public Long getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
 }

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

@@ -23,64 +23,70 @@ import javax.persistence.Table;
 @Table(name = "purc$changeitems")
 @Entity
 public class PurchaseOrderChangeItem {
-	
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$changeitems_gen")
 	@SequenceGenerator(name = "purc$changeitems_gen", sequenceName = "purc$changeitems_seq", allocationSize = 1)
 	@Column(name = "pcd_id")
 	private Long id;
-	
+
 	/**
 	 * 序号
 	 */
 	@Column(name = "pcd_number")
 	private Short number;
-	
+
 	/**
 	 * 采购订单变更单
 	 */
 	@ManyToOne(cascade = CascadeType.ALL, optional = true)
 	@JoinColumn(name = "pcd_pcid", nullable = false)
 	private PurchaseOrderChange orderChange;
-	
+
 	/**
 	 * 采购订单明细
 	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
+	@OneToOne(cascade = { CascadeType.REFRESH })
 	@JoinColumn(name = "pcd_pdid", insertable = false, updatable = false)
 	private PurchaseOrderItem orderItem;
-	
+
+	@Column(name = "pcd_pdid")
+	private Long orderItemId;
+
 	/**
 	 * 新产品
 	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
+	@OneToOne(cascade = { CascadeType.REFRESH })
 	@JoinColumn(name = "pd_newprid", insertable = false, updatable = false)
 	private Product newProduct;
-	
+
+	@Column(name = "pd_newprid")
+	private Long newProductId;
+
 	/**
 	 * 新数量
 	 */
 	@Column(name = "pd_newqty")
 	private Double newQty;
-	
+
 	/**
 	 * 新含税单价
 	 */
 	@Column(name = "pd_newprice")
 	private Double newPrice;
-	
+
 	/**
 	 * 新税率
 	 */
 	@Column(name = "pd_newtaxrate")
 	private Float newTaxrate;
-	
+
 	/**
 	 * 新交货日期
 	 */
 	@Column(name = "pd_newdelivery")
 	private Date newDelivery;
-	
+
 	/**
 	 * 备注
 	 */
@@ -139,6 +145,22 @@ public class PurchaseOrderChangeItem {
 		return newPrice;
 	}
 
+	public Long getOrderItemId() {
+		return orderItemId;
+	}
+
+	public void setOrderItemId(Long orderItemId) {
+		this.orderItemId = orderItemId;
+	}
+
+	public Long getNewProductId() {
+		return newProductId;
+	}
+
+	public void setNewProductId(Long newProductId) {
+		this.newProductId = newProductId;
+	}
+
 	public void setNewPrice(Double newPrice) {
 		this.newPrice = newPrice;
 	}
@@ -166,5 +188,5 @@ public class PurchaseOrderChangeItem {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	
+
 }