成品粮粮情和成品粮分仓保管账功能变更

src/main/resources/static/app/storage/grainCard/views/productGrain-add.html

@@ -206,6 +206,7 @@
                                                         <select name="ccfsName" ng-model="cerealsCard.ccfsName" required>
                                                             <option value="">--请选择--</option>
                                                             <option value="包装垛存">包装垛存</option>
+                                                            <option value="散存">包装垛存</option>
                                                             <option value="油罐">油罐</option>
                                                         </select><i></i>
                                                         <!--<select ng-model="cerealsCard.ccfsCode" name="ccfsCode"

src/main/resources/static/app/storage/product/controller/productCtrl.js

@@ -399,7 +399,7 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 						$scope.productEdit.productionDate = $filter('date')(item.realValue, "yyyy-MM-dd HH:mm:ss");
 					}
 				});
-				if ($scope.productEdit.storage == 1) {
+				if ($scope.productEdit.storage != 2) {
 					$("input[name='recordDateJJ']").each(function (j, item) {
 						if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
 							$scope.productEdit.recordDate = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
@@ -563,7 +563,7 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 			$scope.productEdit.levels = Number($scope.productEdit.levels);
 			$scope.productEdit.storehouseType = Number($scope.productEdit.storehouseType);
 			var nums = parseFloat($scope.productEdit.specifications);//规格
-			if($scope.productEdit.storage == "1"){//只有分件这样计算
+			if($scope.productEdit.storage != "2"){//只有分件这样计算
 				if($scope.productEdit.inventoryQuantity !== undefined && $scope.productEdit.inventoryQuantity !== ""){//入库
 					$scope.storage = ((parseFloat($scope.productEdit.inventoryQuantity)*1000) / (parseFloat(nums)*1000));
 				}

src/main/resources/static/app/storage/product/views/product-edit.html

@@ -188,6 +188,7 @@
 														<select name="storage" ng-model="productEdit.storage" required>
 															<option value="">--请选择--</option>
 															<option value="1">包装垛存</option>
+															<option value="3">散存</option>
 															<option value="2">油罐</option>
 														</select> <i></i>
 													</label>
@@ -224,19 +225,19 @@
 										</table>
 
 										<!--存储方式切换--><!--分件-->
-										<table ng-show="productEdit.storage==1" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
+										<table ng-show="productEdit.storage!=2" class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
 											<tr>
 												<th style="height:20px;" colspan="6"></th>
 											</tr>
 											<tr>
 												<th width='15%'>
-													<label class="label txt-bg-red">规格（吨）：<span style="color: red;">*</span></label>
+													<label class="label txt-bg-red">规格（吨）：</label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
 														<input type="text" name="specifications" ng-model="productEdit.specifications"
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " required/>
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' " />
 													</label>
 												</th>
 												<th width='15%'>
@@ -271,13 +272,13 @@
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">入库数量（吨）：</label>
+													<label class="label txt-bg-red">入库数量（吨）：<span style="color: red;">*</span></label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
 														<input type="text" name="storageQuantity" ng-model="productEdit.storageQuantity" ng-blur="calculate()" ng-readonly="rksl"
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
 													</label>
 												</th>
 												<th width='15%'>
@@ -302,13 +303,13 @@
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label txt-bg-red">出库数量（吨）：</label>
+													<label class="label txt-bg-red">出库数量（吨）：<span style="color: red;">*</span></label>
 												</th>
 												<th width='15%'>
 													<label class="input">
 														<i class="input"></i>
 														<input type="text" name="outboundQuantity" ng-model="productEdit.outboundQuantity" ng-blur="calculate()" ng-readonly="cksl"
-															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " />
+															   onkeyup="this.value=this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : '' " required />
 													</label>
 												</th>
 												<th width='15%'>