更新批量更新物料信息方法

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

src/main/java/com/uas/platform/b2b/controller/BaseInfoController.java

@@ -44,6 +44,7 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
@@ -76,7 +77,7 @@ public class BaseInfoController {
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
 	public SPage<Product> getAllProductInfo(PageParams params, String keyword) {
-		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（全部）");
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pr_issale", Constant.YES);
@@ -86,6 +87,49 @@ public class BaseInfoController {
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
 
+	/**
+	 * 标准物料
+	 * 
+	 * @param params
+	 * @param keyword
+	 * @return
+	 */
+	@RequestMapping(params = RequestState.STANDARD, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<Product> getStandardProductInfo(PageParams params, String keyword) {
+		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（标准）");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("pr_issale", Constant.YES);
+		pageParams.getFilters().put("pr_standard", Constant.YES);
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchProductsCheckIds(keyword, pageParams);
+	}
+
+	/**
+	 * 非标准物料
+	 * 
+	 * @param params
+	 * @param keyword
+	 * @return
+	 */
+	@RequestMapping(params = RequestState.NONSTANDARD, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<Product> getNonStandardProductInfo(PageParams params, String keyword) {
+		logger.log("查看产品", SystemSession.getUser().getUserName() + "查看了产品信息（非标准）");
+		System.out.println("dddd");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("pr_issale", Constant.YES);
+		pageParams.getFilters().put("pr_standard", Constant.NO);
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchProductsCheckIds(keyword, pageParams);
+	}
+
 	/**
 	 * 通过id查看详情
 	 */

src/main/java/com/uas/platform/b2b/controller/ProductController.java

@@ -159,4 +159,40 @@ public class ProductController {
 		List<Product> prods = JSONObject.parseArray(products, Product.class);
 		return productService.updateByBatch(prods, updatetype, keyword);
 	}
+
+	/**
+	 * 批量修改物料数据
+	 * 
+	 * @param products
+	 * @param updatetype
+	 * @param keyword
+	 * @return
+	 */
+	@RequestMapping(value = "/alterByBatch", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap alterByBatch(String oldvalue, String newvalue, String updatetype) {
+		return productService.alterByBatch(oldvalue, oldvalue, updatetype);
+	}
+
+	/**
+	 * 获取企业所有的品牌
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/brands", method = RequestMethod.GET)
+	@ResponseBody
+	private List<Product> getBrands() {
+		return productService.getBrands();
+	}
+
+	/**
+	 * 获取所有类目
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/titles", method = RequestMethod.GET)
+	@ResponseBody
+	private List<Product> getTitles() {
+		return productService.getTitles();
+	}
 }

src/main/java/com/uas/platform/b2b/controller/PurcProductController.java

@@ -31,6 +31,7 @@ import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import com.uas.platform.core.web.bind.RequestState;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
@@ -135,6 +136,48 @@ public class PurcProductController {
 		return searchService.searchProductsCheckIds(keyword, pageParams);
 	}
 
+	/**
+	 * 标准物料
+	 * 
+	 * @param params
+	 * @param keyword
+	 * @return
+	 */
+	@RequestMapping(params = RequestState.STANDARD, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<Product> getStandardProductInfo(PageParams params, String keyword) {
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
+		pageParams.getFilters().put("pr_standard", Constant.YES);
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchProductsCheckIds(keyword, pageParams);
+	}
+
+	/**
+	 * 非标准物料
+	 * 
+	 * @param params
+	 * @param keyword
+	 * @return
+	 */
+	@RequestMapping(params = RequestState.NONSTANDARD, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<Product> getNonStandardProductInfo(PageParams params, String keyword) {
+		logger.log("查看物料", SystemSession.getUser().getUserName() + "查看了物料信息");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		pageParams.getFilters().put("pr_enuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("pr_ispurchase", Constant.YES);
+		pageParams.getFilters().put("pr_standard", Constant.NO);
+		List<Sort> sortList = new ArrayList<>();
+		sortList.add(new Sort("pr_id", false, Type.LONG, new Long(1)));
+		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+		return searchService.searchProductsCheckIds(keyword, pageParams);
+	}
+
 	/**
 	 * 开启关闭销售
 	 * 

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

@@ -78,4 +78,13 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 */
 	public List<Product> findByEnUU(Long enuu);
 
+	/**
+	 * 通过品牌和enuu查询所有信息
+	 * 
+	 * @param enuu
+	 * @param brand
+	 * @return
+	 */
+	public List<Product> findByEnUUAndBrand(Long enuu, String brand);
+
 }

src/main/java/com/uas/platform/b2b/erp/controller/ProdController.java

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.erp.model.Prod;
 import com.uas.platform.b2b.erp.service.ProdService;
 import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
@@ -66,7 +65,6 @@ public class ProdController {
 	public void updateProducts(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		String jsonStr = URLDecoder.decode(data, "UTF-8");
 		List<Prod> prods = FlexJsonUtils.fromJsonArray(jsonStr, Prod.class);
-		System.out.println(JSON.toJSON(prods));
 		productService.save(prodService.convertProduct(prods));
 		logger.log("物料资料", "定时任务更新物料资料", prods.size());
 	}

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.erp.model;
 
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
 
 /**
  * ERP系统的产品
@@ -221,7 +222,16 @@ public class Prod {
 		// product.setIsSale((short) 0);
 		// }
 		// }
-		product.setCmpCode(this.pr_orispeccode);
+		if (this.pr_orispeccode != null) {
+			product.setCmpCode(this.pr_orispeccode);
+		} else {
+			product.setCmpCode(this.pr_spec);
+		}
+		if (this.pr_uuid != null) {
+			product.setStandard(Constant.YES);
+		} else {
+			product.setStandard(Constant.NO);
+		}
 		product.setCmpUuId(this.pr_uuid);
 		product.setIsPubsale(this.pr_ispubsale);
 		product.setIsPurchase(this.pr_ispurchase);
@@ -230,7 +240,7 @@ public class Prod {
 		product.setCmpUuId(this.pr_uuid);
 		product.setPbrand(this.pbrand);
 		product.setKind(this.kind);
-		product.setPcmpcode(pcmpcode);
+		product.setPcmpcode(this.pcmpcode);
 		return product;
 	}
 

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

@@ -237,6 +237,14 @@ public class Product {
 	@Column(name = "pr_message")
 	private String message;
 
+	/**
+	 * 是否是标准物料<br>
+	 * 1.YES<br>
+	 * 0.NO
+	 */
+	@Column(name = "pr_standard")
+	private Short standard;
+
 	public Product() {
 	}
 
@@ -493,4 +501,12 @@ public class Product {
 		this.message = message;
 	}
 
+	public Short getStandard() {
+		return standard;
+	}
+
+	public void setStandard(Short standard) {
+		this.standard = standard;
+	}
+
 }

src/main/java/com/uas/platform/b2b/service/ProductService.java

@@ -65,4 +65,27 @@ public interface ProductService {
 	 * @return
 	 */
 	public ModelMap updateByBatch(List<Product> products, String updatetype, String keyword);
+
+	/**
+	 * 批量修改物料数据
+	 * 
+	 * @param oldvalue
+	 * @param oldvalue2
+	 * @return
+	 */
+	public ModelMap alterByBatch(String oldvalue, String newvalue, String updatetype);
+
+	/**
+	 * 获取企业所有的品牌
+	 * 
+	 * @return
+	 */
+	public List<Product> getBrands();
+
+	/**
+	 * 获取企业所有类目
+	 * 
+	 * @return
+	 */
+	public List<Product> getTitles();
 }

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

@@ -17,12 +17,14 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
+import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.ProductDao;
 import com.uas.platform.b2b.event.ProductSaveEvent;
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.UpdateType;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.ProductService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -36,6 +38,9 @@ public class ProductServiceImpl implements ProductService {
 	@Autowired
 	private SearchService searchService;
 
+	@Autowired
+	private CommonDao commonDao;
+
 	@Override
 	public List<Product> save(List<Product> products) {
 		List<Product> newProducts = productDao.save(products);
@@ -129,4 +134,52 @@ public class ProductServiceImpl implements ProductService {
 		}
 		return map;
 	}
+
+	@Override
+	public ModelMap alterByBatch(String oldvalue, String newvalue, String updatetype) {
+		ModelMap map = new ModelMap();
+		Integer size = 0;
+		if (null != oldvalue) {
+				if (updatetype.equals(UpdateType.BRANDUPDATE.getPhrase())) {
+				List<Product> products = productDao.findByEnUUAndBrand(SystemSession.getUser().getEnterprise().getUu(),
+						oldvalue);
+				if (!CollectionUtils.isEmpty(products)) {
+					size = products.size();
+					for (Product product : products) {
+						product.setBrand(newvalue);
+						productDao.save(product);
+					}
+				}
+
+			} else if (updatetype.equals(UpdateType.TITLEUPDATE.getPhrase())) {
+				List<Product> products = productDao.findByEnUUAndTitle(SystemSession.getUser().getEnterprise().getUu(),
+						oldvalue);
+				if (!CollectionUtils.isEmpty(products)) {
+					map.put("size", products.size());
+					for (Product product : products) {
+						product.setBrand(newvalue);
+						productDao.save(product);
+					}
+				}
+				}
+			map.put("success", updatetype + "修改成功，更新数量为" + size);
+		}
+		return map;
+	}
+
+	@Override
+	public List<Product> getBrands() {
+		String sql = "select distinct p.pr_brand brand from products p where pr_enuu = "
+				+ SystemSession.getUser().getEnterprise().getUu();
+		List<Product> products = commonDao.query(sql, Product.class);
+		return products;
+	}
+
+	@Override
+	public List<Product> getTitles() {
+		String sql = "select distinct p.pr_title title from products p where pr_enuu = "
+				+ SystemSession.getUser().getEnterprise().getUu();
+		List<Product> products = commonDao.query(sql, Product.class);
+		return products;
+	}
 }

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

@@ -1999,6 +1999,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 集体
 		case 'teams':
 		fn = 'getTeams';break;
+		// 非标准
+		case 'nonstandard':
+		fn = 'getNonstandard';break;
+		// 标准
+		case 'standard':
+		fn = 'getStandard';break;
 		}
 		return fn;
 	};
@@ -9855,57 +9861,55 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
         $scope.updateByBatch = function(updatetype) {
-        	angular.forEach($scope.tableParams.data, function(product) { // 单选全部时，全选选中
-        		if (product.checked) {
-        			products.push(product);
-        		}
-        	});
-        	if(products.length == 0) {
-				toaster.pop('warning', '提示', '请至少选择一个产品');
-			} else {
-				var modalInstance = $modal.open({
-					templateUrl: 'static/tpl/index/baseInfo/modal/updateByBatch_modal.html',
-					controller: 'UpdateByBatchCtrl',
-					size: 'lg',
-					resolve: {
-						products: function() {
-							return products;
-						},
-						updatetype: function() {
-							return updatetype;
-						}
+			var modalInstance = $modal.open({
+				templateUrl: 'static/tpl/index/baseInfo/modal/updateByBatch_modal.html',
+				controller: 'UpdateByBatchCtrl',
+				size: 'lg',
+				resolve: {
+					updatetype: function() {
+						return updatetype;
 					}
-				});
+				}
+			});
+			
+			modalInstance.result.then(function(data) {
+				toaster.pop('success', '提示', data.data);
+				$scope.tableParams.reload();
+			}, function(){
 				
-				modalInstance.result.then(function(data) {
-					toaster.pop('success', '提示', data.data);
-					$scope.tableParams.reload();
-				}, function(){
-					
-				});
-			}
+			});
         }
 	}]);
 	
 	/**
 	 * 批量修改
 	 */
-	app.controller('UpdateByBatchCtrl', ['$scope', '$modalInstance', 'toaster', 'BaseService', 'updatetype', 'products', 'Products', function($scope, $modalInstance, toaster, BaseService, updatetype, products, Products) {
+	app.controller('UpdateByBatchCtrl', ['$scope', '$modalInstance', 'toaster', 'BaseService', 'updatetype', 'Products', function($scope, $modalInstance, toaster, BaseService, updatetype, Products) {
 		$scope.updatetype = updatetype;
-		$scope.products = products;
 		$scope.changed = false;
-		$scope.ensure = function(keyword) {
-			$scope.keyword = keyword;
-			$scope.changed = true;
-		}
-		$scope.returnUpdate = function() {
-			$scope.changed = false;
-		}
 		$scope.cancel = function() {
 			$modalInstance.dismiss();
 		}
+		if(updatetype === '品牌')
+			var loadData = function() {
+				Products.getBrands({}, function(data) {
+					$scope.products = data;
+				}, function(response) {
+					toaster.pop('error', '提示', response.data);
+				})
+		}
+		if(updatetype === '名称（类目）')
+			var loadData = function() {
+				Products.getTitles({}, function(data) {
+					$scope.products = data;
+				}, function(response) {
+					toaster.pop('error', '提示', response.data);
+				})
+		}
+		loadData();
+		
 		$scope.okay = function() {
-			Products.updateByBatch({updatetype: updatetype, keyword: $scope.keyword}, $scope.products, function(data) {
+			Products.alterByBatch({oldvalue: $scope.oldvalue, newvalue: $scope.newvalue, updatetype: updatetype}, {}, function(data) {
 				$modalInstance.close(data);
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
@@ -15527,35 +15531,23 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
         $scope.updateByBatch = function(updatetype) {
-        	angular.forEach($scope.tableParams.data, function(product) { // 单选全部时，全选选中
-        		if (product.checked) {
-        			products.push(product);
-        		}
-        	});
-        	if(products.length == 0) {
-				toaster.pop('warning', '提示', '请至少选择一个物料');
-			} else {
-				var modalInstance = $modal.open({
-					templateUrl: 'static/tpl/index/baseInfo/modal/updateByBatch_modal.html',
-					controller: 'UpdateByBatchCtrl',
-					size: 'lg',
-					resolve: {
-						products: function() {
-							return products;
-						},
-						updatetype: function() {
-							return updatetype;
-						}
+			var modalInstance = $modal.open({
+				templateUrl: 'static/tpl/index/baseInfo/modal/updateByBatch_modal.html',
+				controller: 'UpdateByBatchCtrl',
+				size: 'lg',
+				resolve: {
+					updatetype: function() {
+						return updatetype;
 					}
-				});
+				}
+			});
+			
+			modalInstance.result.then(function(data) {
+				toaster.pop('success', '提示', data.data);
+				$scope.tableParams.reload();
+			}, function(){
 				
-				modalInstance.result.then(function(data) {
-					toaster.pop('success', '提示', data.data);
-					$scope.tableParams.reload();
-				}, function(){
-					
-				});
-			}
+			});
         }
 	}]);
 	

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -8,6 +8,16 @@ define(['ngResource'], function() {
 			getAll : {
 				isArray : false
 			},
+			getStandard: {
+				params: {
+					_state: 'standard'
+				}
+			},
+			getNonstandard: {
+				params: {
+					_state: 'nonestandard'
+				}
+			},
 			uploadByBatch : {
 				url : "product/baseInfo/uploadByBatch",
 				method : 'GET',

src/main/webapp/resources/js/index/services/Product.js

@@ -29,13 +29,37 @@ define([ 'ngResource'], function() {
 			updateByBatch: {
 				url: 'product/updateByBatch',
 				method: 'POST'
+			},
+			alterByBatch: {
+				url: 'product/alterByBatch',
+				method: 'POST'
+			},
+			getBrands: {
+				url: 'product/brands',
+				methoe: 'GET',
+				isArray: true
+			},
+			getTitles: {
+				url: 'product/titles',
+				methoe: 'GET',
+				isArray: true
 			}
 		});
 	}]).factory('PurcProduct', ['$resource', function($resource) {
 		return $resource('purcProduct', {}, {
 			getAll : {
 				isArray : false
-			}
+			},
+			getStandard: {
+				params: {
+					_state: 'standard'
+				}
+			},
+			getNonstandard: {
+				params: {
+					_state: 'nonestandard'
+				}
+			},
 		})
 	}]);
 });

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

@@ -166,6 +166,26 @@
         </div>
     </div>
     <div class="condition block" style="padding: 10px 15px;">
+	    <div class="menu condition block">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="btn-group btn-group-sm btn-group-justified">
+						<div class="btn-group btn-group-sm">
+							<button type="button" class="btn btn-default btn-line"
+									ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
+						</div>
+						<div class="btn-group btn-group-sm">
+							<button type="button" class="btn btn-default btn-line"
+									ng-class="{'btn-info':active=='standard'}" ng-click="setActive('standard')">标准</button>
+						</div>
+						<div class="btn-group btn-group-sm">
+							<button type="button" class="btn btn-default btn-line"
+									ng-class="{'btn-info':active=='nonstandard'}" ng-click="setActive('nonstandard')">非标准</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
         <div class="search-bg condition block"  style="padding: 10px 15px;">
             <div class="row">
                 <div id="topSearch"  class="col-xs-6" style="float: left;width: 35%;">
@@ -184,7 +204,6 @@
                     <select type="select" class="fl form-control" ng-model="product.updatetype" ng-init="product.updatetype = '品牌'" style="width: 130px;">
                         <option value="品牌">品牌</option>
                         <option value="名称（类目）">名称（类目）</option>
-                        <option value="产品型号">产品型号</option>
                     </select>
                     <a ng-click="updateByBatch(product.updatetype)" class="fr">批量修改</a>
                 </div>

src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -167,6 +167,26 @@
         </div>
     </div>
     <div class="condition block" style="padding: 10px 15px;">
+    	<div class="menu condition block">
+			<div class="row">
+				<div class="col-xs-9">
+					<div class="btn-group btn-group-sm btn-group-justified">
+						<div class="btn-group btn-group-sm">
+							<button type="button" class="btn btn-default btn-line"
+									ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
+						</div>
+						<div class="btn-group btn-group-sm">
+							<button type="button" class="btn btn-default btn-line"
+									ng-class="{'btn-info':active=='standard'}" ng-click="setActive('standard')">标准</button>
+						</div>
+						<div class="btn-group btn-group-sm">
+							<button type="button" class="btn btn-default btn-line"
+									ng-class="{'btn-info':active=='nonstandard'}" ng-click="setActive('nonstandard')">非标准</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
         <div class="search-bg condition block"  style="padding: 10px 15px;">
             <div class="row">
                 <div id="topSearch" class="col-xs-6" style="float: left;width: 35%;">