采购变更单获取数据方法更新

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

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

@@ -4,10 +4,8 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -19,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.model.PurchaseOrderChange;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -156,6 +156,75 @@ public class SaleOrderChangeController {
 		return searchService.searchPurchaseOrderChangeIds(keyword, pageParams);
 	}
 
+	/**
+	 * 作为卖家，收到的采购变更单（全部）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseOrderChange> getAllOrderChanges(PageParams params, String searchFilter) {
+		SPage<PurchaseOrderChange> orders = new SPage<PurchaseOrderChange>();
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.REPLIED.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		// filter.setDistribute(userService.distribute().getDistribute());
+		Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
+		orders.setContent(orderchanges.getContent());
+		orders.setPage(orderchanges.getNumber());
+		orders.setSize(orderchanges.getSize());
+		orders.setTotalElement(orderchanges.getTotalElements());
+		orders.setTotalPage(orderchanges.getTotalPages());
+		return orders;
+	}
+
+	/**
+	 * 作为卖家，收到的采购变更单（待处理）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.TODO, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseOrderChange> getTodoOrderChanges(PageParams params, String searchFilter) {
+		SPage<PurchaseOrderChange> orders = new SPage<PurchaseOrderChange>();
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.NOT_REPLY.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		// filter.setDistribute(userService.distribute().getDistribute());
+		Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
+		orders.setContent(orderchanges.getContent());
+		orders.setPage(orderchanges.getNumber());
+		orders.setSize(orderchanges.getSize());
+		orders.setTotalElement(orderchanges.getTotalElements());
+		orders.setTotalPage(orderchanges.getTotalPages());
+		return orders;
+	}
+
+	/**
+	 * 作为卖家，收到的采购变更单（已处理）
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping(value = "/info", params = RequestState.DONE, method = RequestMethod.GET)
+	@ResponseBody
+	public SPage<PurchaseOrderChange> getDoneOrderChanges(PageParams params, String searchFilter) {
+		SPage<PurchaseOrderChange> orders = new SPage<PurchaseOrderChange>();
+		PageInfo pageInfo = new PageInfo(params);
+		pageInfo.filter("status", Status.REPLIED.value());
+		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+		// filter.setDistribute(userService.distribute().getDistribute());
+		Page<PurchaseOrderChange> orderchanges = purchaseOrderChangeService.findAllByPageInfo(pageInfo, null, filter);
+		orders.setContent(orderchanges.getContent());
+		orders.setPage(orderchanges.getNumber());
+		orders.setSize(orderchanges.getSize());
+		orders.setTotalElement(orderchanges.getTotalElements());
+		orders.setTotalPage(orderchanges.getTotalPages());
+		return orders;
+	}
+
 	/**
 	 * 作为卖家，根据变更单ID查找采购变更单(含明细)
 	 * 

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

@@ -2768,7 +2768,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			}
 		};
 	}]);
-	app.controller('SaleChangeCtrl', ['$scope', '$filter', 'PurcChange', 'ngTableParams', 'toaster', 'BaseService', 'PurcChangeHis', function($scope, $filter, PurcChange, ngTableParams, toaster, BaseService, PurcChangeHis){
+	app.controller('SaleChangeCtrl', ['$scope', '$filter', 'PurcChange', 'PurcChanges', 'ngTableParams', 'toaster', 'BaseService', 'PurcChangeHis', function($scope, $filter, PurcChange, PurcChanges, ngTableParams, toaster, BaseService, PurcChangeHis){
 		BaseService.scrollBackToTop();
 
 		$scope.active = 'todo';
@@ -2807,8 +2807,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					$scope.tableParams.page(1);
 			}
 		};
+		
+		$scope.searchMethod = false;
 		var getService = function() {
-			return $scope.condition.dateZone ? PurcChange : PurcChangeHis;
+			if($scope.searchMethod) {
+				return $scope.condition.dateZone ? PurcChange : PurcChangeHis;
+			} else {
+				return PurcChanges;
+			}
 		};
 		$scope.tableParams = new ngTableParams({
 			page : 1, 
@@ -2873,6 +2879,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 搜索框回车
 		$scope.onSearch = function() {
+			$scope.searchMethod = true;
 			$scope.tableParams.page(1);
 			$scope.tableParams.reload();
 		};

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

@@ -127,6 +127,26 @@ define([ 'ngResource'], function() {
 				params: {
 					changeId: 'changeId'
 				}
+			},
+			getChangesDone: {
+				url: 'sale/changes/info',
+				method: 'GET',
+				params: {
+					_state: 'done'
+				}
+			}
+		});
+	}]).factory('PurcChanges', ['$resource', function($resource) {
+		return $resource('sale/changes/info', {}, {
+			getTodo: {
+				params: {
+					_state: 'todo'
+				}
+			},
+			getDone: {
+				params: {
+					_state: 'done'
+				}
 			}
 		});
 	}]).factory('PurcInquiry', ['$resource', function($resource) {