User级联关系保存出错

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

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

@@ -53,7 +53,7 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 			if(proofingList.size() == 0 && products.size() > 0) {//平台中不存在的单据&&物料已经上传到平台
 				PurchaseProofing proofing = sample.convert();
 				if (!CollectionUtils.isEmpty(proofing.getProofingItems())) {
-					Long userUU = proofing.getUser().getUserUU();
+					Long userUU = proofing.getUserUU();
 					if(userUU != null) {
 						List<User> users = userDao.findByEnUUAndUserUU(enUU, userUU);
 						if(users.size() > 0) userUU = users.get(0).getUserUU();
@@ -61,6 +61,7 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 					} else userUU = SystemSession.getUser().getUserUU();
 					//单据中能获取到申请人的uu号，并且有效则为申请人，否则为企业管理员
 					proofing.setUserUU(userUU);
+					proofing.setUser(null);
 					proofing.setProduct(products.get(0));
 					proofing.setProductId(products.get(0).getId());
 					for(PurchaseProofingItem proofingItem : proofing.getProofingItems()) {//对明细遍历

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

@@ -73,6 +73,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 							order.setUserUU(myUsers.get(0).getUserUU());
 						}
 					}
+					order.setUser(null);
 					for (PurchaseOrderAllItem item : order.getOrderItems()) {
 						item.setOrder(order);
 						// 取平台的产品ID

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

@@ -68,7 +68,7 @@ public class PurchaseProofing implements Serializable {
 	/**
 	 * 买方申请人
 	 */
-	@OneToOne(cascade = { CascadeType.MERGE })
+	@OneToOne(cascade = { CascadeType.REFRESH })
 	@JoinColumn(name = "pp_useruu", insertable = false, updatable = false)
 	private UserBaseInfo user;