还原

src/main/resources/static/app/basic/warehouse/controller/warehouseCtrl.js

@@ -231,24 +231,14 @@ angular.module('app.basic')
 			return this.optional(element); 
 		}else{
 			if($scope.warehouse.storehouseId != null && $scope.warehouse.storehouseId != ""){
-				if($scope.storehouseList.length == null){//$scope.storehouseList只有一个值
-					if($scope.warehouse.storehouseId == $scope.storehouseList[0].storehouseId){
-						if(parseFloat($scope.storehouseList[0].designCapacity) < parseFloat($scope.warehouse.warehouseCapacity)){
+				for(var i=0;i<$scope.storehouseList.length;i++){
+					if($scope.warehouse.storehouseId == $scope.storehouseList[i].storehouseId){
+						if(parseFloat($scope.storehouseList[i].designCapacity) < parseFloat($scope.warehouse.warehouseCapacity)){
 							return this.optional(element) || false;
 						}else{
 							return this.optional(element) || true;
 						}
-					}
-				}else{
-					for(var i=0;i<$scope.storehouseList.length;i++){
-						if($scope.warehouse.storehouseId == $scope.storehouseList[i].storehouseId){
-							if(parseFloat($scope.storehouseList[i].designCapacity) < parseFloat($scope.warehouse.warehouseCapacity)){
-								return this.optional(element) || false;
-							}else{
-								return this.optional(element) || true;
-							}
-							break;
-						}
+						break;
 					}
 				}
 			}else{