ERP委外单上传增加物料检验

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.erp.service.impl;
 
-import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.MakeOrderDao;
@@ -14,6 +13,7 @@ import com.uas.platform.b2b.erp.service.VendorService;
 import com.uas.platform.b2b.event.MakeOrderEndReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.exception.NotFoundException;
 import com.uas.platform.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,25 +50,29 @@ public class MakeServiceImpl implements MakeService {
 			List<MakeOrder> orders = makeOrderDao.findByEnUUAndCode(enUU, make.getMa_code());
 			Enterprise vendor = enterpriseDao.findEnterpriseByUu(make.getVe_uu());
 			List<Product> products = productDao.findByEnUUAndCode(enUU, make.getMa_prodcode());
-			if (orders.size() == 0 && vendor != null && products.size() > 0) {
-				MakeOrder makeOrder = make.convert();
-				Product product = products.get(0);
-				makeOrder.setProduct(product);
-				makeOrder.setProductId(product.getId());
-				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(enUU, make.getVe_uu());
-				Vendor vend = new Vendor();
-				if (CollectionUtils.isEmpty(vendors)) {
-					vend = addVendor(make);
-					if (null != vend) {
-						vendorService.addPartnerShipRecord(vend, appId); // 添加合作伙伴
+			if (!CollectionUtils.isEmpty(products)) {
+				if (orders.size() == 0 && vendor != null) {
+					MakeOrder makeOrder = make.convert();
+					Product product = products.get(0);
+					makeOrder.setProduct(product);
+					makeOrder.setProductId(product.getId());
+					List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(enUU, make.getVe_uu());
+					Vendor vend = new Vendor();
+					if (CollectionUtils.isEmpty(vendors)) {
+						vend = addVendor(make);
+						if (null != vend) {
+							vendorService.addPartnerShipRecord(vend, appId); // 添加合作伙伴
+						}
+					} else {
+						vend = vendors.get(0);
 					}
-				} else {
-					vend = vendors.get(0);
+					makeOrder.setUserUU(vend.getMyUserUU());
+					makeOrder.setVendUserUU(vend.getVendUserUU());
+					makeOrder.setErpDate(new Date());
+					makeOrders.add(makeOrder);
 				}
-				makeOrder.setUserUU(vend.getMyUserUU());
-				makeOrder.setVendUserUU(vend.getVendUserUU());
-				makeOrder.setErpDate(new Date());
-				makeOrders.add(makeOrder);
+			} else {
+				throw new NotFoundException(enUU + ",[" + make.getMa_prodcode() + "]对应的物料不存在,关联委外单[" + make.getMa_code() + "]");
 			}
 		}
 		return makeOrders;