无PO的采购验收单直接忽略不传

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

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

@@ -32,6 +32,7 @@ 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 {
@@ -78,6 +79,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 			PurchaseAccept accept = prodInOut.convent();
 			List<PurchaseAccept> accepts2 = purchaseAcceptDao
 					.findByEnUUAndCode(enUU, accept.getCode());
+			System.out.println(accept.getCode());
 			Enterprise vendor = enterpriseDao.findEnterpriseByUu(accept
 					.getVendUU());
 			// 采购验收单不存在，供应商UU号存在对应供应商
@@ -85,18 +87,22 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 				for (Iterator<PurchaseAcceptItem> it = accept.getAcceptItems()
 						.iterator(); it.hasNext();) {// 设置明细对应的采购单明细
 					PurchaseAcceptItem item = it.next();
-					List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
-							.findByEnUUAndOrderCodeAndNumber(enUU, item
-									.getOrderItem().getOrder().getCode(), item
-									.getOrderItem().getNumber());
-					if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
-						item.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
-						item.setOrderItemId(purchaseOrderItems.get(0).getId());
-						item.setAccept(accept);// 设置主记录
-						acceptItems.add(item);
-					} else {
+					if(item.getOrderItem() != null){
+						List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
+								.findByEnUUAndOrderCodeAndNumber(enUU, item
+										.getOrderItem().getOrder().getCode(), item
+										.getOrderItem().getNumber());
+						if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
+							item.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
+							item.setOrderItemId(purchaseOrderItems.get(0).getId());
+							item.setAccept(accept);// 设置主记录
+							acceptItems.add(item);
+						} else {
+							it.remove();
+						}
+					}else{
 						it.remove();
-					}
+					}									
 				}
 			}
 		}