|
|
@@ -142,7 +142,7 @@ angular.module('app.basic')
|
|
142
|
142
|
});
|
|
143
|
143
|
}else{
|
|
144
|
144
|
libraryType = '0';
|
|
145
|
|
- $scope.storehouseList = $rootScope.storelist;
|
|
|
145
|
+ $scope.storehouseList = $rootScope.storelist;
|
|
146
|
146
|
$scope.warehouse.depotName = $rootScope.orgInfo.orgName;
|
|
147
|
147
|
$scope.warehouse.depotId = $rootScope.orgInfo.orgId;
|
|
148
|
148
|
$scope.warehouse.libraryType = "0";
|
|
|
@@ -231,14 +231,24 @@ angular.module('app.basic')
|
|
231
|
231
|
return this.optional(element);
|
|
232
|
232
|
}else{
|
|
233
|
233
|
if($scope.warehouse.storehouseId != null && $scope.warehouse.storehouseId != ""){
|
|
234
|
|
- for(var i=0;i<$scope.storehouseList.length;i++){
|
|
235
|
|
- if($scope.warehouse.storehouseId == $scope.storehouseList[i].storehouseId){
|
|
236
|
|
- if(parseFloat($scope.storehouseList[i].designCapacity) < parseFloat($scope.warehouse.warehouseCapacity)){
|
|
|
234
|
+ if($scope.storehouseList.length == null){//$scope.storehouseList只有一个值
|
|
|
235
|
+ if($scope.warehouse.storehouseId == $scope.storehouseList[0].storehouseId){
|
|
|
236
|
+ if(parseFloat($scope.storehouseList[0].designCapacity) < parseFloat($scope.warehouse.warehouseCapacity)){
|
|
237
|
237
|
return this.optional(element) || false;
|
|
238
|
238
|
}else{
|
|
239
|
239
|
return this.optional(element) || true;
|
|
240
|
240
|
}
|
|
241
|
|
- break;
|
|
|
241
|
+ }
|
|
|
242
|
+ }else{
|
|
|
243
|
+ for(var i=0;i<$scope.storehouseList.length;i++){
|
|
|
244
|
+ if($scope.warehouse.storehouseId == $scope.storehouseList[i].storehouseId){
|
|
|
245
|
+ if(parseFloat($scope.storehouseList[i].designCapacity) < parseFloat($scope.warehouse.warehouseCapacity)){
|
|
|
246
|
+ return this.optional(element) || false;
|
|
|
247
|
+ }else{
|
|
|
248
|
+ return this.optional(element) || true;
|
|
|
249
|
+ }
|
|
|
250
|
+ break;
|
|
|
251
|
+ }
|
|
242
|
252
|
}
|
|
243
|
253
|
}
|
|
244
|
254
|
}else{
|