删除物料时增加提示

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

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

@@ -99,13 +99,19 @@ public class BaseInfoController {
 	 * @param id
 	 * @return
 	 * @return
+	 * @throws Exception
 	 */
 	@RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
 	@ResponseBody
-	public String deleteById(@PathVariable("id") Long id) {
-		logger.log("删除物料", "[" + SystemSession.getUser().getUserName() + "]删除了id为 [" + id + "]的物料");
-		baseInfoService.deleteById(id);
-		return "success";
+	public ModelMap deleteById(@PathVariable("id") Long id) throws Exception {
+		ModelMap map = new ModelMap();
+		try {
+			baseInfoService.deleteById(id);
+			logger.log("删除物料", "[" + SystemSession.getUser().getUserName() + "]删除了id为 [" + id + "]的物料");
+		} catch (Exception e) {
+			map.put("error", "该物料可能已经被其他单据引用，无法删除");
+		}
+		return map;
 	}
 
 	/**

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

@@ -56,7 +56,7 @@ public interface BaseInfoService {
 	 * @param id
 	 * @return
 	 */
-	public void deleteById(Long id);
+	public void deleteById(Long id) throws Exception;
 
 	/**
 	 * 平台下的采购单存储

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

@@ -260,7 +260,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 	}
 
 	@Override
-	public void deleteById(Long id) {
+	public void deleteById(Long id) throws Exception {
 		if (productDao.exists(id)) {
 			productDao.delete(id);
 		}

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

@@ -7404,7 +7404,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
 				pageParams.searchFilter = $scope.searchFilter;
-				console.log(pageParams.searchFilter);
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
@@ -7429,10 +7428,15 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		//删除
 		$scope.deleteById = function(id) {
 			GetProductInfo.deleteById({id: id}, function(data) {
-				toaster.pop("success", "提示", "删除成功");
-				$timeout(function() {
-					window.location.reload();
-				}, 500);
+				if(data.error) {
+					toaster.pop("error", "提示", data.error);
+				} else {
+					toaster.pop("success", "提示", "删除成功");
+					$timeout(function() {
+						$scope.tableParams.page(1);
+						$scope.tableParams.reload();
+					}, 500);
+				}
 			}), function(response) {
 				toaster.pop("error", "删除失败", response.data);
 			};
@@ -8416,7 +8420,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		
 		// 向企业购买
 		$scope.purcByEn = function(businessCode) {
-			console.log(businessCode);
 			$rootScope.businessCode = businessCode;
 			window.location.hash = "#/purc/addOrder";
 		}