企业圈bug处理

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

src/main/java/com/uas/platform/b2b/search/SearchServiceImpl.java

@@ -1,110 +1,12 @@
 package com.uas.platform.b2b.search;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.util.AccountUtils;
-import com.uas.platform.b2b.dao.BrandDao;
-import com.uas.platform.b2b.dao.ComponentDao;
-import com.uas.platform.b2b.dao.DeputyOrderDao;
-import com.uas.platform.b2b.dao.EnterpriseDao;
-import com.uas.platform.b2b.dao.InvitationRecordDao;
-import com.uas.platform.b2b.dao.MakeAcceptDao;
-import com.uas.platform.b2b.dao.MakeOrderChangeItemDao;
-import com.uas.platform.b2b.dao.MakeOrderDao;
-import com.uas.platform.b2b.dao.MakeReturnDao;
-import com.uas.platform.b2b.dao.PagingReleaseDetailDao;
-import com.uas.platform.b2b.dao.ProductDao;
-import com.uas.platform.b2b.dao.PurcInquiryDao;
-import com.uas.platform.b2b.dao.PurcInquiryItemInfoDao;
-import com.uas.platform.b2b.dao.PurchaseAcceptDao;
-import com.uas.platform.b2b.dao.PurchaseApBillDao;
-import com.uas.platform.b2b.dao.PurchaseApCheckDao;
-import com.uas.platform.b2b.dao.PurchaseBadInDao;
-import com.uas.platform.b2b.dao.PurchaseBadOutDao;
-import com.uas.platform.b2b.dao.PurchaseForecastAllDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryItemDao;
-import com.uas.platform.b2b.dao.PurchaseInquiryMouldDao;
-import com.uas.platform.b2b.dao.PurchaseMRBDao;
-import com.uas.platform.b2b.dao.PurchaseNoticeDao;
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
-import com.uas.platform.b2b.dao.PurchaseOrderChangeDao;
-import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
-import com.uas.platform.b2b.dao.PurchaseOrderEndDao;
-import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
-import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
-import com.uas.platform.b2b.dao.PurchaseProofingApprovalDao;
-import com.uas.platform.b2b.dao.PurchaseProofingItemDao;
-import com.uas.platform.b2b.dao.PurchaseProofingSendDao;
-import com.uas.platform.b2b.dao.PurchaseReturnDao;
-import com.uas.platform.b2b.dao.PurchaseTenderDao;
-import com.uas.platform.b2b.dao.SaleARCheckDao;
-import com.uas.platform.b2b.dao.SaleQuotationAllDao;
-import com.uas.platform.b2b.dao.SaleSendAllDao;
-import com.uas.platform.b2b.dao.SaleTenderErpDao;
-import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.dao.*;
 import com.uas.platform.b2b.erp.model.SaleTenderErp;
 import com.uas.platform.b2b.erp.model.SaleTenderItemErp;
