采购询价单，上传erp过滤条件修改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8089 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")
+	@Query("from PurchaseInquiryItem d where d.inquiry.enUU = :enUU and d.backStatus = :backStatus and d.sourceapp <>'B2B'")
 	List<PurchaseInquiryItem> findByEnUUAndBackStatus(@Param("enUU") long enUU, @Param("backStatus") short backStatus);
 
 	/**

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

@@ -223,7 +223,7 @@ public class PurchaseInquiryItem {
 	 * 应用来源ERP、B2B
 	 */
 	@Column(name = "id_sourceapp")
-	private String soruceApp;
+	private String sourceApp;
 
 	public Long getId() {
 		return id;
@@ -467,12 +467,12 @@ public class PurchaseInquiryItem {
 		this.erpDate = erpDate;
 	}
 
-	public String getSoruceApp() {
-		return soruceApp;
+	public String getSourceApp() {
+		return sourceApp;
 	}
 
-	public void setSoruceApp(String soruceApp) {
-		this.soruceApp = soruceApp;
+	public void setSourceApp(String sourceApp) {
+		this.sourceApp = sourceApp;
 	}
 
 	public EnterpriseInfo getEnterprise() {

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

@@ -176,7 +176,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 							saleItem.setStatus((short) Status.NOT_REPLY.value());
 							saleItem.setSendStatus((short) Status.REPLIED.value());
 							saleItem.setCustLap((short) 0);
-							saleItem.setSoruceApp(SOURCERAPP);
+							saleItem.setSourceApp(SOURCERAPP);
 							items.add(saleItem);
 							i++;
 						}
@@ -231,7 +231,7 @@ public class PurcInquiryServiceImpl implements PurcInquiryService {
 				saleItem.setToDate(item.getToDate());
 				saleItem.setStatus((short) Status.NOT_REPLY.value());
 				saleItem.setSendStatus((short) Status.REPLIED.value());
-				saleItem.setSoruceApp(SOURCERAPP);
+				saleItem.setSourceApp(SOURCERAPP);
 				items.add(saleItem);
 			}
 		}

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

@@ -259,7 +259,7 @@ public class PurchaseInquiryServiceImpl implements PurchaseInquiryService {
 		}
 		PurchaseInquiryItem purchaseInquiryItem = purchaseInquiryItemDao.save(inquiryItem);
 		// 产生消息
-		if (purchaseInquiryItem.getSourceId() == null) { // b2b的询价单才产生消息，erp的询价单会在erp产生消息
+		if ("B2B".equals(purchaseInquiryItem.getSourceApp())) { // b2b的询价单才产生消息，erp的询价单会在erp产生消息
 			List<PurchaseInquiryItem> inquiryItems = new ArrayList<>();
 			inquiryItems.add(purchaseInquiryItem);
 			ContextUtils.publishEvent(new PurchaseInquiryItemReplyReleaseEvent(inquiryItems));

src/main/webapp/resources/js/index/app.js

@@ -803,6 +803,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 $scope.tableParams.page(1);
                 $scope.tableParams.reload();
             });
+            $scope.checks.checked = false;
         };
 
         // 搜索框回车