代采订单增加删除功能

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

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

@@ -10,7 +10,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import com.uas.platform.b2b.dao.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -22,6 +21,15 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
+import com.uas.platform.b2b.dao.DeputyHisVendorsDao;
+import com.uas.platform.b2b.dao.DeputyLastOrderKeywordsDao;
+import com.uas.platform.b2b.dao.DeputyOrderDao;
+import com.uas.platform.b2b.dao.DeputyOrderItemDao;
+import com.uas.platform.b2b.dao.DeputyOrderKeywordsDao;
+import com.uas.platform.b2b.dao.DeputyOrdersLogDao;
+import com.uas.platform.b2b.dao.DeputyPaymentCompanyDao;
+import com.uas.platform.b2b.dao.PagingReleaseCountDao;
+import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.mobile.dao.DeputyEnterpriseDao;
 import com.uas.platform.b2b.model.DeputyEnterprise;
 import com.uas.platform.b2b.model.DeputyHisVendors;
@@ -404,17 +412,19 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 				for (DeputyOrderItem item : order.getDeputyOrderItems()) {
 					try {
 						deputyOrderItemDao.delete(item.getId());
-						if (deputyOrderDao.findOne(id) == null) {
-							map.put("success", "单据删除成功");
-						} else {
-							map.put("error", "单据删除失败");
-						}
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
 				}
 			}
 		}
+		try {
+			deputyOrderDao.delete(id);
+			map.put("success", "单据删除成功");
+		} catch (Exception e) {
+			map.put("error", "单据删除失败");
+			e.printStackTrace();
+		}
 		return map;
 	}
 

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

@@ -2054,8 +2054,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				checked : false
 			};
 		$scope.loading = true;
+		$scope.distribute = [];
         AccountUser.findUsers({uu:customer.myEnterprise.uu},null,function(data) {
 			$scope.userinfos = data;
+			var distribute = [];
+			angular.forEach($scope.userinfos, function(user, index) {
+				if(user.distribute) {
+					distribute.push(index);
+				}
+			});
+			$scope.distribute = distribute;
+			$scope.havedone = angular.copy($scope.distribute);
 			$scope.loading = false;
 		})
 		
@@ -2067,9 +2076,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			angular.forEach($scope.userinfos, function(item, index) {
 				item.distribute = $scope.checkboxes.checked;
 			});
-			$scope.isChanged = true;
+//			$scope.isChanged = true;
 		};
 		
+		$scope.isChanged = function() {
+        	return angular.equals($scope.distribute, $scope.changes);
+        }
 		// 点击其中一个明细的复选框
 		$scope.checkOne = function(vendor, isChanged, index){
 			if(isChanged) {
@@ -13403,7 +13415,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			$scope.tableParams.reload();
 		};
 		
-		//复制采购单
+		// 复制采购单
 		$scope.copyorder = function(id) {
 			DeputyOrder.copyOrder({id: id}, {}, function(data) {
 				if(data.id) {
@@ -13417,6 +13429,18 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				toaster.pop('error', '提示', response.data);
 			});
 		}
+		
+		// 删除代采订单
+		$scope.clear = function(id) {
+			DeputyOrder.clearOrder({id: id}, {}, function(data) {
+				if(data.success) {
+					toaster.pop('success', '提示', data.success);
+					$scope.tableParams.reload();
+				}
+			}, function(response) {
+				toaster.pop('error', '提示', response.data);
+			});
+		}
 	}]);
 	
 	/**
@@ -14267,6 +14291,18 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				toaster.pop('error', '提示', response.data);
 			});
 		}
+		
+		// 删除代采订单
+		$scope.clear = function(id) {
+			DeputyOrder.clearOrder({id: id}, {}, function(data) {
+				if(data.success) {
+					toaster.pop('success', '提示', data.success);
+					window.location.hash = "#/purc/deputy";
+				}
+			}, function(response) {
+				toaster.pop('error', '提示', response.data);
+			});
+		}
 	}]);
 
 	/**

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

@@ -75,6 +75,10 @@ define(['ngResource'], function() {
             copyOrder: {
             	url: 'deputyOrder/copyorder/:id',
             	method: 'POST'
+            },
+            clearOrder: {
+            	url: 'deputyOrder/clearOrder/:id',
+            	method: 'DELETE'
             }
 		})
 	}]).factory('getDeOrder', ['$resource', function($resource) {

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

@@ -331,6 +331,9 @@
                         <div>
 	                        <a ng-click="copyorder(order.id)" title="复制生成一张新的订单，除了采购单号和合同编号不同，其他信息基本相同">复制</a>
                         </div>
+                        <div ng-if="order.entrystatus == '保存' && order.statuscode == 311">
+	                        <a ng-click="clear(order.id)" title="只有新增的在录入的单据可以删除">删除</a>
+                        </div>
                     </td>
                 </tr>
                 <tr>

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

@@ -564,6 +564,7 @@
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="submit()" ng-disabled="isSubmit">提交</button></span>
                 	<span ng-if="deOrder.entrystatus == '保存'"><button ng-click="save()" ng-disabled="isSave">保存</button></span>
                 	<button ng-click="copyorder(deOrder.id)" title="复制生成一张新的订单，除了采购单号和合同编号不同，其他信息基本相同">复制订单</button>
+                	<span ng-if="deOrder.entrystatus == '保存' && deOrder.statuscode == 311"><button ng-click="clear(deOrder.id)">删除</button></span>
                 </div>
             </div>
         </form>