存储erp传入数据时增加时间记录

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

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,33 +28,34 @@ public class ARCheckServiceImpl implements ARCheckService {
 
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Autowired
 	private VendorDao vendorDao;
-	
+
 	@Autowired
 	private SaleARCheckDao saleARCheckDao;
-	
+
 	@Autowired
 	private SaleARCheckItemDao saleARCheckItemDao;
-	
+
 	@Override
 	public List<SaleARCheckItem> convertARChecks(List<ARCheck> arChecks) {
 		List<SaleARCheckItem> arCheckItems = new ArrayList<SaleARCheckItem>();
 		long vendUU = SystemSession.getUser().getEnterprise().getUu();// 卖方UU号
-		if( ! CollectionUtils.isEmpty(arChecks)) {
-			for(ARCheck arCheck : arChecks) {
+		if (!CollectionUtils.isEmpty(arChecks)) {
+			for (ARCheck arCheck : arChecks) {
 				Enterprise customer = enterpriseDao.findOne(arCheck.getAc_custuu());
 				List<SaleARCheck> existChecks = saleARCheckDao.findByVendUUAndCode(vendUU, arCheck.getAc_code());
-				if(customer != null && CollectionUtils.isEmpty(existChecks)) {// 客户UU正确，否则不保存
+				if (customer != null && CollectionUtils.isEmpty(existChecks)) {// 客户UU正确，否则不保存
 					List<Vendor> existVendors = vendorDao.findByMyEnUUAndVendUU(arCheck.getAc_custuu(), vendUU);
-					if(CollectionUtils.isEmpty(existVendors)) {// 不存在供应商关系，增加供应商关系
+					if (CollectionUtils.isEmpty(existVendors)) {// 不存在供应商关系，增加供应商关系
 						addVendor(customer);
 					}
 					SaleARCheck saleARCheck = arCheck.convert();
-					if( !CollectionUtils.isEmpty(saleARCheck.getItems())) {
-						for(SaleARCheckItem item : saleARCheck.getItems()) {
+					if (!CollectionUtils.isEmpty(saleARCheck.getItems())) {
+						for (SaleARCheckItem item : saleARCheck.getItems()) {
 							item.setArCheck(saleARCheck);
+							item.setErpDate(new Date());
 							arCheckItems.add(item);
 						}
 					}
@@ -62,9 +64,10 @@ public class ARCheckServiceImpl implements ARCheckService {
 		}
 		return arCheckItems;
 	}
-	
+
 	/**
 	 * 在UU号正确但两者之间不存在供应商关系时，添加供应商关系
+	 * 
 	 * @param customer
 	 */
 	private void addVendor(Enterprise customer) {
@@ -80,8 +83,8 @@ public class ARCheckServiceImpl implements ARCheckService {
 	@Override
 	public List<ARCheckReply> convertReplies(List<SaleARCheckReply> replies) {
 		List<ARCheckReply> arCheckReplies = new ArrayList<ARCheckReply>();
-		if( ! CollectionUtils.isEmpty(replies)) {
-			for(SaleARCheckReply reply : replies) {
+		if (!CollectionUtils.isEmpty(replies)) {
+			for (SaleARCheckReply reply : replies) {
 				arCheckReplies.add(new ARCheckReply(reply));
 			}
 		}
@@ -91,11 +94,11 @@ public class ARCheckServiceImpl implements ARCheckService {
 	@Override
 	public List<SaleARCheckReply> convertSaleReplies(List<ARCheckReply> replies) {
 		List<SaleARCheckReply> saleARCheckReplies = new ArrayList<SaleARCheckReply>();
-		if( ! CollectionUtils.isEmpty(replies)) {
-			for(ARCheckReply reply : replies) {
+		if (!CollectionUtils.isEmpty(replies)) {
+			for (ARCheckReply reply : replies) {
 				List<SaleARCheckItem> items = saleARCheckItemDao.findByArCheckVendUUAndSourceId(
-						SystemSession.getUser().getEnterprise().getUu(), reply.getSourceId()); 
-				if( ! CollectionUtils.isEmpty(items)) {
+						SystemSession.getUser().getEnterprise().getUu(), reply.getSourceId());
+				if (!CollectionUtils.isEmpty(items)) {
 					SaleARCheckReply saleARCheckReply = new SaleARCheckReply();
 					saleARCheckReply.setItem(items.get(0));
 					saleARCheckReply.setItemId(items.get(0).getId());

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -46,10 +47,10 @@ public class InquiryServiceImpl implements InquiryService {
 
 	@Autowired
 	private SaleQuotationItemDao saleQuotationItemDao;
-	
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Autowired
 	private UserDao userDao;
 
@@ -64,9 +65,11 @@ public class InquiryServiceImpl implements InquiryService {
 				PurchaseInquiry purchaseInquiry = inquiry.convert();
 				if (!CollectionUtils.isEmpty(purchaseInquiry.getInquiryItems())) {
 					for (PurchaseInquiryItem item : purchaseInquiry.getInquiryItems()) {
+						item.setErpDate(new Date());// 存储时间
 						Vendor vendor = null;
-						List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(purchaseInquiry.getEnUU(), item.getVendUU());
-						if(vendors.size() > 0) {
+						List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(purchaseInquiry.getEnUU(),
+								item.getVendUU());
+						if (vendors.size() > 0) {
 							vendor = vendors.get(0);
 							// 如果询价单明细行没有指定供应商联系人，取平台中供应商资料中的联系人
 							if (item.getVendUserUU() == null || item.getVendUserUU() == 0) {
@@ -90,7 +93,7 @@ public class InquiryServiceImpl implements InquiryService {
 							inquiryItems.add(item);
 						}
 					}
-					
+
 				}
 			}
 		}
@@ -114,8 +117,8 @@ public class InquiryServiceImpl implements InquiryService {
 		if (!CollectionUtils.isEmpty(decides)) {
 			long enUU = SystemSession.getUser().getEnterprise().getUu();
 			for (InquiryDecide decide : decides) {
-				List<PurchaseInquiryItem> items = purchaseInquiryItemDao.findByEnUUAndCodeAndNumber(enUU, decide.getIn_code(),
-						decide.getId_detno());
+				List<PurchaseInquiryItem> items = purchaseInquiryItemDao.findByEnUUAndCodeAndNumber(enUU,
+						decide.getIn_code(), decide.getId_detno());
 				if (!CollectionUtils.isEmpty(items)) {
 					PurchaseInquiryItem item = items.get(0);
 					item.setAgreed(decide.getId_agreed());
@@ -143,8 +146,8 @@ public class InquiryServiceImpl implements InquiryService {
 		List<SaleQuotationItem> quotationItems = new ArrayList<SaleQuotationItem>();
 		if (!CollectionUtils.isEmpty(decides)) {
 			for (InquiryDecide decide : decides) {
-				List<SaleQuotationItem> items = saleQuotationItemDao
-						.findByQuotationIdAndNumber(decide.getB2b_qu_id(), decide.getId_detno());
+				List<SaleQuotationItem> items = saleQuotationItemDao.findByQuotationIdAndNumber(decide.getB2b_qu_id(),
+						decide.getId_detno());
 				if (!CollectionUtils.isEmpty(items)) {
 					SaleQuotationItem item = items.get(0);
 					item.setAgreed(decide.getId_agreed());
@@ -164,7 +167,7 @@ public class InquiryServiceImpl implements InquiryService {
 	private Vendor addVendor(PurchaseInquiryItem inquiryItem) {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
-		if(inquiryItem.getUserUU() != null && inquiryItem.getUserUU() != 0) {
+		if (inquiryItem.getUserUU() != null && inquiryItem.getUserUU() != 0) {
 			vendor.setMyUserUU(inquiryItem.getUserUU());
 		} else {
 			vendor.setMyUserUU(SystemSession.getUser().getUserUU());

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,15 +31,17 @@ public class MakeChangeServiceImpl implements MakeChangeService {
 	public List<MakeOrderChangeItem> convertMakeChange(List<MakeChange> changes) {
 		List<MakeOrderChangeItem> changeItems = new ArrayList<MakeOrderChangeItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		if(!CollectionUtils.isEmpty(changes)) {
+		if (!CollectionUtils.isEmpty(changes)) {
 			for (MakeChange change : changes) {
 				MakeOrderChange orderChange = change.convert();
-				List<MakeOrderChange> existOrderChanges = makeOrderChangeDao.findByEnUUAndCode(enUU, change.getMc_code());
+				List<MakeOrderChange> existOrderChanges = makeOrderChangeDao.findByEnUUAndCode(enUU,
+						change.getMc_code());
 				// 平台上已存在变更单时不保存
-				if(CollectionUtils.isEmpty(existOrderChanges) && !CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
-					for(MakeOrderChangeItem changeItem : orderChange.getOrderChangeItems()) {
+				if (CollectionUtils.isEmpty(existOrderChanges)
+						&& !CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
+					for (MakeOrderChangeItem changeItem : orderChange.getOrderChangeItems()) {
 						List<MakeOrder> makeOrders = makeOrderDao.findByEnUUAndCode(enUU, changeItem.getOrderCode());
-						if(makeOrders.size() > 0) {
+						if (makeOrders.size() > 0) {
 							MakeOrder makeOrder = makeOrders.get(0);
 							changeItem.setOrderId(makeOrder.getId());
 							changeItem.setProduct(makeOrder.getProduct());
@@ -46,6 +49,7 @@ public class MakeChangeServiceImpl implements MakeChangeService {
 							changeItem.setVendUU(makeOrder.getVendUU());
 							changeItem.setVendUserUU(makeOrder.getUserUU());
 							changeItem.setOrderChange(orderChange);
+							changeItem.setErpDate(new Date());
 							changeItems.add(changeItem);
 						}
 					}
@@ -56,17 +60,14 @@ public class MakeChangeServiceImpl implements MakeChangeService {
 	}
 
 	@Override
-	public List<MakeChangeReply> convertMakeOrderChangeReply(
-			List<MakeOrderChangeItem> items) {
+	public List<MakeChangeReply> convertMakeOrderChangeReply(List<MakeOrderChangeItem> items) {
 		List<MakeChangeReply> replies = new ArrayList<MakeChangeReply>();
-		if( ! CollectionUtils.isEmpty(items)) {
-			for(MakeOrderChangeItem item : items) {
+		if (!CollectionUtils.isEmpty(items)) {
+			for (MakeOrderChangeItem item : items) {
 				replies.add(new MakeChangeReply(item));
 			}
 		}
 		return replies;
 	}
 
-
-
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -29,10 +30,10 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 
 	@Autowired
 	private EnterpriseDao enterprisedao;
-	
+
 	@Autowired
 	private MakeOrderDao makeOrderDao;
-	
+
 	@Autowired
 	private MakeReturnDao makeReturnDao;
 
@@ -59,6 +60,7 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 						item.setOrder(makeOrders.get(0));// 对应的加工单set进去
 						item.setOrderId(makeOrders.get(0).getId());
 						item.setAccept(accept);// 设置主记录
+						item.setErpDate(new Date());
 						acceptItems.add(item);
 					} else {
 						it.remove();
@@ -72,11 +74,11 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 	@Override
 	public List<MakeAccept> convertNonPostingProdInOuts(List<MakeProdInOut> prodInOuts) {
 		List<MakeAccept> accepts = new ArrayList<MakeAccept>();
-		if( ! CollectionUtils.isEmpty(prodInOuts)) {
+		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
-			for(MakeProdInOut prodInOut : prodInOuts) {
+			for (MakeProdInOut prodInOut : prodInOuts) {
 				List<MakeAccept> existAccepts = makeAcceptDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
-				if(existAccepts.size() > 0) {
+				if (existAccepts.size() > 0) {
 					accepts.add(existAccepts.get(0));
 				}
 			}
@@ -86,39 +88,40 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 
 	@Override
 	public List<MakeReturnItem> convertReturns(List<MakeProdInOut> prodInOuts) {
-			List<MakeReturnItem> returnItems = new ArrayList<MakeReturnItem>();
-			long enUU = SystemSession.getUser().getEnterprise().getUu();
-			for(MakeProdInOut prodInOut : prodInOuts) {
-				MakeReturn returnn = prodInOut.conventToReturn();
-				List<MakeReturn> returns2 = makeReturnDao.findByEnUUAndCode(enUU, returnn.getCode());
-				Enterprise vendor = enterprisedao.findEnterpriseByUu(returnn.getVendUU());
-				//采购验收单不存在，供应商UU号存在对应供应商
-				if(returns2.size() == 0 && vendor != null) {
-					for(Iterator<MakeReturnItem> it = returnn.getReturnItems().iterator(); it.hasNext();) {//设置明细对应的采购单明细
-						MakeReturnItem returnItem = it.next();
-						List<MakeOrder> makeOrders = makeOrderDao.findByEnUUAndCode(enUU, returnItem.getOrder().getCode());
-						if(makeOrders.size() > 0) {//对应的采购单存在
-							returnItem.setOrder(makeOrders.get(0));//对应的采购单明细set进去
-							returnItem.setOrderId(makeOrders.get(0).getId());
-							returnItem.setReturn(returnn);//设置主记录
-							returnItems.add(returnItem);
-						} else {
-							it.remove();
-						}
+		List<MakeReturnItem> returnItems = new ArrayList<MakeReturnItem>();
+		long enUU = SystemSession.getUser().getEnterprise().getUu();
+		for (MakeProdInOut prodInOut : prodInOuts) {
+			MakeReturn returnn = prodInOut.conventToReturn();
+			List<MakeReturn> returns2 = makeReturnDao.findByEnUUAndCode(enUU, returnn.getCode());
+			Enterprise vendor = enterprisedao.findEnterpriseByUu(returnn.getVendUU());
+			// 采购验收单不存在，供应商UU号存在对应供应商
+			if (returns2.size() == 0 && vendor != null) {
+				for (Iterator<MakeReturnItem> it = returnn.getReturnItems().iterator(); it.hasNext();) {// 设置明细对应的采购单明细
+					MakeReturnItem returnItem = it.next();
+					List<MakeOrder> makeOrders = makeOrderDao.findByEnUUAndCode(enUU, returnItem.getOrder().getCode());
+					if (makeOrders.size() > 0) {// 对应的采购单存在
+						returnItem.setOrder(makeOrders.get(0));// 对应的采购单明细set进去
+						returnItem.setOrderId(makeOrders.get(0).getId());
+						returnItem.setReturn(returnn);// 设置主记录
+						returnItem.setErpDate(new Date());
+						returnItems.add(returnItem);
+					} else {
+						it.remove();
 					}
 				}
 			}
-			return returnItems;
+		}
+		return returnItems;
 	}
 
 	@Override
 	public List<MakeReturn> convertNonPostingReturns(List<MakeProdInOut> prodInOuts) {
 		List<MakeReturn> returns = new ArrayList<MakeReturn>();
-		if( ! CollectionUtils.isEmpty(prodInOuts)) {
+		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
-			for(MakeProdInOut prodInOut : prodInOuts) {
+			for (MakeProdInOut prodInOut : prodInOuts) {
 				List<MakeReturn> existReturns = makeReturnDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
-				if(existReturns.size() > 0) {
+				if (existReturns.size() > 0) {
 					returns.add(existReturns.get(0));
 				}
 			}
@@ -126,5 +129,4 @@ public class MakeProdInOutServiceImpl implements MakeProdInOutService {
 		return returns;
 	}
 
-
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,23 +27,23 @@ import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Status;
 
 @Service
-public class MakeServiceImpl implements MakeService{
+public class MakeServiceImpl implements MakeService {
 
 	@Autowired
 	private MakeOrderDao makeOrderDao;
-	
+
 	@Autowired
 	private MakeOrderItemDao makeOrderItemDao;
-	
+
 	@Autowired
 	private ProductDao productDao;
-	
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Autowired
 	private UserDao userDao;
-	
+
 	@Autowired
 	private VendorDao vendorDao;
 
@@ -50,41 +51,44 @@ public class MakeServiceImpl implements MakeService{
 	public List<MakeOrder> convertMakes(List<Make> makes) {
 		List<MakeOrder> makeOrders = new ArrayList<MakeOrder>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		for(Make make : makes) {
+		for (Make make : makes) {
 			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) {
+			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)) {
+				if (CollectionUtils.isEmpty(vendors)) {
 					vend = addVendor(make);
 				} else {
 					vend = vendors.get(0);
 				}
 				makeOrder.setUserUU(vend.getMyUserUU());
 				makeOrder.setVendUserUU(vend.getVendUserUU());
+				makeOrder.setErpDate(new Date());
 				makeOrders.add(makeOrder);
 			}
 		}
 		return makeOrders;
 	}
-	
+
 	/**
 	 * 增加供应商关系
+	 * 
 	 * @param make
 	 */
-	private Vendor addVendor(Make make){
+	private Vendor addVendor(Make make) {
 		Long vendUU = make.getVe_uu();
-		if(vendUU == 0 || vendUU == null) {
+		if (vendUU == 0 || vendUU == null) {
 			throw new IllegalArgumentException("委外订单增加供应商错误，供应商UU号参数错误");
 		} else {
 			Enterprise vend = enterpriseDao.findOne(vendUU);
-			if(vend == null) throw new IllegalArgumentException("委外订单增加供应商错误，供应商UU号参数错误");
+			if (vend == null)
+				throw new IllegalArgumentException("委外订单增加供应商错误，供应商UU号参数错误");
 			Vendor vendor = new Vendor();
 			vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
 			vendor.setVendEnUU(vend.getUu());
@@ -97,8 +101,8 @@ public class MakeServiceImpl implements MakeService{
 	@Override
 	public List<MakeReply> convertMakeOrderReply(List<MakeOrderReply> replies) {
 		List<MakeReply> makeReplies = new ArrayList<MakeReply>();
-		if(!CollectionUtils.isEmpty(replies)) {
-			for(MakeOrderReply reply : replies) {
+		if (!CollectionUtils.isEmpty(replies)) {
+			for (MakeOrderReply reply : replies) {
 				makeReplies.add(new MakeReply(reply));
 			}
 		}
@@ -109,10 +113,10 @@ public class MakeServiceImpl implements MakeService{
 	public List<MakeOrder> convertMakeEnd(List<MakeEnd> ends) {
 		List<MakeOrder> makeOrders = new ArrayList<MakeOrder>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		if( ! CollectionUtils.isEmpty(ends)) {
-			for(MakeEnd end : ends) {
+		if (!CollectionUtils.isEmpty(ends)) {
+			for (MakeEnd end : ends) {
 				List<MakeOrder> existOrders = makeOrderDao.findByEnUUAndCode(enUU, end.getMa_code());
-				if( !CollectionUtils.isEmpty(existOrders)) {
+				if (!CollectionUtils.isEmpty(existOrders)) {
 					MakeOrder makeOrder = existOrders.get(0);
 					makeOrder.setEnd(end.getMa_ended());
 					makeOrder.setEndSendStatus((short) Status.NOT_UPLOAD.value());
@@ -123,5 +127,4 @@ public class MakeServiceImpl implements MakeService{
 		return makeOrders;
 	}
 
-
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +16,7 @@ import com.uas.platform.b2b.support.SystemSession;
 
 @Service
 public class ProdServiceImpl implements ProdService {
-	
+
 	@Autowired
 	private ProductDao productDao;
 
@@ -23,18 +24,19 @@ public class ProdServiceImpl implements ProdService {
 	public List<Product> convertProduct(List<Prod> prods) {
 		List<Product> products = new ArrayList<Product>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		for(Prod prod:prods) {
+		for (Prod prod : prods) {
 			List<Product> prodResult = productDao.findByEnUUAndCode(enUU, prod.getPr_code());
-			if(CollectionUtils.isEmpty(prodResult)) {// 平台上不存在的新上传上来的物料，新增
+			if (CollectionUtils.isEmpty(prodResult)) {// 平台上不存在的新上传上来的物料，新增
 				products.add(prod.convert());
 			} else {// 平台上已经存在的物料，修改
 				Product product = prod.convert();
 				product.setId(prodResult.get(0).getId());
 				product.setCode(prodResult.get(0).getCode());
+				product.setErpDate(new Date());
 				products.add(product);
 			}
 		}
 		return products;
 	}
-	
+
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -21,17 +22,17 @@ import com.uas.platform.b2b.model.PurchaseApBillItem;
 import com.uas.platform.b2b.support.SystemSession;
 
 @Service
-public class PurchaseAPBillServiceImpl implements PurchaseAPBillService{
+public class PurchaseAPBillServiceImpl implements PurchaseAPBillService {
 
 	@Autowired
 	private PurchaseApBillDao purchaseApBillDao;
-	
+
 	@Autowired
 	private PurchaseApBillItemDao purchaseApBillItemDao;
-	
+
 	@Autowired
 	private ProductDao productDao;
-	
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
@@ -39,19 +40,20 @@ public class PurchaseAPBillServiceImpl implements PurchaseAPBillService{
 	public List<PurchaseApBillItem> convertApBills(List<PurchaseAPBill> apBills) {
 		List<PurchaseApBillItem> apBillItems = new ArrayList<PurchaseApBillItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		for(PurchaseAPBill apBill : apBills) {
+		for (PurchaseAPBill apBill : apBills) {
 			List<PurchaseApBill> apBills2 = purchaseApBillDao.findByEnUUAndCode(enUU, apBill.getAb_code());
 			Enterprise vendor = enterpriseDao.findEnterpriseByUu(apBill.getAb_vendoruu());
-			if(apBills2.size() == 0 && vendor != null) {
+			if (apBills2.size() == 0 && vendor != null) {
 				PurchaseApBill purchaseApBill = apBill.convert();
 				Iterator<PurchaseApBillItem> items = purchaseApBill.getItems().iterator();
-				while(items.hasNext()) {
+				while (items.hasNext()) {
 					PurchaseApBillItem apBillItem = items.next();
 					List<Product> products = productDao.findByEnUUAndCode(enUU, apBillItem.getProduct().getCode());
-					if(products.size() > 0) {
+					if (products.size() > 0) {
 						apBillItem.setProduct(products.get(0));
 						apBillItem.setProductId(products.get(0).getId());
 						apBillItem.setaPBill(purchaseApBill);
+						apBillItem.setErpDate(new Date());
 						apBillItems.add(apBillItem);
 					} else {
 						items.remove();
@@ -63,14 +65,13 @@ public class PurchaseAPBillServiceImpl implements PurchaseAPBillService{
 	}
 
 	@Override
-	public List<PurchaseApBill> convertNonPostingApBills(
-			List<PurchaseAPBill> apBills) {
+	public List<PurchaseApBill> convertNonPostingApBills(List<PurchaseAPBill> apBills) {
 		List<PurchaseApBill> purchaseApBills = new ArrayList<PurchaseApBill>();
-		if( ! CollectionUtils.isEmpty(apBills)) {
+		if (!CollectionUtils.isEmpty(apBills)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
-			for(PurchaseAPBill apBill : apBills) {
+			for (PurchaseAPBill apBill : apBills) {
 				List<PurchaseApBill> list = purchaseApBillDao.findByEnUUAndCode(enUU, apBill.getAb_code());
-				if(list.size() > 0) {
+				if (list.size() > 0) {
 					purchaseApBills.add(list.get(0));
 				}
 			}

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +37,7 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 
 	@Autowired
 	private PurchaseOrderChangeDao purchaseOrderChangeDao;
-	
+
 	@Autowired
 	private PurchaseOrderChangeItemDao purchaseOrderChangeItemDao;
 
@@ -47,27 +48,31 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 		for (PurchaseChange change : changes) {
 			PurchaseOrderChange orderChange = change.convert();
 			List<PurchaseOrder> orders = purchaseOrderDao.findByEnUUAndCode(enUU, change.getPc_purccode());
-			List<PurchaseOrderChange> orderChanges = purchaseOrderChangeDao.findByEnUUAndCode(enUU, change.getPc_code());
+			List<PurchaseOrderChange> orderChanges = purchaseOrderChangeDao.findByEnUUAndCode(enUU,
+					change.getPc_code());
 			// 原采购单需存在，变更单不存在
 			if (orders.size() > 0 && orderChanges.size() == 0) {
 				convertOrderInfo(orderChange, orders.get(0));// 赋值原单据信息字段
 				if (!CollectionUtils.isEmpty(orderChange.getOrderChangeItems())) {
 					for (PurchaseOrderChangeItem item : orderChange.getOrderChangeItems()) {
+						item.setErpDate(new Date());
 						// 取订单明细ID
-						List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU, orderChange
-								.getOrderCode(), item.getOrderItemNumber());
+						List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU,
+								orderChange.getOrderCode(), item.getOrderItemNumber());
 						if (orderItems.size() > 0) {
 							convertOrderItemInfo(item, orderItems.get(0));// 赋值原单据信息字段
 						}
 						// 取平台的产品ID
 						Product newProduct = item.getNewProduct();
-						List<Product> products = productDao.findByEnUUAndCode(newProduct.getEnUU(), newProduct.getCode());
+						List<Product> products = productDao.findByEnUUAndCode(newProduct.getEnUU(),
+								newProduct.getCode());
 						if (products.size() > 0) {
 							item.setNewProduct(products.get(0));
 							item.setNewProductId(products.get(0).getId());
 						}
 						item.setOrderChange(orderChange);
 					}
+
 					changeItems.addAll(orderChange.getOrderChangeItems());
 				}
 			}
@@ -82,9 +87,10 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 			replies.add(new PurchaseChangeReply(change));
 		return replies;
 	}
-	
+
 	/**
 	 * 向变更单赋值原单据信息字段
+	 * 
 	 * @param change
 	 * @param order
 	 */
@@ -99,9 +105,10 @@ public class PurchaseChangeServiceImpl implements PurchaseChangeService {
 		change.setOldRate(order.getRate());
 		change.setOrderCode(order.getCode());
 	}
-	
+
 	/**
 	 * 向变更单明细赋值原单据信息字段
+	 * 
 	 * @param changeItem
 	 * @param orderItem
 	 */

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,6 +86,7 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 								}
 								item.setProduct(products.get(0));
 								item.setProductId(products.get(0).getId());
+								item.setErpDate(new Date());
 								items.add(item);
 							}
 						}

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

@@ -47,10 +47,12 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 		List<PurchaseNotice> oppNotices = new ArrayList<PurchaseNotice>();
 		for (PurchaseNotify notify : notifies) {
 			PurchaseNotice notice = notify.convert();
-			List<PurchaseNotice> existNotices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(), notice.getSourceId());
+			List<PurchaseNotice> existNotices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(),
+					notice.getSourceId());
 			if (CollectionUtils.isEmpty(existNotices)) {// sourceId不存在新增保存
-				List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(notice.getEnUU(), notice
-						.getOrderItem().getOrder().getCode(), notice.getOrderItem().getNumber());
+				List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(
+						notice.getEnUU(), notice.getOrderItem().getOrder().getCode(),
+						notice.getOrderItem().getNumber());
 				if (!CollectionUtils.isEmpty(orderItems)) {
 					notice.setOrderItem(orderItems.get(0));
 					notice.setOrderItemId(notice.getOrderItem().getId());
@@ -61,23 +63,26 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 				SimpleDateFormat dateFormat = new SimpleDateFormat("MM月dd日");
 				String dateString = dateFormat.format(new Date());
 				String remark = "";
-				if(StringUtils.hasText(existNotice.getRemark())) {
+				if (StringUtils.hasText(existNotice.getRemark())) {
 					remark = existNotice.getRemark() + "； ";
 				}
-				existNotice.setSendStatus((short) Status.NOT_UPLOAD.value());//对卖家传输状态 待上传
-				if(existNotice.getQty() != null && !existNotice.getQty().equals(notice.getQty())) {
-					if(existNotice.getEndQty() > notice.getQty()) {
+				existNotice.setSendStatus((short) Status.NOT_UPLOAD.value());// 对卖家传输状态
+																				// 待上传
+				if (existNotice.getQty() != null && !existNotice.getQty().equals(notice.getQty())) {
+					if (existNotice.getEndQty() > notice.getQty()) {
 						// 已发货数大于新的需求数，修改平台上的需求数为已发货数，将已发货数量传回买家ERP修改发货提醒的数量
-						existNotice.setRemark(remark + dateString + "修改需求数量，" + 
-								existNotice.getQty() + " -> " + existNotice.getEndQty());
-						existNotice.setQty(existNotice.getEndQty());//需求数量
-						existNotice.setStatus((short) Status.REPLIED.value());//状态 已回复
+						existNotice.setRemark(remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> "
+								+ existNotice.getEndQty());
+						existNotice.setQty(existNotice.getEndQty());// 需求数量
+						existNotice.setStatus((short) Status.REPLIED.value());// 状态
+																				// 已回复
+						existNotice.setErpDate(new Date());
 						oppNotices.add(existNotice);
 						notices.add(existNotice);
 					} else {
 						// 已发货数小于或等于新的需求数，修改平台上的需求数为新的需求数
-						existNotice.setRemark(remark + dateString + "修改需求数量，" + 
-								existNotice.getQty() + " -> " + notice.getQty());
+						existNotice.setRemark(
+								remark + dateString + "修改需求数量，" + existNotice.getQty() + " -> " + notice.getQty());
 						existNotice.setQty(notice.getQty());// 需求数量
 						existNotice.setDelivery(notice.getDelivery());// 交期
 						notices.add(existNotice);
@@ -85,15 +90,14 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 				} else {
 					String existDeliveryStr = "空";
 					String deliveryStr = "空";
-					if(existNotice.getDelivery() != null) {
+					if (existNotice.getDelivery() != null) {
 						existDeliveryStr = dateFormat.format(existNotice.getDelivery());
 					}
-					if(notice.getDelivery() != null) {
+					if (notice.getDelivery() != null) {
 						deliveryStr = dateFormat.format(notice.getDelivery());
 					}
-					if( ! existDeliveryStr.equals(deliveryStr)) {
-						existNotice.setRemark(remark + dateString + "修改交期，" + 
-								existDeliveryStr + " -> " + deliveryStr);
+					if (!existDeliveryStr.equals(deliveryStr)) {
+						existNotice.setRemark(remark + dateString + "修改交期，" + existDeliveryStr + " -> " + deliveryStr);
 					}
 					existNotice.setDelivery(notice.getDelivery());// 交期
 					notices.add(existNotice);
@@ -123,7 +127,8 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 				for (SaleSendItem item : items) {
 					item.setSend(send);
 					PurchaseNotice notice = item.getNotice();
-					List<PurchaseNotice> notices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(), notice.getSourceId());
+					List<PurchaseNotice> notices = purchaseNoticeDao.findByEnUUAndSourceId(notice.getEnUU(),
+							notice.getSourceId());
 					if (!CollectionUtils.isEmpty(notices)) {
 						item.setNotice(notices.get(0));
 						item.setNoticeId(item.getNotice().getId());
@@ -139,7 +144,8 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 	public List<SaleSendItem> convertAcceptNotifyDetail(List<AcceptNotifyConfirm> confirms) {
 		List<SaleSendItem> sendItems = new ArrayList<SaleSendItem>();
 		for (AcceptNotifyConfirm confirm : confirms) {
-			List<SaleSendItem> items = saleSendItemDao.findBySendAndNumber(confirm.getB2b_ss_id(), confirm.getAnd_detno());
+			List<SaleSendItem> items = saleSendItemDao.findBySendAndNumber(confirm.getB2b_ss_id(),
+					confirm.getAnd_detno());
 			if (items.size() > 0) {
 				SaleSendItem item = items.get(0);
 				item.modify(item.getQty(), confirm.getAnd_inqty());
@@ -156,11 +162,12 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 	public List<SaleSendItemVerify> convertAcceptNotifyVerify(List<AcceptNotifyVerify> verifies) {
 		List<SaleSendItemVerify> sendItemVerifies = new ArrayList<SaleSendItemVerify>();
 		for (AcceptNotifyVerify verify : verifies) {
-			List<SaleSendItemVerify> verifies2 = saleSendItemVerifyDao.findByCustUUAndSourceId(
-					SystemSession.getUser().getEnterprise().getUu(), verify.getVad_id());
-			if(verifies2.size() == 0) {
+			List<SaleSendItemVerify> verifies2 = saleSendItemVerifyDao
+					.findByCustUUAndSourceId(SystemSession.getUser().getEnterprise().getUu(), verify.getVad_id());
+			if (verifies2.size() == 0) {
 				SaleSendItemVerify sendItemVerify = verify.convert();
-				List<SaleSendItem> items = saleSendItemDao.findBySendAndNumber(verify.getB2b_ss_id(), verify.getAnd_detno());
+				List<SaleSendItem> items = saleSendItemDao.findBySendAndNumber(verify.getB2b_ss_id(),
+						verify.getAnd_detno());
 				if (items.size() > 0) {
 					sendItemVerify.setSendItemId(items.get(0).getId());
 					sendItemVerifies.add(sendItemVerify);
@@ -177,8 +184,8 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 	public List<SaleSendItemVerify> convertAcceptUnauditVerify(List<AcceptNotifyVerify> verifies) {
 		List<SaleSendItemVerify> sendItemVerifies = new ArrayList<SaleSendItemVerify>();
 		for (AcceptNotifyVerify verify : verifies) {
-			List<SaleSendItemVerify> itemVerifies = saleSendItemVerifyDao.findByCustUUAndSourceId(
-					SystemSession.getUser().getEnterprise().getUu(), verify.getVad_id());
+			List<SaleSendItemVerify> itemVerifies = saleSendItemVerifyDao
+					.findByCustUUAndSourceId(SystemSession.getUser().getEnterprise().getUu(), verify.getVad_id());
 			if (itemVerifies.size() > 0) {
 				sendItemVerifies.add(itemVerifies.get(0));
 			}

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -66,42 +67,38 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Autowired
 	private ProductDao productDao;
 
 	@Override
-	public List<PurchaseAcceptItem> convertProdInOuts(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseAcceptItem> convertProdInOuts(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseAcceptItem> acceptItems = new ArrayList<PurchaseAcceptItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseProdInOut prodInOut : prodInOuts) {
 			PurchaseAccept accept = prodInOut.convent();
-			List<PurchaseAccept> accepts2 = purchaseAcceptDao
-					.findByEnUUAndCode(enUU, accept.getCode());
-			Enterprise vendor = enterpriseDao.findEnterpriseByUu(accept
-					.getVendUU());
+			List<PurchaseAccept> accepts2 = purchaseAcceptDao.findByEnUUAndCode(enUU, accept.getCode());
+			Enterprise vendor = enterpriseDao.findEnterpriseByUu(accept.getVendUU());
 			// 采购验收单不存在，供应商UU号存在对应供应商
 			if (accepts2.size() == 0 && vendor != null) {
-				for (Iterator<PurchaseAcceptItem> it = accept.getAcceptItems()
-						.iterator(); it.hasNext();) {// 设置明细对应的采购单明细
+				for (Iterator<PurchaseAcceptItem> it = accept.getAcceptItems().iterator(); it.hasNext();) {// 设置明细对应的采购单明细
 					PurchaseAcceptItem item = it.next();
-					if(item.getOrderItem() != null){
+					if (item.getOrderItem() != null) {
 						List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
-								.findByEnUUAndOrderCodeAndNumber(enUU, item
-										.getOrderItem().getOrder().getCode(), item
-										.getOrderItem().getNumber());
+								.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);// 设置主记录
+							item.setErpDate(new Date());
 							acceptItems.add(item);
 						} else {
 							it.remove();
 						}
-					}else{
+					} else {
 						it.remove();
-					}									
+					}
 				}
 			}
 		}
@@ -109,40 +106,35 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseReturnItem> convertReturns(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseReturnItem> convertReturns(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseReturnItem> returnItems = new ArrayList<PurchaseReturnItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseProdInOut prodInOut : prodInOuts) {
 			PurchaseReturn returnn = prodInOut.conventToReturn();
-			List<PurchaseReturn> returns2 = purchaseReturnDao
-					.findByEnUUAndCode(enUU, returnn.getCode());
-			Enterprise vendor = enterpriseDao.findEnterpriseByUu(returnn
-					.getVendUU());
+			List<PurchaseReturn> returns2 = purchaseReturnDao.findByEnUUAndCode(enUU, returnn.getCode());
+			Enterprise vendor = enterpriseDao.findEnterpriseByUu(returnn.getVendUU());
 			// 采购验收单不存在，供应商UU号存在对应供应商
 			if (returns2.size() == 0 && vendor != null) {
 				for (PurchaseReturnItem returnItem : returnn.getReturnItems()) {// 设置明细对应的采购单明细
 					if (returnItem.getOrderItem() != null) {
 						List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
-								.findByEnUUAndOrderCodeAndNumber(enUU,
-										returnItem.getOrderItem().getOrder()
-												.getCode(), returnItem
-												.getOrderItem().getNumber());
+								.findByEnUUAndOrderCodeAndNumber(enUU, returnItem.getOrderItem().getOrder().getCode(),
+										returnItem.getOrderItem().getNumber());
 						if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
 							returnItem.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
-							returnItem.setOrderItemId(purchaseOrderItems.get(0)
-									.getId());
+							returnItem.setOrderItemId(purchaseOrderItems.get(0).getId());
 							returnItem.setProduct(purchaseOrderItems.get(0).getProduct());
 							returnItem.setProdId(purchaseOrderItems.get(0).getProductId());
 						}
-					}else{
-						List<Product> prod=productDao.findByEnUUAndCode(enUU, returnItem.getProdCode());
-						if(prod.size()>0){
+					} 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);// 设置主记录
+					returnItem.setErpDate(new Date());
 					returnItems.add(returnItem);
 				}
 			}
@@ -151,30 +143,24 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseBadInItem> convertBadIns(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseBadInItem> convertBadIns(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseBadInItem> badInItems = new ArrayList<PurchaseBadInItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseProdInOut prodInOut : prodInOuts) {
 			PurchaseBadIn badIn = prodInOut.conventToBadIn();
-			List<PurchaseBadIn> badIns = purchaseBadInDao.findByEnUUAndCode(
-					enUU, badIn.getCode());
-			Enterprise vendor = enterpriseDao.findEnterpriseByUu(badIn
-					.getVendUU());
+			List<PurchaseBadIn> badIns = purchaseBadInDao.findByEnUUAndCode(enUU, badIn.getCode());
+			Enterprise vendor = enterpriseDao.findEnterpriseByUu(badIn.getVendUU());
 			// 采购验收单不存在，供应商UU号存在对应供应商
 			if (badIns.size() == 0 && vendor != null) {
-				for (Iterator<PurchaseBadInItem> it = badIn.getBadInItems()
-						.iterator(); it.hasNext();) {// 设置明细对应的采购单明细
+				for (Iterator<PurchaseBadInItem> it = badIn.getBadInItems().iterator(); it.hasNext();) {// 设置明细对应的采购单明细
 					PurchaseBadInItem badInItem = it.next();
-					List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
-							.findByEnUUAndOrderCodeAndNumber(enUU, badInItem
-									.getOrderItem().getOrder().getCode(),
-									badInItem.getOrderItem().getNumber());
+					List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(
+							enUU, badInItem.getOrderItem().getOrder().getCode(), badInItem.getOrderItem().getNumber());
 					if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
 						badInItem.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
-						badInItem.setOrderItemId(purchaseOrderItems.get(0)
-								.getId());
+						badInItem.setOrderItemId(purchaseOrderItems.get(0).getId());
 						badInItem.setBadIn(badIn);// 设置主记录
+						badInItem.setErpDate(new Date());
 						badInItems.add(badInItem);
 					} else {
 						it.remove();
@@ -186,30 +172,25 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseBadOutItem> convertBadOuts(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseBadOutItem> convertBadOuts(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseBadOutItem> badOutItems = new ArrayList<PurchaseBadOutItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseProdInOut prodInOut : prodInOuts) {
 			PurchaseBadOut badOut = prodInOut.conventToBadOut();
-			List<PurchaseBadOut> badOuts = purchaseBadOutDao.findByEnUUAndCode(
-					enUU, badOut.getCode());
-			Enterprise vendor = enterpriseDao.findEnterpriseByUu(badOut
-					.getVendUU());
+			List<PurchaseBadOut> badOuts = purchaseBadOutDao.findByEnUUAndCode(enUU, badOut.getCode());
+			Enterprise vendor = enterpriseDao.findEnterpriseByUu(badOut.getVendUU());
 			// 不良品出库单不存在，供应商UU号存在对应供应商
 			if (badOuts.size() == 0 && vendor != null) {
-				for (Iterator<PurchaseBadOutItem> it = badOut.getBadOutItems()
-						.iterator(); it.hasNext();) {// 设置明细对应的采购单明细
+				for (Iterator<PurchaseBadOutItem> it = badOut.getBadOutItems().iterator(); it.hasNext();) {// 设置明细对应的采购单明细
 					PurchaseBadOutItem badOutItem = it.next();
-					List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao
-							.findByEnUUAndOrderCodeAndNumber(enUU, badOutItem
-									.getOrderItem().getOrder().getCode(),
-									badOutItem.getOrderItem().getNumber());
+					List<PurchaseOrderItem> purchaseOrderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(
+							enUU, badOutItem.getOrderItem().getOrder().getCode(),
+							badOutItem.getOrderItem().getNumber());
 					if (purchaseOrderItems.size() > 0) {// 对应的采购单存在
 						badOutItem.setOrderItem(purchaseOrderItems.get(0));// 对应的采购单明细set进去
-						badOutItem.setOrderItemId(purchaseOrderItems.get(0)
-								.getId());
+						badOutItem.setOrderItemId(purchaseOrderItems.get(0).getId());
 						badOutItem.setBadOut(badOut);// 设置主记录
+						badOutItem.setErpDate(new Date());
 						badOutItems.add(badOutItem);
 					} else {
 						it.remove();
@@ -221,14 +202,13 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseAccept> convertNonPostingProdInOuts(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseAccept> convertNonPostingProdInOuts(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseAccept> accepts = new ArrayList<PurchaseAccept>();
 		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			for (PurchaseProdInOut prodInOut : prodInOuts) {
-				List<PurchaseAccept> existAccepts = purchaseAcceptDao
-						.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
+				List<PurchaseAccept> existAccepts = purchaseAcceptDao.findByEnUUAndCode(enUU,
+						prodInOut.getPi_inoutno());
 				if (existAccepts.size() > 0) {
 					accepts.add(existAccepts.get(0));
 				}
@@ -238,14 +218,13 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseReturn> convertNonPostingReturns(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseReturn> convertNonPostingReturns(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseReturn> returns = new ArrayList<PurchaseReturn>();
 		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			for (PurchaseProdInOut prodInOut : prodInOuts) {
-				List<PurchaseReturn> existReturns = purchaseReturnDao
-						.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
+				List<PurchaseReturn> existReturns = purchaseReturnDao.findByEnUUAndCode(enUU,
+						prodInOut.getPi_inoutno());
 				if (existReturns.size() > 0) {
 					returns.add(existReturns.get(0));
 				}
@@ -255,14 +234,12 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseBadIn> convertNonPostingBadIns(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseBadIn> convertNonPostingBadIns(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseBadIn> badIns = new ArrayList<PurchaseBadIn>();
 		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			for (PurchaseProdInOut prodInOut : prodInOuts) {
-				List<PurchaseBadIn> existBadIns = purchaseBadInDao
-						.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
+				List<PurchaseBadIn> existBadIns = purchaseBadInDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
 				if (existBadIns.size() > 0) {
 					badIns.add(existBadIns.get(0));
 				}
@@ -272,14 +249,13 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 	}
 
 	@Override
-	public List<PurchaseBadOut> convertNonPostingBadOuts(
-			List<PurchaseProdInOut> prodInOuts) {
+	public List<PurchaseBadOut> convertNonPostingBadOuts(List<PurchaseProdInOut> prodInOuts) {
 		List<PurchaseBadOut> badOuts = new ArrayList<PurchaseBadOut>();
 		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			Long enUU = SystemSession.getUser().getEnterprise().getUu();
 			for (PurchaseProdInOut prodInOut : prodInOuts) {
-				List<PurchaseBadOut> existBadOuts = purchaseBadOutDao
-						.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
+				List<PurchaseBadOut> existBadOuts = purchaseBadOutDao.findByEnUUAndCode(enUU,
+						prodInOut.getPi_inoutno());
 				if (existBadOuts.size() > 0) {
 					badOuts.add(existBadOuts.get(0));
 				}

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,43 +21,44 @@ import com.uas.platform.b2b.model.PurchaseOrderItem;
 import com.uas.platform.b2b.support.SystemSession;
 
 @Service
-public class PurchaseQuaMRBServiceImpl implements PurchaseQuaMRBService{
+public class PurchaseQuaMRBServiceImpl implements PurchaseQuaMRBService {
 
 	@Autowired
 	private PurchaseOrderDao purchaseOrderDao;
-	
+
 	@Autowired
 	private PurchaseOrderItemDao purchaseOrderItemDao;
-	
+
 	@Autowired
 	private PurchaseMRBDao purchaseMRBDao;
-	
+
 	@Autowired
 	private PurchaseBadInDao purchaseBadInDao;
-	
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Override
-	public List<PurchaseMRB> convertMRBs(
-			List<PurchaseQuaMRB> quaMRBs) {
+	public List<PurchaseMRB> convertMRBs(List<PurchaseQuaMRB> quaMRBs) {
 		List<PurchaseMRB> mrbs = new ArrayList<PurchaseMRB>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		for(PurchaseQuaMRB quaMRB : quaMRBs) {
+		for (PurchaseQuaMRB quaMRB : quaMRBs) {
 			PurchaseMRB mrb = quaMRB.convent();
 			List<PurchaseMRB> purchaseMRBs = purchaseMRBDao.findPurchaseMRBByEnUUAndCode(enUU, mrb.getCode());
 			Enterprise vendor = enterpriseDao.findEnterpriseByUu(mrb.getVendUU());
-			//采购验收单不存在，供应商UU号存在对应供应商
-			if(purchaseMRBs.size() == 0 && vendor != null) {
-				List<PurchaseBadIn> badIns =  purchaseBadInDao.findByEnUUAndCode(enUU, mrb.getBadIn().getCode());
-				if(badIns.size() > 0) {//存在对应的不良品入库单
+			// 采购验收单不存在，供应商UU号存在对应供应商
+			if (purchaseMRBs.size() == 0 && vendor != null) {
+				List<PurchaseBadIn> badIns = purchaseBadInDao.findByEnUUAndCode(enUU, mrb.getBadIn().getCode());
+				if (badIns.size() > 0) {// 存在对应的不良品入库单
 					mrb.setBadIn(badIns.get(0));
 					mrb.setBadInId(badIns.get(0).getId());
 				}
-				List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU, mrb.getOrderItem().getOrder().getCode(), mrb.getOrderItem().getNumber());
-				if(orderItems.size() > 0){//存在对应的采购单明细
+				List<PurchaseOrderItem> orderItems = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU,
+						mrb.getOrderItem().getOrder().getCode(), mrb.getOrderItem().getNumber());
+				if (orderItems.size() > 0) {// 存在对应的采购单明细
 					mrb.setOrderItem(orderItems.get(0));
 					mrb.setOrderItemId(orderItems.get(0).getId());
+					mrb.setErpDate(new Date());
 					mrbs.add(mrb);
 				}
 			}
@@ -64,6 +66,4 @@ public class PurchaseQuaMRBServiceImpl implements PurchaseQuaMRBService{
 		return mrbs;
 	}
 
-	
-
 }

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -26,65 +27,71 @@ import com.uas.platform.b2b.support.SystemSession;
 
 @Service
 public class PurchaseSampleServiceImpl implements PurchaseSampleService {
-	
+
 	@Autowired
 	private PurchaseProofingDao purchaseProofingDao;
-	
+
 	@Autowired
 	private UserDao userDao;
-	
+
 	@Autowired
 	private ProductDao productDao;
-	
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Autowired
 	private VendorDao vendorDao;
 
 	@Override
-	public List<PurchaseProofingItem> convertProofing(
-			List<ProductSample> samples) {
+	public List<PurchaseProofingItem> convertProofing(List<ProductSample> samples) {
 		List<PurchaseProofingItem> proofingItems = new ArrayList<PurchaseProofingItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
-		for(ProductSample sample : samples) {
+		for (ProductSample sample : samples) {
 			List<PurchaseProofing> proofingList = purchaseProofingDao.findByEnUUAndCode(enUU, sample.getPs_code());
 			List<Product> products = productDao.findByEnUUAndCode(enUU, sample.getPs_prodcode());
-			if(proofingList.size() == 0 && products.size() > 0) {//平台中不存在的单据&&物料已经上传到平台
+			if (proofingList.size() == 0 && products.size() > 0) {// 平台中不存在的单据&&物料已经上传到平台
 				PurchaseProofing proofing = sample.convert();
 				if (!CollectionUtils.isEmpty(proofing.getProofingItems())) {
 					Long userUU = proofing.getUserUU();
-					if(userUU != null) {
+					if (userUU != null) {
 						List<User> users = userDao.findByEnUUAndUserUU(enUU, userUU);
-						if(users.size() > 0) userUU = users.get(0).getUserUU();
-						else userUU = SystemSession.getUser().getUserUU();
-					} else userUU = SystemSession.getUser().getUserUU();
-					//单据中能获取到申请人的uu号，并且有效则为申请人，否则为企业管理员
+						if (users.size() > 0)
+							userUU = users.get(0).getUserUU();
+						else
+							userUU = SystemSession.getUser().getUserUU();
+					} else
+						userUU = SystemSession.getUser().getUserUU();
+					// 单据中能获取到申请人的uu号，并且有效则为申请人，否则为企业管理员
 					proofing.setUserUU(userUU);
 					proofing.setUser(null);
 					proofing.setProduct(products.get(0));
 					proofing.setProductId(products.get(0).getId());
-					for(PurchaseProofingItem proofingItem : proofing.getProofingItems()) {//对明细遍历
+					for (PurchaseProofingItem proofingItem : proofing.getProofingItems()) {// 对明细遍历
 						proofingItem.setProofing(proofing);
 						List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(enUU, proofingItem.getVendUU());
 						Vendor vendor = null;
-						if(vendors.size() == 0) {//供应商列表中不存在供应商关系
-							vendor = addVendor(proofingItem);//增加供应商关系
+						if (vendors.size() == 0) {// 供应商列表中不存在供应商关系
+							vendor = addVendor(proofingItem);// 增加供应商关系
 						} else {
 							vendor = vendors.get(0);
 						}
-						if(vendor != null) {//供应商uu号不为非法的值
-							//如果明细中客户联系人UU号为空或者UU号不存在对应的用户，则设为供应商资料中的供应商联系人（可能为空）
-							if(proofingItem.getVendUserUU() != null) {
-								List<User> vendUsers = userDao.findByEnUUAndUserUU(vendor.getVendEnUU(), proofingItem.getVendUserUU());
-								if(vendUsers.size() == 0) proofingItem.setVendUserUU(vendor.getVendUserUU());
-							} else proofingItem.setVendUserUU(vendor.getVendUserUU());
+						if (vendor != null) {// 供应商uu号不为非法的值
+							// 如果明细中客户联系人UU号为空或者UU号不存在对应的用户，则设为供应商资料中的供应商联系人（可能为空）
+							if (proofingItem.getVendUserUU() != null) {
+								List<User> vendUsers = userDao.findByEnUUAndUserUU(vendor.getVendEnUU(),
+										proofingItem.getVendUserUU());
+								if (vendUsers.size() == 0)
+									proofingItem.setVendUserUU(vendor.getVendUserUU());
+							} else
+								proofingItem.setVendUserUU(vendor.getVendUserUU());
+							proofingItem.setErpDate(new Date());
 							proofingItems.add(proofingItem);
 						}
 					}
 				}
 			}
-			
+
 		}
 		return proofingItems;
 	}
@@ -114,14 +121,13 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 	}
 
 	@Override
-	public List<PurchaseProofingApproval> convertApproval(
-			List<ProductSampleApproval> sampleApprovals) {
+	public List<PurchaseProofingApproval> convertApproval(List<ProductSampleApproval> sampleApprovals) {
 		List<PurchaseProofingApproval> proofingApprovals = new ArrayList<PurchaseProofingApproval>();
-		for(ProductSampleApproval sampleApproval : sampleApprovals) {
-			if(sampleApproval.getPa_venduu() != null){
+		for (ProductSampleApproval sampleApproval : sampleApprovals) {
+			if (sampleApproval.getPa_venduu() != null) {
 				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(),
 						sampleApproval.getPa_venduu());
-				if(vendors.size() > 0) 
+				if (vendors.size() > 0)
 					proofingApprovals.add(sampleApproval.convert());
 			}
 		}

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,23 +54,25 @@ public class PurchaseServiceImpl implements PurchaseService {
 			// 先查看是否已存在
 			List<PurchaseOrder> orders = purchaseOrderDao.findByEnUUAndCode(enUU, purchase.getPu_code());
 			if (CollectionUtils.isEmpty(orders)) {
-				PurchaseOrderAll order = purchase.convert();//将order的UserUU set 为em_uu
+				PurchaseOrderAll order = purchase.convert();// 将order的UserUU set
+															// 为em_uu
 				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(order.getEnUU(), order.getVendUU());
 				Vendor vendor = null;
-				if (vendors.size() == 0) {//供应商资料在平台上不存在
-					vendor = addVendor(order);//添加企业的供应商资料
-				} else {//供应商资料在平台上存在
+				if (vendors.size() == 0) {// 供应商资料在平台上不存在
+					vendor = addVendor(order);// 添加企业的供应商资料
+				} else {// 供应商资料在平台上存在
 					vendor = vendors.get(0);
-					if (order.getVendUserUU() == null || order.getVendUserUU() == 0)//单据不包含供应商联系人UU号&&供应商列表中有供应商联系人
-						order.setVendUserUU(vendor.getVendUserUU());//将供应商列表中的联系人设为单据的供应商联系人
+					if (order.getVendUserUU() == null || order.getVendUserUU() == 0)// 单据不包含供应商联系人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&&单据有明细行
-					if(order.getUserUU() != null) {
-						List<User> myUsers = userDao.findByEnUUAndUserUU(SystemSession.getUser().getEnterprise().getUu(), order.getUserUU());
-						if(myUsers.size() > 0) {
+				if (vendor != null && !CollectionUtils.isEmpty(order.getOrderItems())) {// 平台中存在供应商的UU&&单据有明细行
+					if (order.getUserUU() != null) {
+						List<User> myUsers = userDao.findByEnUUAndUserUU(
+								SystemSession.getUser().getEnterprise().getUu(), order.getUserUU());
+						if (myUsers.size() > 0) {
 							order.setUserUU(myUsers.get(0).getUserUU());
 						} else {// 单据所属用户UU号不属于客户企业时设为企业管理员
 							order.setUserUU(SystemSession.getUser().getEnterprise().getEnAdminuu());
@@ -84,6 +87,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 						if (products.size() > 0) {
 							item.setProduct(products.get(0));
 							item.setProductId(products.get(0).getId());
+							item.setErpDate(new Date());
 							orderItems.add(item);
 						}
 					}
@@ -109,12 +113,12 @@ public class PurchaseServiceImpl implements PurchaseService {
 	private Vendor addVendor(PurchaseOrderAll order) {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(order.getEnUU());
-		//买方用户（联系人）
-		//1、单据存在买方用户UU号：买方企业存在对应uu号的用户，设为该用户；买方企业不存在对应uu号的用户，供应商和单据设为当前用户(管理员)
-		//2、单据不存在买方用户UU号：供应商和单据设为当前用户(管理员)
-		if(order.getUserUU() != null && order.getUserUU() != 0) {
+		// 买方用户（联系人）
+		// 1、单据存在买方用户UU号：买方企业存在对应uu号的用户，设为该用户；买方企业不存在对应uu号的用户，供应商和单据设为当前用户(管理员)
+		// 2、单据不存在买方用户UU号：供应商和单据设为当前用户(管理员)
+		if (order.getUserUU() != null && order.getUserUU() != 0) {
 			List<User> myUsers = userDao.findByEnUUAndUserUU(order.getEnUU(), order.getUserUU());
-			if(myUsers.size() > 0) {
+			if (myUsers.size() > 0) {
 				vendor.setMyUserUU(order.getUserUU());
 			} else {
 				vendor.setMyUserUU(SystemSession.getUser().getUserUU());
@@ -125,7 +129,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 			order.setUserUU(SystemSession.getUser().getUserUU());
 		}
 		Enterprise enterprise = enterpriseDao.findOne(order.getVendUU());
-		//供应商企业UU号存在对应的企业
+		// 供应商企业UU号存在对应的企业
 		if (enterprise != null) {
 			vendor.setVendorEnterprise(enterprise);
 			vendor.setVendEnUU(order.getVendUU());
@@ -151,8 +155,8 @@ public class PurchaseServiceImpl implements PurchaseService {
 		List<PurchaseOrderReply> orderReplies = new ArrayList<PurchaseOrderReply>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseReply reply : replies) {
-			List<PurchaseOrderItem> items = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU, reply.getPr_pucode(),
-					reply.getPr_pddetno());
+			List<PurchaseOrderItem> items = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU,
+					reply.getPr_pucode(), reply.getPr_pddetno());
 			if (!CollectionUtils.isEmpty(items)) {
 				PurchaseOrderReply orderReply = reply.convert();
 				orderReply.setOrderItem(items.get(0));
@@ -167,7 +171,8 @@ public class PurchaseServiceImpl implements PurchaseService {
 		List<PurchaseOrderItem> orderItems = new ArrayList<PurchaseOrderItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (PurchaseDetailEnd end : ends) {
-			List<PurchaseOrderItem> items = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU, end.getPd_code(), end.getPd_detno());
+			List<PurchaseOrderItem> items = purchaseOrderItemDao.findByEnUUAndOrderCodeAndNumber(enUU, end.getPd_code(),
+					end.getPd_detno());
 			if (!CollectionUtils.isEmpty(items)) {
 				PurchaseOrderItem orderItem = items.get(0);
 				orderItem.setEnd(end.getPd_ended());

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

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.erp.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -31,16 +32,16 @@ public class QuotationServiceImpl implements QuotationService {
 
 	@Autowired
 	private ProductDao productDao;
-	
+
 	@Autowired
 	private VendorDao vendorDao;
 
 	@Autowired
 	private SaleQuotationDao saleQuotationDao;
-	
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	
+
 	@Autowired
 	private UserDao userDao;
 
@@ -48,62 +49,66 @@ public class QuotationServiceImpl implements QuotationService {
 	public Map<String, List<SaleQuotationItem>> convertQuotation(List<Quotation> quotations) {
 		Map<String, List<SaleQuotationItem>> mapSaleQuotationItem = new HashMap<String, List<SaleQuotationItem>>();
 		List<SaleQuotationItem> saveItems = new ArrayList<SaleQuotationItem>();
-		List<SaleQuotationItem> resItems = new ArrayList<SaleQuotationItem>();		
+		List<SaleQuotationItem> resItems = new ArrayList<SaleQuotationItem>();
 		long enUU = SystemSession.getUser().getEnterprise().getUu();
 		for (Quotation quotation : quotations) {
-			//先查看是否已存在
+			// 先查看是否已存在
 			List<SaleQuotation> quotations2 = saleQuotationDao.findByEnUUAndCode(enUU, quotation.getQu_code());
 			if (quotations2.size() == 0) {
 				SaleQuotation saleQuotation = quotation.convert();
-				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(saleQuotation.getCustUU(), saleQuotation.getEnUU());
+				List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(saleQuotation.getCustUU(),
+						saleQuotation.getEnUU());
 				Vendor vendor = null;
-				if(vendors.size() > 0) {//存在对应的供应商资料
+				if (vendors.size() > 0) {// 存在对应的供应商资料
 					vendor = vendors.get(0);
-					//如果主动报价单中的客户联系人uu号为空 或 无效，则设为供应商资料中的客户联系人
-					if(saleQuotation.getCustUserUU() == null) {
+					// 如果主动报价单中的客户联系人uu号为空 或 无效，则设为供应商资料中的客户联系人
+					if (saleQuotation.getCustUserUU() == null) {
 						saleQuotation.setCustUserUU(vendors.get(0).getMyUserUU());
 					} else {
-						List<User> custUsers = userDao.findByEnUUAndUserUU(saleQuotation.getCustUU(), saleQuotation.getCustUserUU());
-						if(CollectionUtils.isEmpty(custUsers)) {
+						List<User> custUsers = userDao.findByEnUUAndUserUU(saleQuotation.getCustUU(),
+								saleQuotation.getCustUserUU());
+						if (CollectionUtils.isEmpty(custUsers)) {
 							saleQuotation.setCustUserUU(vendors.get(0).getMyUserUU());
 						}
 					}
-					//如果主动报价单中的供应商联系人uu号为空 或 无效，则设为供应商资料中的供应商联系人
-					if(saleQuotation.getUserUU() == null) {
+					// 如果主动报价单中的供应商联系人uu号为空 或 无效，则设为供应商资料中的供应商联系人
+					if (saleQuotation.getUserUU() == null) {
 						saleQuotation.setUserUU(vendors.get(0).getVendUserUU());
 					} else {
 						List<User> vendUsers = userDao.findByEnUUAndUserUU(enUU, saleQuotation.getUserUU());
-						if(CollectionUtils.isEmpty(vendUsers)) {
+						if (CollectionUtils.isEmpty(vendUsers)) {
 							saleQuotation.setUserUU(vendors.get(0).getVendUserUU());
 						}
 					}
 				} else {// 不存在对应的供应商资料，增加供应商关系
 					vendor = addVendor(saleQuotation);
 				}
-				if(vendor != null && vendor.getMyEnUU() != null) {
+				if (vendor != null && vendor.getMyEnUU() != null) {
 					if (!CollectionUtils.isEmpty(saleQuotation.getQuotationItems())) {
-						Iterator<SaleQuotationItem> it = saleQuotation.getQuotationItems().iterator();  
-						while(it.hasNext()) {
+						Iterator<SaleQuotationItem> it = saleQuotation.getQuotationItems().iterator();
+						while (it.hasNext()) {
 							SaleQuotationItem item = it.next();
 							item.setQuotation(saleQuotation);
 							// 取平台的产品ID
 							Product product = item.getProduct();
-							//查找客户是否存在对应的物料号。
-							List<Product> products = productDao.findByEnUUAndCode(vendor.getMyEnUU(), product.getCode());
+							// 查找客户是否存在对应的物料号。
+							List<Product> products = productDao.findByEnUUAndCode(vendor.getMyEnUU(),
+									product.getCode());
 							if (products.size() > 0) {
 								item.setProduct(products.get(0));
 								item.setProductId(products.get(0).getId());
+								item.setErpDate(new Date());
 								saveItems.add(item);
 							} else {
 								SaleQuotationItem resItem = new SaleQuotationItem();
 								resItem.setQuotation(new SaleQuotation());
 								resItem.setNumber(item.getNumber());
 								resItem.getQuotation().setCode(saleQuotation.getCode());
-								resItems.add(resItem);//这里存储不能保存的明细，返回到erp,显示在备注中。
+								resItems.add(resItem);// 这里存储不能保存的明细，返回到erp,显示在备注中。
 								it.remove();
 							}
 						}
-						
+
 					}
 				}
 			}
@@ -133,9 +138,10 @@ public class QuotationServiceImpl implements QuotationService {
 		}
 		return quotations;
 	}
-	
+
 	/**
 	 * 保存主动报价单时,增加供应商关系
+	 * 
 	 * @param saleQuotation
 	 * @return
 	 */
@@ -145,14 +151,14 @@ public class QuotationServiceImpl implements QuotationService {
 		Long vendUserUU = saleQuotation.getUserUU();
 		Long custUU = saleQuotation.getCustUU();
 		Long custUserUU = saleQuotation.getCustUserUU();
-		if(custUU != null) {// 客户UU号存在，增加供应商关系
+		if (custUU != null) {// 客户UU号存在，增加供应商关系
 			Enterprise cust = enterpriseDao.findOne(custUU);
-			if(cust != null) {
+			if (cust != null) {
 				vendor.setVendEnUU(vendUU);
 				vendor.setMyEnUU(custUU);
-				if(custUserUU != null) {// 买方用户UU号存在且有效，既保留，否则设为买方企业的管理员UU号
+				if (custUserUU != null) {// 买方用户UU号存在且有效，既保留，否则设为买方企业的管理员UU号
 					List<User> custUsers = userDao.findByEnUUAndUserUU(custUU, custUserUU);
-					if(CollectionUtils.isEmpty(custUsers)) {
+					if (CollectionUtils.isEmpty(custUsers)) {
 						vendor.setMyUserUU(cust.getEnAdminuu());
 						saleQuotation.setCustUserUU(cust.getEnAdminuu());
 					} else {
@@ -162,10 +168,10 @@ public class QuotationServiceImpl implements QuotationService {
 					vendor.setMyUserUU(cust.getEnAdminuu());
 					saleQuotation.setCustUserUU(cust.getEnAdminuu());
 				}
-				
-				if(vendUserUU != null) {// 卖方用户UU号存在且有效，既保留，否则设为卖方企业的管理员UU号
+
+				if (vendUserUU != null) {// 卖方用户UU号存在且有效，既保留，否则设为卖方企业的管理员UU号
 					List<User> vendUsers = userDao.findByEnUUAndUserUU(vendUU, vendUserUU);
-					if(CollectionUtils.isEmpty(vendUsers)) {
+					if (CollectionUtils.isEmpty(vendUsers)) {
 						vendor.setVendUserUU(SystemSession.getUser().getEnterprise().getEnAdminuu());
 						saleQuotation.setUserUU(SystemSession.getUser().getEnterprise().getEnAdminuu());
 					} else {
@@ -176,8 +182,8 @@ public class QuotationServiceImpl implements QuotationService {
 					saleQuotation.setUserUU(SystemSession.getUser().getEnterprise().getEnAdminuu());
 				}
 				vendor = vendorDao.save(vendor);// 保存
-			}// 客户UU号存在但无效，不保存供应商关系
-		}// 客户UU号不存咋，不保存供应商关系
+			} // 客户UU号存在但无效，不保存供应商关系
+		} // 客户UU号不存咋，不保存供应商关系
 		return vendor;
 	}