修复采购预测单传输bug

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

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

@@ -10,67 +10,79 @@ import org.springframework.util.CollectionUtils;
 import com.uas.platform.b2b.model.EnterpriseInfo;
 import com.uas.platform.b2b.model.PurchaseForecastAll;
 import com.uas.platform.b2b.model.PurchaseForecastAllItem;
-import com.uas.platform.b2b.model.UserBaseInfo;
 import com.uas.platform.b2b.support.SystemSession;
 
 public class PurchaseForecast {
 	private Long pf_id;
 	private String pf_code;
-	private Date pf_date;	
+	private Date pf_date;
 	private String pf_kind;
 	private String pf_recorder;
-	private String pf_purpose;//用途
+	private String pf_purpose;// 用途
 	private Long em_uu;
 	private List<PurchaseForecastDetail> purchaseForecastDetails;
-	
-	
+
 	public Long getPf_id() {
 		return pf_id;
 	}
+
 	public void setPf_id(Long pf_id) {
 		this.pf_id = pf_id;
 	}
+
 	public String getPf_code() {
 		return pf_code;
 	}
+
 	public void setPf_code(String pf_code) {
 		this.pf_code = pf_code;
 	}
+
 	public Date getPf_date() {
 		return pf_date;
 	}
+
 	public void setPf_date(Date pf_date) {
 		this.pf_date = pf_date;
 	}
+
 	public String getPf_kind() {
 		return pf_kind;
 	}
+
 	public void setPf_kind(String pf_kind) {
 		this.pf_kind = pf_kind;
 	}
+
 	public String getPf_recorder() {
 		return pf_recorder;
 	}
+
 	public void setPf_recorder(String pf_recorder) {
 		this.pf_recorder = pf_recorder;
 	}
+
 	public String getPf_purpose() {
 		return pf_purpose;
 	}
+
 	public void setPf_purpose(String pf_purpose) {
 		this.pf_purpose = pf_purpose;
 	}
+
 	public Long getEm_uu() {
 		return em_uu;
 	}
+
 	public void setEm_uu(Long em_uu) {
 		this.em_uu = em_uu;
 	}
+
 	public List<PurchaseForecastDetail> getPurchaseForecastDetails() {
 		return purchaseForecastDetails;
 	}
-	public void setPurchaseForecastDetails(
-			List<PurchaseForecastDetail> purchaseForecastDetails) {
+
+	public void setPurchaseForecastDetails(List<PurchaseForecastDetail> purchaseForecastDetails) {
 		this.purchaseForecastDetails = purchaseForecastDetails;
 	}
 
@@ -81,14 +93,11 @@ public class PurchaseForecast {
 	 */
 	public PurchaseForecastAll convert() {
 		PurchaseForecastAll forecast = new PurchaseForecastAll();
-		forecast.setCode(this.pf_code);		
+		forecast.setCode(this.pf_code);
 		forecast.setDate(this.pf_date);
 		forecast.setEnUU(SystemSession.getUser().getEnterprise().getUu());
 		forecast.setEnterprise(new EnterpriseInfo(SystemSession.getUser().getEnterprise()));
-		UserBaseInfo user = new UserBaseInfo();
-		user.setUserUU(this.em_uu);
-		forecast.setUser(user);
-		if (this.em_uu != null) {//ERP采购预测中采购员存在UU号
+		if (this.em_uu != null) {// ERP采购预测中采购员存在UU号
 			forecast.setUserUU(this.em_uu);
 		}
 		forecast.setRecorder(this.pf_recorder);

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

@@ -12,6 +12,7 @@ import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.erp.model.PurchaseForecast;
 import com.uas.platform.b2b.erp.service.PurchaseForecastService;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.Product;
@@ -20,7 +21,6 @@ import com.uas.platform.b2b.model.PurchaseForecastAllItem;
 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.b2b.erp.model.PurchaseForecast;
 
 @Service
 public class PurchaseForecastServiceImpl implements PurchaseForecastService {
@@ -35,34 +35,34 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 	private UserDao userDao;
 	@Autowired
 	private PurchaseForecastAllDao purchaseForecastDao;
+
 	@Override
 	public List<PurchaseForecastAllItem> convertPurchaseForecast(List<PurchaseForecast> purchaseForecasts) {
 		List<PurchaseForecastAllItem> items = new ArrayList<PurchaseForecastAllItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseForecast purchaseForecast : purchaseForecasts) {
 			// 先查看是否已存在
-			List<PurchaseForecastAll> forecasts = purchaseForecastDao.findByEnUUAndCode(enUU, purchaseForecast.getPf_code());
+			List<PurchaseForecastAll> forecasts = purchaseForecastDao.findByEnUUAndCode(enUU,
+					purchaseForecast.getPf_code());
 			if (forecasts.size() == 0) {
 				PurchaseForecastAll forecast = purchaseForecast.convert();
 				if (!CollectionUtils.isEmpty(forecast.getForecastItems())) {
-					//设置User
-					if(forecast.getUser().getUserUU() != null) {
+					// 设置User
+					if (forecast.getUserUU() != null) {
 						List<User> users = userDao.findByEnUUAndUserUU(enUU, forecast.getUser().getUserUU());
-						if(users.size() > 0) {
-							forecast.setUserUU(users.get(0).getUserUU());
-						} else {
+						if (CollectionUtils.isEmpty(users)) {
 							forecast.setUserUU(SystemSession.getUser().getUserUU());
 						}
 					} else {
 						forecast.setUserUU(SystemSession.getUser().getUserUU());
 					}
-					//对明细遍历
+					// 对明细遍历
 					for (PurchaseForecastAllItem item : forecast.getForecastItems()) {
 						item.setOrder(forecast);
-						if (item.getVendUU() != null) {//明细中有供应商uu号
+						if (item.getVendUU() != null) {// 明细中有供应商uu号
 							List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(enUU, item.getVendUU());
 							Vendor vendor = null;
-							if(vendors.size() == 0) {
+							if (vendors.size() == 0) {
 								vendor = addVendor(item);
 							} else {
 								vendor = vendors.get(0);
@@ -70,16 +70,17 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 							List<Product> products = productDao.findByEnUUAndCode(enUU, item.getProduct().getCode());
 							if (products.size() > 0 && vendor != null) {
 								item.setVendUU(vendor.getVendEnUU());
-								if(item.getVendUserUU() != null && item.getVendUserUU() != 0) {
-									List<User> vendUsers = userDao.findByEnUUAndUserUU(vendor.getVendEnUU(), item.getVendUserUU());
-									if(vendUsers.size() == 0) {
-										//平台中的供应商企业不存在供应商联系人uu的用户
-										//则设为平台中供应商列表中的供应商联系人UU
+								if (item.getVendUserUU() != null && item.getVendUserUU() != 0) {
+									List<User> vendUsers = userDao.findByEnUUAndUserUU(vendor.getVendEnUU(),
+											item.getVendUserUU());
+									if (vendUsers.size() == 0) {
+										// 平台中的供应商企业不存在供应商联系人uu的用户
+										// 则设为平台中供应商列表中的供应商联系人UU
 										item.setVendUserUU(vendors.get(0).getVendUserUU());
 									}
-								}else {
-									//买方ERP中供应商资料没有设置供应商联系人uu
-									//则设为平台中供应商列表中的供应商联系人UU
+								} else {
+									// 买方ERP中供应商资料没有设置供应商联系人uu
+									// 则设为平台中供应商列表中的供应商联系人UU
 									item.setVendUserUU(vendors.get(0).getVendUserUU());
 								}
 								item.setProduct(products.get(0));
@@ -104,7 +105,8 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 		if (enterprise != null) {
 			Vendor vendor = new Vendor();
 			vendor.setMyEnUU(forecastItem.getOrder().getEnUU());
-			if(forecastItem.getOrder().getUserUU() != null && userDao.findOne(forecastItem.getOrder().getUserUU()) != null)
+			if (forecastItem.getOrder().getUserUU() != null
+					&& userDao.findOne(forecastItem.getOrder().getUserUU()) != null)
 				vendor.setMyUserUU(forecastItem.getOrder().getUserUU());
 			else {
 				vendor.setMyUserUU(SystemSession.getUser().getUserUU());
@@ -121,5 +123,5 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 		}
 		return null;
 	}
-	
+
 }