货位容量校验修改和库点面积的单位修改

src/main/resources/static/app/basic/storehouse/controller/StorehouseCtrl.js

@@ -741,7 +741,7 @@ angular.module('app.basic')
 		}else{
 			//btnType, libraryType, warehouse_num, sjcr
 			if (warehouse_num.length == 0) {//还没有一条货位的情况，当前是第一条
-				if(parseFloat(sjcr) <= parseFloat($scope.warehouse.warehouseCapacity)){
+				if(parseFloat(sjcr) < parseFloat($scope.warehouse.warehouseCapacity)){
 					return this.optional(element) || false;
 				}else{
 					return this.optional(element) || true;
@@ -764,14 +764,14 @@ angular.module('app.basic')
 					}
 				}
 				count = parseFloat(count) + parseFloat($scope.warehouse.warehouseCapacity);
-				if(parseFloat(sjcr) <= parseFloat(count)){
+				if(parseFloat(sjcr) < parseFloat(count)){
 					return this.optional(element) || false;
 				}else{
 					return this.optional(element) || true;
 				}
 			}
 		}
-	},"请输大于0的数且要小于仓房的设计容量！");
+	},"请输大于0的数且要小于或等于仓房的设计容量！");
 	
 	$.validator.addMethod("wareCode",function(value,element, params) {
 		if(value == 0){

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

@@ -317,7 +317,7 @@ angular.module('app.basic')
 				//新的货位总容量 = 除当前货位之外的其它货位容量之和 + 当前货位容量
 				var this_sum_cr = parseFloat(ware_sum) + $scope.warehouse.warehouseCapacity;
 				//如果新的总容量超过了仓房的设计容量，那么返回false
-				if (parseFloat(this_sum_cr) >= parseFloat(cf_sum)) {
+				if (parseFloat(this_sum_cr) > parseFloat(cf_sum)) {
 					return this.optional(element) || false;
 				} else {
 					return this.optional(element) || true;
@@ -326,7 +326,7 @@ angular.module('app.basic')
 				return this.optional(element) || true;
 			}
 		}
-	},"请输大于0的数且要小于仓房的设计容量！");
+	},"请输大于0的数且要小于或等于仓房的设计容量！");
     
 	var validator;
     // 提交表单

src/main/resources/static/app/system/views/org-edit.html

@@ -303,7 +303,7 @@
 									
 									<div class="row">
 										<section class="col col-4">
-											<label class="label">库点面积(亩)<span style="color: red;">*</span></label> 
+											<label class="label">库点面积(平方米)<span style="color: red;">*</span></label> 
 											<label class="input"> 
 												<input type="number" name="depotArea" ng-model="orgInfo.depotArea" validNumber=true max="99999999" required>
 											</label>