.

src/main/resources/static/app/basic/tank/controller/TankCtrl.js

@@ -142,4 +142,11 @@ angular.module('app.basic')
         $state.go("app.basic.tankList");
     }
 
+    $scope.crkzt = [
+                    {"id":"1","name":"空仓"},
+                    {"id":"2","name":"入库中"},
+                    {"id":"3","name":"封仓"},
+                    {"id":"4","name":"出库中"}
+                    ];
+
 });

src/main/resources/static/app/basic/tank/view/tank-edit.html

@@ -161,18 +161,6 @@
 	                                                </select>
 	                                            </label>
 	                                        </th>
-	<!--                                         <th> -->
-	<!--                                             <label class="label" style="margin-top: 9px;text-align: center;">油罐使用情况</label> -->
-	<!--                                         </th> -->
-	<!--                                         <th> -->
-	<!--                                             <label class="select"> -->
-	<!--                                                 <select ng-model="tank.tankApply" ng-disabled="isNotEdit" -->
-	<!--                                                         ng-options="enum.enumid as enum.enumname for enum in dicDataList[7004]" -->
-	<!--                                                         class="form-control"> -->
-	<!--                                                     <option value="">--请选择--</option> -->
-	<!--                                                 </select> -->
-	<!--                                             </label> -->
-	<!--                                         </th> -->
 											<th>
 	                                            <label class="label" style="margin-top: 9px;text-align: center;">油罐状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
 	                                        </th>
@@ -197,6 +185,18 @@
 													name="builddate" ng-disabled="isNotEdit" required>
 												</label>
 	                                        </th>
+	                                        <th>
+	                                        	<label class="label" style="margin-top: 9px;text-align: center;">出入库状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+	                                        </th>
+		                                    <th>
+		                                    	<label class="select">
+		                                    		<select ng-model="tank.crkStatus" ng-disabled="isNotEdit" name="crkStatus"
+	                                                        ng-options="enum.id as enum.name for enum in crkzt"
+	                                                        class="form-control" required>
+	                                                    <option value="">--请选择--</option>
+	                                                </select>
+		                                    	</label>
+		                                    </th>
 	                                    </tr>
 <!--                                     <tr> -->
 <!--                                         <th> -->

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

@@ -162,7 +162,23 @@ angular.module('app.basic')
             console.log(data);
         });
     };
-	
+
+    $scope.wlist = [];
+    $scope.warehouseObj = function(houseId) {
+    	warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function(data){
+        	$scope.wlist = data.wareList;  //下拉列表数据
+        },function(data){
+        	console.log(data);
+        });
+    }
+    $scope.gethouse = function(houseId) {
+    	StorehouseService.findByStorehouse(houseId, $rootScope.orgInfo.orgId).then(function(data){
+    		$scope.basicStorehouse = data;
+    	},function(datas){
+        	console.log(datas);
+        });
+    }
+
 	// 初始化模态窗口数据
     $scope.edit = function() {
     	warehouseService.findByWarehouse(id).then(function(datas){
@@ -172,6 +188,10 @@ angular.module('app.basic')
                 $scope.isNotEdit = true;
             }
             $scope.getBasicData();
+            if (id == "" || id == undefined) {
+            	$scope.warehouseObj($scope.warehouse.storehouseId);
+            	$scope.gethouse($scope.warehouse.storehouseId);
+            }
         },function(datas){
         	console.log(datas);
         });
@@ -235,16 +255,26 @@ angular.module('app.basic')
 			return this.optional(element); 
 		}else{
 			if($scope.warehouse.storehouseId != null && $scope.warehouse.storehouseId != ""){
-				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;
+				//先查询当前仓房下的货位数据
+
+				$scope.warehouseObj($scope.warehouse.storehouseId);
+				//除当前货位之外的其它货位容量之和
+				var ware_sum = 0;
+				//当前仓房的设计容量
+				var cf_sum = $scope.basicStorehouse.designCapacity;
+				for (var i = 0; i < $scope.wlist.length; i++) {
+					if ($scope.warehouse.warehouseId != $scope.wlist[i].warehouseId) {
+						ware_sum = parseFloat(ware_sum) + parseFloat($scope.wlist[i].warehouseCapacity);
 					}
 				}
+				//新的货位总容量 = 除当前货位之外的其它货位容量之和 + 当前货位容量
+				var this_sum_cr = parseFloat(ware_sum) + $scope.warehouse.warehouseCapacity;
+				//如果新的总容量超过了仓房的设计容量，那么返回false
+				if (parseFloat(this_sum_cr) >= parseFloat(cf_sum)) {
+					return this.optional(element) || false;
+				} else {
+					return this.optional(element) || true;
+				}
 			}else{
 				return this.optional(element) || true;
 			}

src/main/resources/static/app/basic/warehouse/views/warehouse-edit.html

@@ -26,7 +26,7 @@
 						<label class="select">
 						<select ng-model="warehouse.storehouseId" required ng-disabled="isNotEdit"
 							ng-options="store.storehouseId as store.storehouseName for store in storehouseList"
-							class="form-control">
+							class="form-control" ng-change="gethouse(warehouse.storehouseId)">
 								<option value="">--请选择--</option>
 						</select>
 						</label>

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

@@ -112,7 +112,7 @@
 										<section class="col col-4">
 											<label class="label">社会信用代码</label> 
 											<label class="input"> 
-												<input type="text" name="creditCode" ng-model="orgInfo.creditCode" maxlength="30">
+												<input type="text" name="creditCode" ng-model="orgInfo.creditCode" maxlength="30" required>
 											</label>
 										</section>
 										<section class="col col-4">