-import com.uas.platform.b2b.model.Brand;
-import com.uas.platform.b2b.model.Component;
-import com.uas.platform.b2b.model.DeputyOrder;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.InvitationRecord;
-import com.uas.platform.b2b.model.MakeAccept;
-import com.uas.platform.b2b.model.MakeOrder;
-import com.uas.platform.b2b.model.MakeOrderChangeItem;
-import com.uas.platform.b2b.model.MakeReturn;
-import com.uas.platform.b2b.model.PagingReleaseDetail;
-import com.uas.platform.b2b.model.Product;
-import com.uas.platform.b2b.model.PurcInquiry;
-import com.uas.platform.b2b.model.PurcInquiryItemInfo;
-import com.uas.platform.b2b.model.PurchaseAccept;
-import com.uas.platform.b2b.model.PurchaseApBill;
-import com.uas.platform.b2b.model.PurchaseApCheck;
-import com.uas.platform.b2b.model.PurchaseBadIn;
-import com.uas.platform.b2b.model.PurchaseBadOut;
-import com.uas.platform.b2b.model.PurchaseForecastAll;
-import com.uas.platform.b2b.model.PurchaseInquiryItem;
-import com.uas.platform.b2b.model.PurchaseInquiryMould;
-import com.uas.platform.b2b.model.PurchaseMRB;
-import com.uas.platform.b2b.model.PurchaseNotice;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderChange;
-import com.uas.platform.b2b.model.PurchaseOrderDone;
-import com.uas.platform.b2b.model.PurchaseOrderEnd;
-import com.uas.platform.b2b.model.PurchaseOrderTodo;
-import com.uas.platform.b2b.model.PurchaseOrderWaiting;
-import com.uas.platform.b2b.model.PurchaseProofingApproval;
-import com.uas.platform.b2b.model.PurchaseProofingItem;
-import com.uas.platform.b2b.model.PurchaseProofingSend;
-import com.uas.platform.b2b.model.PurchaseReturn;
-import com.uas.platform.b2b.model.PurchaseTender;
-import com.uas.platform.b2b.model.PurchaseTenderProd;
-import com.uas.platform.b2b.model.SaleARCheck;
-import com.uas.platform.b2b.model.SaleQuotationAll;
-import com.uas.platform.b2b.model.SaleSendAll;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.persistence.criteria.PredicateFactory;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -112,6 +14,19 @@ import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.b2b.util.SearchConstants;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 搜索实现
@@ -582,79 +497,84 @@ public class SearchServiceImpl implements com.uas.platform.b2b.search.SearchServ
 	public SPage<PurchaseApCheck> searchPurchaseApCheckIds(String keyword, PageParams pageParams) {
 		SPage<Long> idsPage = searchService.searchIds(keyword, Table_name.PURC$APCHECK, pageParams);
 		List<PurchaseApCheck> content = purchaseApCheckDao.findAll(idsPage.getContent());
-//		// 对应验退单的应收对账单详情没有物料编号字段，添加物料信息    ---放在单据存到b2b的时候去处理，这里做循环，查看会等很久
+		sortByProperty(content, PurchaseApCheck.class, "id", idsPage.getContent());
+//		// 对应验退单的应收对账单详情没有物料编号字段，添加物料信息
+//		List<PurchaseApCheckItem> prodNullList = purchaseApCheckItemDao.findByProdCodeAndProdTitle(null, null);
+//		System.out.println("问题单据条数" + prodNullList.size());
+//		// 对应验退单的应收对账单详情没有物料编号字段，添加物料信息
 //		List<PurchaseApCheckItem> saveItems = new ArrayList<>();
-//		for (PurchaseApCheck apCheck : content) {
-//			for (PurchaseApCheckItem apCheckItem : apCheck.getItems()) {
-//				if (apCheckItem.getProdCode() != null && apCheckItem.getProdTitle() == null) {
-//					List<Product> products = productDao.findByEnUUAndCode(apCheck.getCustUu(), apCheckItem.getProdCode());
-//					if (!CollectionUtils.isEmpty(products)) {
-//						Product product = products.get(0);
+////		for (PurchaseApCheck apCheck : content) {
+//		Integer count = 0;
+//		for (PurchaseApCheckItem apCheckItem : prodNullList) {
+//			count++;
+//			System.out.println("当前正在处理：" + count + ",共" + prodNullList.size());
+//			if (apCheckItem.getProdCode() != null && apCheckItem.getProdTitle() == null) {
+//				List<Product> products = productDao.findByEnUUAndCode(apCheckItem.getApCheck().getCustUu(), apCheckItem.getProdCode());
+//				if (!CollectionUtils.isEmpty(products)) {
+//					Product product = products.get(0);
+//					apCheckItem.setProdTitle(product.getTitle());
+//					apCheckItem.setProdSpec(product.getSpec());
+//					saveItems.add(apCheckItem);
+//				}
+//			} else {
+//				// 正式b2b中来源单据只有采购验收和验退存在产品编号为空的情况，暂时制作这两种的判断
+//				if (apCheckItem.getSourceTable().equals("purc$acceptitem") && null != apCheckItem.getSourceId()){
+//					PurchaseAcceptItem purchaseAcceptItem = purchaseAcceptItemDao.findOne(apCheckItem.getSourceId());
+//					if (null != purchaseAcceptItem && null != purchaseAcceptItem.getProduct()) {
+//						Product product = purchaseAcceptItem.getProduct();
+//						apCheckItem.setProdCode(product.getCode());
 //						apCheckItem.setProdTitle(product.getTitle());
 //						apCheckItem.setProdSpec(product.getSpec());
 //						saveItems.add(apCheckItem);
-//					}
-//				} else {
-//					// 正式b2b中来源单据只有采购验收和验退存在产品编号为空的情况，暂时制作这两种的判断
-//					if (apCheckItem.getSourceTable().equals("purc$acceptitem") && null != apCheckItem.getSourceId()){
-//						PurchaseAcceptItem purchaseAcceptItem = purchaseAcceptItemDao.findOne(apCheckItem.getSourceId());
-//						if (null != purchaseAcceptItem && null != purchaseAcceptItem.getProduct()) {
-//							Product product = purchaseAcceptItem.getProduct();
+//					} else if (null != purchaseAcceptItem && null != purchaseAcceptItem.getOrderItem())  {
+//						PurchaseOrderItem item = purchaseAcceptItem.getOrderItem();
+//						if (null != item.getProduct()) {
+//							apCheckItem.setProdCode(item.getProduct().getCode());
+//							apCheckItem.setProdTitle(item.getProduct().getTitle());
+//							apCheckItem.setProdSpec(item.getProduct().getSpec());
+//							saveItems.add(apCheckItem);
+//						}
+//					} else if (null != purchaseAcceptItem && null != purchaseAcceptItem.getProdcode()) {
+//						List<Product> products = productDao.findByEnUUAndCode(apCheckItem.getApCheck().getCustUu(), purchaseAcceptItem.getProdcode());
+//						if (!CollectionUtils.isEmpty(products)) {
+//							Product product = products.get(0);
 //							apCheckItem.setProdCode(product.getCode());
 //							apCheckItem.setProdTitle(product.getTitle());
 //							apCheckItem.setProdSpec(product.getSpec());
 //							saveItems.add(apCheckItem);
-//						} else if (null != purchaseAcceptItem && null != purchaseAcceptItem.getOrderItem())  {
-//							PurchaseOrderItem item = purchaseAcceptItem.getOrderItem();
-//							if (null != item.getProduct()) {
-//								apCheckItem.setProdCode(item.getProduct().getCode());
-//								apCheckItem.setProdTitle(item.getProduct().getTitle());
-//								apCheckItem.setProdSpec(item.getProduct().getSpec());
-//								saveItems.add(apCheckItem);
-//							}
-//						} else if (null != purchaseAcceptItem && null != purchaseAcceptItem.getProdcode()) {
-//							List<Product> products = productDao.findByEnUUAndCode(apCheck.getCustUu(), purchaseAcceptItem.getProdcode());
-//							if (!CollectionUtils.isEmpty(products)) {
-//								Product product = products.get(0);
-//								apCheckItem.setProdCode(product.getCode());
-//								apCheckItem.setProdTitle(product.getTitle());
-//								apCheckItem.setProdSpec(product.getSpec());
-//								saveItems.add(apCheckItem);
-//							}
 //						}
-//					} else if (apCheckItem.getSourceTable().equals("purc$returnitem") && null != apCheckItem.getSourceId()) {
-//						PurchaseReturnItem purchaseReturnItem = purchaseReturnItemDao.findOne(apCheckItem.getSourceId());
-//						if (null != purchaseReturnItem && null != purchaseReturnItem.getProduct()) {
-//							Product product = purchaseReturnItem.getProduct();
+//					}
+//				} else if (apCheckItem.getSourceTable().equals("purc$returnitem") && null != apCheckItem.getSourceId()) {
+//					PurchaseReturnItem purchaseReturnItem = purchaseReturnItemDao.findOne(apCheckItem.getSourceId());
+//					if (null != purchaseReturnItem && null != purchaseReturnItem.getProduct()) {
+//						Product product = purchaseReturnItem.getProduct();
+//						apCheckItem.setProdCode(product.getCode());
+//						apCheckItem.setProdTitle(product.getTitle());
+//						apCheckItem.setProdSpec(product.getSpec());
+//						saveItems.add(apCheckItem);
+//					} else if (null != purchaseReturnItem && null != purchaseReturnItem.getOrderItem())  {
+//						PurchaseOrderItem item = purchaseReturnItem.getOrderItem();
+//						if (null != item.getProduct()) {
+//							apCheckItem.setProdCode(item.getProduct().getCode());
+//							apCheckItem.setProdTitle(item.getProduct().getTitle());
+//							apCheckItem.setProdSpec(item.getProduct().getSpec());
+//							saveItems.add(apCheckItem);
+//						}
+//					} else if (null != purchaseReturnItem && null != purchaseReturnItem.getProdCode()) {
+//						List<Product> products = productDao.findByEnUUAndCode(apCheckItem.getApCheck().getCustUu(), purchaseReturnItem.getProdCode());
+//						if (!CollectionUtils.isEmpty(products)) {
+//							Product product = products.get(0);
 //							apCheckItem.setProdCode(product.getCode());
 //							apCheckItem.setProdTitle(product.getTitle());
 //							apCheckItem.setProdSpec(product.getSpec());
 //							saveItems.add(apCheckItem);
-//						} else if (null != purchaseReturnItem && null != purchaseReturnItem.getOrderItem())  {
-//							PurchaseOrderItem item = purchaseReturnItem.getOrderItem();
-//							if (null != item.getProduct()) {
-//								apCheckItem.setProdCode(item.getProduct().getCode());
-//								apCheckItem.setProdTitle(item.getProduct().getTitle());
-//								apCheckItem.setProdSpec(item.getProduct().getSpec());
-//								saveItems.add(apCheckItem);
-//							}
-//						} else if (null != purchaseReturnItem && null != purchaseReturnItem.getProdCode()) {
-//							List<Product> products = productDao.findByEnUUAndCode(apCheck.getCustUu(), purchaseReturnItem.getProdCode());
-//							if (!CollectionUtils.isEmpty(products)) {
-//								Product product = products.get(0);
-//								apCheckItem.setProdCode(product.getCode());
-//								apCheckItem.setProdTitle(product.getTitle());
-//								apCheckItem.setProdSpec(product.getSpec());
-//								saveItems.add(apCheckItem);
-//							}
 //						}
 //					}
 //				}
 //			}
 //		}
+////		}
 //		purchaseApCheckItemDao.save(saveItems);
-//		content = purchaseApCheckDao.findAll(idsPage.getContent());
-		sortByProperty(content, PurchaseApCheck.class, "id", idsPage.getContent());
 		return toSPage(idsPage, content);
 	}
 

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

