更新信扬保存的字段

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

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

@@ -125,6 +125,12 @@ public class DeputyOrderKeywords implements Serializable {
 	@Column(name = "dk_enfax")
 	private String enfax;
 
+	/**
+	 * 供应商交货方式
+	 */
+	@Column(name = "dk_deliverymethod")
+	private String deliverymethod;
+
 	public Long getId() {
 		return id;
 	}
@@ -253,4 +259,12 @@ public class DeputyOrderKeywords implements Serializable {
 		this.enfax = enfax;
 	}
 
+	public String getDeliverymethod() {
+		return deliverymethod;
+	}
+
+	public void setDeliverymethod(String deliverymethod) {
+		this.deliverymethod = deliverymethod;
+	}
+
 }

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

@@ -273,6 +273,7 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		keyword.setVendtel(order.getVendtel());
 		keyword.setVenduser(order.getVenduser());
 		keyword.setEnfax(order.getEnfax());
+		keyword.setDeliverymethod(order.getDeliverymethod());
 		deputyOrderKeywordsDao.save(keyword);
 		// 记录供应商
 		DeputyHisVendors oldvendor = deputyHisVendorsDao

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

@@ -34,6 +34,7 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
+import com.uas.search.b2b.model.SPage;
 
 @Service
 public class ProductServiceImpl implements ProductService {
@@ -422,6 +423,29 @@ public class ProductServiceImpl implements ProductService {
 		return map;
 	}
 
+	@Override
+	public SPage<Product> findProductInfoByPageInfo(PageInfo pageInfo, String keyword) {
+		Page<Product> products = findAllProudctByPageInfo(pageInfo, keyword);
+		SPage<Product> prods = new SPage<Product>();
+		prods.setContent(products.getContent());
+		prods.setPage(products.getNumber());
+		prods.setSize(products.getSize());
+		prods.setTotalElement(products.getTotalElements());
+		prods.setTotalPage(products.getTotalPages());
+		return prods;
+	}
+
+	private Page<Product> findAllProudctByPageInfo(final PageInfo pageInfo, final String keyword) {
+		return productDao.findAll(new Specification<Product>() {
+
+			public Predicate toPredicate(Root<Product> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+				query.where(pageInfo.getPredicates(root, query, builder));
+				return null;
+			}
+		}, pageInfo);
+	}
+
 	/*
 	 * @Override public ModelMap updateByEn() { ModelMap map = new ModelMap();
 	 * List<Product> products =

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

@@ -12787,6 +12787,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				$scope.deOrder.legalrepresent = data.legalrepresent;
 				$scope.deOrder.tervendaddress = data.tervendaddress;
 				$scope.deOrder.enfax = data.enfax;
+				$scope.deOrder.deliverymethod = data.getDeliverymethod;
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -15944,8 +15945,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			}
 		};
 		var getService = function() {
-//			return ProductAll;
-			return Products.getAllNewest;
+			return ProductAll;
+//			return Products.getAllNewest;
 		};
 		
 		$scope.tableParams = new ngTableParams({
@@ -15963,7 +15964,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
 				pageParams.searchFilter = $scope.searchFilter;
-				getService().call(null, BaseService.parseParams(pageParams), function(page){
+				getService()[$scope.active($scope.getActive)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);