单据买方用户与卖方用户

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

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

@@ -72,6 +72,9 @@ public class InquiryServiceImpl implements InquiryService {
 							if (item.getVendUserUU() == null || item.getVendUserUU() == 0) {
 								item.setVendUserUU(vendor.getVendUserUU());
 							}
+							if (item.getUserUU() == null || item.getUserUU() == 0) {
+								item.setUserUU(SystemSession.getUser().getUserUU());
+							}
 						} else {
 							vendor = addVendor(item);
 						}

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

@@ -1,9 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,7 +27,6 @@ import com.uas.platform.b2b.model.PurchaseOrderReply;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Status;
 
 @Service
@@ -61,24 +58,21 @@ public class PurchaseServiceImpl implements PurchaseService {
 				Vendor vendor = null;
 				if (vendors.size() == 0) {//供应商资料在平台上不存在
 					vendor = addVendor(order);//添加企业的供应商资料
-					if (order.getVendUserUU() == null)//单据不包含供应商联系人UU号&&供应商列表中有供应商联系人
-						order.setVendUserUU(vendor.getVendorUser().getUserUU());//将供应商列表中的联系人设为单据的供应商联系人
 				} else {//供应商资料在平台上存在
 					vendor = vendors.get(0);
+					if (order.getVendUserUU() == null || order.getVendUserUU() == null)//单据不包含供应商联系人UU号&&供应商列表中有供应商联系人
+						order.setVendUserUU(vendor.getVendUserUU());//将供应商列表中的联系人设为单据的供应商联系人
+					if (order.getUserUU() == null || order.getUserUU() == 0) {
+						order.setUserUU(SystemSession.getUser().getUserUU());
+					}
 				}
 				if (vendor != null && !CollectionUtils.isEmpty(order.getOrderItems())) {//平台中存在供应商的UU&&单据有明细行
-					User user = order.getUser();//单据采购员
-					if (order.getUserUU() != null) {//单据采购员uu不为空
-						List<User> users = userDao.findUserByUserUU(order.getUserUU());//根据单据采购员uu获取users
-						if (users.size() == 0)//平台中不存在单据采购员UU的用户
-							user = addUser(user);//新增当前企业的一个user
-						else//平台中存在单据采购员UU的用户
-							user = users.get(0);
-					} else {//单据采购员uu为空
-						user = addUser(user);//新增当前企业的一个user
+					if(order.getUserUU() != null) {
+						List<User> myUsers = userDao.findByEnUUAndUserUU(SystemSession.getUser().getEnterprise().getUu(), order.getUserUU());
+						if(myUsers.size() > 0) {
+							order.setUser(myUsers.get(0));
+						}
 					}
-					order.setUser(user);
-					order.setUserUU(user.getUserUU());//如果单据包含平台存在的UU号，即为这个UU号，否则新增一个当前企业的user（UU序列生成）
 					for (PurchaseOrderAllItem item : order.getOrderItems()) {
 						item.setOrder(order);
 						// 取平台的产品ID
@@ -150,21 +144,6 @@ public class PurchaseServiceImpl implements PurchaseService {
 		return null;
 	}
 
-	/**
-	 * 添加用户
-	 * 
-	 * @param user
-	 * @return
-	 */
-	private User addUser(User user) {
-		user.setUserUU(null);
-		user.setEnable(Constant.NO);
-		Set<Enterprise> enterprises = new HashSet<Enterprise>();
-		enterprises.add(SystemSession.getUser().getEnterprise());
-		user.setEnterprises(enterprises);
-		return userDao.save(user);
-	}
-
 	@Override
 	public List<PurchaseOrderReply> convertPurchaseReply(List<PurchaseReply> replies) {
 		List<PurchaseOrderReply> orderReplies = new ArrayList<PurchaseOrderReply>();