@@ -57,7 +57,9 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		Map<String, Object> model = new HashMap<String, Object>();
 		// 邮件信息
-		model.put("vendorusername", record.getVendusername().trim());
+		if (null != record.getVendusername()) {
+			model.put("vendorusername", record.getVendusername().trim());
+		}
 		model.put("vendorname", record.getVendname().trim());
 		model.put("custname", SystemSession.getUser().getUserName() + "("
 				+ SystemSession.getUser().getEnterprise().getEnName() + ")");

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

@@ -791,10 +791,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		});
 		
 		$scope.search = function(keyword) {
-			if(keyword != null && keyword != '') {
+			// if(keyword != null && keyword != '') {
 				$rootScope.searchKeyword = keyword;
 				window.location.hash = '#/search?keyword='+keyword;
-			}
+			// }
 		};
 
 		$scope.showMessage = function() {
@@ -938,20 +938,20 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
     }]);
-    
+
     app.filter('getkey', ['$sce', '$rootScope', function($sce, $rootScope) {
-    	var search = $rootScope.searchKeyword;
-    	return function(content, search) {
-    		content = encodeURI(content);
+        var search = $rootScope.searchKeyword;
+        return function(content, search) {
+            content = encodeURI(content);
             search = encodeURI(search);
-    		var reg = new RegExp(search, 'gim');
+            var reg = new RegExp(search, 'gim');
             var result = content.replace(reg,'<font color="red">$&</font>');
             result = decodeURI(result);
             return $sce.trustAsHtml(result);
-    	}
-    	$rootScope.searchKeyword = null;// 清除缓存的关键字
+        };
+        $rootScope.searchKeyword = null;// 清除缓存的关键字
     }]);
