更新一键开启关闭的方法

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

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

@@ -70,4 +70,12 @@ public interface ProductDao extends JpaSpecificationExecutor<Product>, JpaReposi
 	 */
 	public List<Product> findByEnUUAndIsPurchase(Long enUU, Short isPurc);
 
+	/**
+	 * 查询企业的所有物料
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	public List<Product> findByEnUU(Long enuu);
+
 }

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

@@ -680,15 +680,13 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	public void switchPorduct(String status) {
 		List<Product> products = new ArrayList<Product>();
 		if (status.equals("off")) {
-			List<Product> productsResult = productDao.findByEnUUAndIsSale(SystemSession.getUser().getEnterprise().getUu(),
-					Constant.YES);
+			List<Product> productsResult = productDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 			for (Product product : productsResult) {
 				product.setIsSale(Constant.NO);
 				products.add(product);
 			}
 		} else if (status.equals("on")) {
-			List<Product> productsResult = productDao
-					.findByEnUUAndIsSale(SystemSession.getUser().getEnterprise().getUu(), Constant.NO);
+			List<Product> productsResult = productDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 			for (Product product : productsResult) {
 				product.setIsSale(Constant.YES);
 				products.add(product);

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

@@ -162,15 +162,13 @@ public class PurcProductServiceImpl implements PurcProductService {
 	public void switchPorduct(String status) {
 		List<Product> products = new ArrayList<Product>();
 		if (status.equals("off")) {
-			List<Product> productsResult = productDao
-					.findByEnUUAndIsPurchase(SystemSession.getUser().getEnterprise().getUu(), Constant.YES);
+			List<Product> productsResult = productDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 			for (Product product : productsResult) {
 				product.setIsPurchase(Constant.NO);
 				products.add(product);
 			}
 		} else if (status.equals("on")) {
-			List<Product> productsResult = productDao
-					.findByEnUUAndIsPurchase(SystemSession.getUser().getEnterprise().getUu(), Constant.NO);
+			List<Product> productsResult = productDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 			for (Product product : productsResult) {
 				product.setIsPurchase(Constant.YES);
 				products.add(product);

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

@@ -15302,7 +15302,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	/**
 	 * 采购物料资料
 	 */
-	app.controller('PurcProductCtrl', ['$scope', 'PurcProduct', 'ngTableParams', '$filter', 'BaseService', 'toaster', '$timeout', function($scope, PurcProduct, ngTableParams, $filter, BaseService, toaster, $timeout) {
+	app.controller('PurcProductCtrl', ['$scope', 'PurcProduct', 'ngTableParams', '$filter', 'BaseService', 'toaster', '$timeout', 'Products', function($scope, PurcProduct, ngTableParams, $filter, BaseService, toaster, $timeout, Products) {
 		BaseService.scrollBackToTop();
 		$scope.active = 'all';
 		$scope.agreedText = '全部';
@@ -15386,7 +15386,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 一键开启关闭
 		$scope.toggle = function(status) {
-			PurcProduct.toggle({status: status}, {}, function(data) {
+			console.log(status);
+			Products.toggle({status: status}, {}, function(data) {
 				toaster.pop('success', '提示', '操作成功');
 				$scope.tableParams.reload();
 			}, function(response) {

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

@@ -141,8 +141,8 @@
             <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格">导出</a>
             <a ui-sref="purc.newProduct">新增</a>
             <a ui-sref="purc.uploadProduct" title="批量导入">批量导入</a>
-            <a ng-click="toggle(0)">一键关闭</a>
-            <a ng-click="toggle(1)">一键开启</a>
+            <a ng-click="toggle('off')">一键关闭</a>
+            <a ng-click="toggle('on')">一键开启</a>
         </div>
     </div>
     <div class="condition block" style="padding: 10px 15px;">