主动报价单增加供应商联系人UU号字段

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

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

@@ -23,6 +23,7 @@ public class Quotation {
 	private long cu_uu;
 	private Long qu_custcontactuu;
 	private String qu_custcontact;
+	private Long qu_useruu;
 	private String qu_code;
 	private Date qu_recorddate;
 	private Date qu_enddate;
@@ -39,6 +40,14 @@ public class Quotation {
 	public void setCu_uu(long cu_uu) {
 		this.cu_uu = cu_uu;
 	}
+	
+	public Long getQu_useruu() {
+		return qu_useruu;
+	}
+
+	public void setQu_useruu(Long qu_useruu) {
+		this.qu_useruu = qu_useruu;
+	}
 
 	public String getQu_code() {
 		return qu_code;
@@ -134,6 +143,7 @@ public class Quotation {
 		quotation.setDate(this.qu_recorddate);
 		quotation.setEndDate(this.qu_enddate);
 		quotation.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		quotation.setUserUU(this.getQu_useruu());
 		quotation.setRate(this.qu_rate);
 		quotation.setRemark(this.qu_remark);
 		quotation.setSendStatus((short) Status.NOT_UPLOAD.value());
@@ -147,4 +157,6 @@ public class Quotation {
 		return quotation;
 	}
 
+	
+
 }

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

@@ -9,11 +9,13 @@ import org.springframework.stereotype.Service;
 
 import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.dao.SaleQuotationDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.erp.model.Quotation;
 import com.uas.platform.b2b.erp.service.QuotationService;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.SaleQuotation;
 import com.uas.platform.b2b.model.SaleQuotationItem;
+import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.support.SystemSession;
 
 @Service
@@ -21,6 +23,9 @@ public class QuotationServiceImpl implements QuotationService {
 
 	@Autowired
 	private ProductDao productDao;
+	
+	@Autowired
+	private VendorDao vendorDao;
 
 	@Autowired
 	private SaleQuotationDao saleQuotationDao;
@@ -34,6 +39,13 @@ public class QuotationServiceImpl implements QuotationService {
 			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());
+				if(vendors.size() > 0) {//存在对应的供应商资料
+					//如果主动报价单中的客户联系人uu号为空，则设为供应商资料中的客户联系人
+					if(saleQuotation.getCustUserUU() == null) saleQuotation.setCustUserUU(vendors.get(0).getMyUserUU());
+					//如果主动报价单中的供应商联系人uu号为空，则设为供应商资料中的供应商联系人
+					if(saleQuotation.getUserUU() == null) saleQuotation.setUserUU(vendors.get(0).getVendUserUU());
+				}
 				if (!CollectionUtils.isEmpty(saleQuotation.getQuotationItems())) {
 					for (SaleQuotationItem item : saleQuotation.getQuotationItems()) {
 						item.setQuotation(saleQuotation);

src/main/java/com/uas/platform/b2b/model/SaleQuotation.java

@@ -49,6 +49,12 @@ public class SaleQuotation implements Serializable {
 	 */
 	@Column(name = "qu_enuu")
 	private Long enUU;
+	
+	/**
+	 * 所属用户(卖家)UU
+	 */
+	@Column(name = "qu_useruu")
+	private Long userUU;
 
 	/**
 	 * 客户UU
@@ -206,6 +212,14 @@ public class SaleQuotation implements Serializable {
 	public void setSendStatus(Short sendStatus) {
 		this.sendStatus = sendStatus;
 	}
+	
+	public Long getUserUU() {
+		return userUU;
+	}
+
+	public void setUserUU(Long userUU) {
+		this.userUU = userUU;
+	}
 
 	public Set<SaleQuotationItem> getQuotationItems() {
 		return quotationItems;

src/main/java/com/uas/platform/b2b/service/impl/SaleQuotationServiceImpl.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,6 +13,7 @@ import com.uas.platform.b2b.model.SaleQuotation;
 import com.uas.platform.b2b.model.SaleQuotationItem;
 import com.uas.platform.b2b.service.SaleQuotationService;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.XingePusher;
 import com.uas.platform.core.model.Status;
 
 @Service
@@ -24,7 +27,19 @@ public class SaleQuotationServiceImpl implements SaleQuotationService {
 
 	@Override
 	public void save(List<SaleQuotationItem> items) {
-		saleQuotationItemDao.save(items);
+		List<SaleQuotationItem> newItems = saleQuotationItemDao.save(items);
+		//主动报价单消息推送通知客户联系人
+		Set<Long> quotationIds = new HashSet<Long>();
+		for(SaleQuotationItem item : newItems) {
+			if(!quotationIds.contains(item.getQuotation().getId())){
+				XingePusher.pushSingleAccountAndroid(item.getQuotation().getCustUserUU().toString(), "新增供应商主动报价", "单号:"
+						+ item.getQuotation().getCode(), null);
+				XingePusher.pushSingleAccountIOS(item.getQuotation().getCustUserUU().toString(), "新增供应商主动报价 - " + "单号:"
+						+ item.getQuotation().getCode());
+				quotationIds.add(item.getQuotation().getId());
+			}
+			
+		}
 	}
 
 	@Override