-    
+
     /**
      * 顶部搜索
      */
@@ -959,19 +959,19 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		BaseService.scrollBackToTop();
 		$scope.active = 'all';
 		$scope.tip = $rootScope.searchKeyword;
-		
+
 		// 企业搜索
 		var getService = function() {
 			return getAccountUserSpace;
 		};
-		
+
 		$scope.tableParams = new ngTableParams({
-			page : 1, 
+			page : 1,
 			count : 5,
 			sorting: {
             }
 		}, {
-			total : 0, 
+			total : 0,
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
 				$scope.loading = true;
@@ -990,7 +990,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				});
 			}
 		});
-		
+
 		// 添加合作关系
 		$scope.addPartner = function(name, businessCode) {
 			AddPartner.addPartner({name: name, businessCode: businessCode}, {}, function(data) {
@@ -1004,18 +1004,18 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				toaster.pop('error','失败',response.data);
 			});
 		}
-		
+
 		// 物料搜索
 		var getProdService = function() {
 			return SearchProd;
 		};
 		$scope.prodTableParams = new ngTableParams({
-			page : 1, 
+			page : 1,
 			count : 5,
 			sorting: {
             }
 		}, {
-			total : 0, 
+			total : 0,
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
 				$scope.loading = true;
@@ -1034,7 +1034,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				});
 			}
 		});
