b2b报价询价单回传erp问题修改，b2b给b2b报价消息产生修改。

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

src/main/java/com/uas/platform/b2b/dao/PurchaseInquiryItemDao.java

@@ -41,7 +41,7 @@ public interface PurchaseInquiryItemDao
 	 * @param backStatus
 	 * @return
 	 */
-	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and d.sourceApp <>'B2B'")
+	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and d.sourceApp is null")
 	List<PurchaseInquiryItem> findByEnUUAndBackStatus(@Param("enUU") long enUU, @Param("backStatus") short backStatus);
 
 	/**

src/main/java/com/uas/platform/b2b/event/PurchaseInquiryItemReplyReleaseEvent.java

@@ -1,9 +1,8 @@
 package com.uas.platform.b2b.event;
 
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.model.*;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.uas.platform.b2b.model.PagingRelease;
+import com.uas.platform.b2b.model.PagingReleaseDetail;
+import com.uas.platform.b2b.model.PurchaseInquiryItem;
 
 import java.util.Date;
 import java.util.List;
@@ -14,11 +13,6 @@ import java.util.List;
  */
 public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<PagingReleaseDetail, PurchaseInquiryItem> {
 
-    @Autowired
-    private UserDao userDao;
-
-    @Autowired
-    private EnterpriseDao enterpriseDao;
 
     public PurchaseInquiryItemReplyReleaseEvent(List<PurchaseInquiryItem> savedList) {
         super(savedList);
@@ -34,16 +28,15 @@ public class PurchaseInquiryItemReplyReleaseEvent extends SaveReleaseEvent<Pagin
     public PagingReleaseDetail release(PurchaseInquiryItem inquiryItem) {
         // 回复订单的话，跟新增订单是相反的，所以接收人是user，发出人是vendUser
         Long emUU = inquiryItem.getVendUserUU();
-        User vendUser = userDao.findOne(emUU);
-        String emName = vendUser.getUserName();
+        String emName = "操作员";
         Long vendUU = inquiryItem.getVendUU();
         Date date = new Date();
         String codeValue = inquiryItem.getInquiry().getCode();
         String from = "B2B";
         String type = "回复询价单";
         String title = "B2B商务提醒";
-        Enterprise vendor = enterpriseDao.findOne(vendUU);
-        String context = vendor.getEnName() + "的" + emName + "回复了询价单（" + codeValue + "）的报价，请及时确认！";
+        String enName = inquiryItem.getEnterprise().getEnName();
+        String context = enName + "的" + emName + "回复了询价单（" + codeValue + "）的报价，请及时确认！";
         PagingRelease release = new PagingRelease(emUU, emName, vendUU, date, codeValue, from, title, context, type);
         Long enUU = inquiryItem.getInquiry().getEnUU();
         Long userUU = inquiryItem.getUserUU();

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

@@ -86,7 +86,7 @@ public class PurchaseInquiryItem {
 	private Long vendUU;
 
 	/**
-	 * 询价企业
+	 * 被询价企业
 	 */
 	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REFRESH })
 	@JoinColumn(name = "id_venduu", insertable = false, updatable = false)