采购验退单不关联订单展示物料信息，主要是无Po验退单没有订单，无法关联出产品信息

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

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

@@ -22,6 +22,7 @@ import com.uas.platform.b2b.dao.PurchaseReturnItemDao;
 import com.uas.platform.b2b.erp.model.PurchaseProdInOut;
 import com.uas.platform.b2b.erp.service.PurchaseProdInOutService;
 import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.PurchaseAccept;
 import com.uas.platform.b2b.model.PurchaseAcceptItem;
 import com.uas.platform.b2b.model.PurchaseBadIn;
@@ -32,7 +33,6 @@ import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.model.PurchaseReturn;
 import com.uas.platform.b2b.model.PurchaseReturnItem;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.util.StringUtil;
 
 @Service
 public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
@@ -132,14 +132,17 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 						if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
 							returnItem.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
 							returnItem.setOrderItemId(purchaseOrderItems.get(0)
-									.getId());					
+									.getId());
+							returnItem.setProduct(purchaseOrderItems.get(0).getProduct());
+							returnItem.setProdId(purchaseOrderItems.get(0).getProductId());
 						}
-					}/*else{
+					}else{
 						List<Product> prod=productDao.findByEnUUAndCode(enUU, returnItem.getProdCode());
 						if(prod.size()>0){
-							
+							returnItem.setProduct(prod.get(0));
+							returnItem.setProdId(prod.get(0).getId());
 						}
-					}*/
+					}
 					returnItem.setPurchaseReturn(returnn);// 设置主记录
 					returnItems.add(returnItem);
 				}