-		
+
 		/**
 		 * 向企业购买
 		 */
@@ -1042,7 +1042,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$rootScope.businessCode = businessCode;
 			window.location.hash = "#/purc/addOrder";
 		}
-		
+
 		/**
 		 * 选中单个物料购买
 		 * @param businessCode
@@ -1053,7 +1053,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$rootScope.prodId = id;
 			window.location.hash = "#/purc/addOrder";
 		}
-		
+
 		/**
 		 * 询价
 		 */
@@ -1061,7 +1061,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$rootScope.prodId = id;
 			window.location.hash = "#/purc/purcinquiry/" + businessCode;
 		}
-		
+
 		/**
 		 * 邀请注册商务平台
 		 */
@@ -1087,7 +1087,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				});
 			});
 		}
-	
+
 		/**
 		 * 立即查看
 		 */
@@ -1096,7 +1096,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			window.location.hash = "#/baseInfo/newPartner";
 		}
 	}]);
-	
+
 	app.controller('InviteCtrl', ['$scope', 'toaster', '$modalInstance', 'enname', function($scope, toaster, $modalInstance, enname) {
 		$scope.enter = {
 			vendname: enname	
@@ -1121,6 +1121,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         var loadData = function (id) {
             InvitationRecord.getRecordById({id: id}, {}, function(data) {
+                if (data.user !== null) {
+                    data.user = {};
+                }
                 $scope.enter = data;
             });
         };
@@ -15352,8 +15355,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		BaseService.scrollBackToTop();
 		$scope.status = 'vendor';
 		// 搜索框回车
-		$scope.onSearch = function(keyword) {
-			$scope.keyword = keyword;
+		$scope.onSearch = function() {
 			$scope.customerParams.page(1);
 			$scope.customerParams.reload();
 		};
@@ -15498,10 +15500,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			if($scope.keyword != null && $scope.keyword != '') {
 				$rootScope.searchKeyword = keyword;
 				$scope.keyword = keyword;
-				$scope.tableParams.page(1);
-				$scope.tableParams.reload();
-			}
-		};
+                $scope.tableParams.page(1);
+                $scope.tableParams.reload();
+            }
+        };
 		
 		// 添加合作关系
 		$scope.addPartner = function(name, businessCode) {

src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -140,8 +140,8 @@
 				<div class="col-xs-9">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、联系人" />
-							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、联系人" />
+							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 						</div>
 					</div>
 				</div>