1

src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -1058,10 +1058,6 @@ angular.module('app.storage')
         		           )/100;
         		$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.00' : commonUtilService.checkJqos(zzzl, 2);
 
-        		//含量%
-            	var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);
-            	$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath1(hl);
-
             	//未熟粒%
             	var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);
             	$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
@@ -1082,8 +1078,8 @@ angular.module('app.storage')
             	var sml = parseFloat($scope.qualitycheck.mildewCount);
             	$scope.qualitycheck.mildewCount = $scope.getMath(sml);
 
-            	//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
-            	var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + 
+            	//不完善粒总量(含量%)=未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
+            	var bwslzl = (
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + 

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -1060,10 +1060,6 @@ angular.module('app.storage')
         		           )/100;
         		$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.00' : commonUtilService.checkJqos(zzzl, 2);
 
-        		//含量%
-            	var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);
-            	$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath1(hl);
-
             	//未熟粒%
             	var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);
             	$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
@@ -1084,8 +1080,8 @@ angular.module('app.storage')
             	var sml = parseFloat($scope.qualitycheck.mildewCount);
             	$scope.qualitycheck.mildewCount = $scope.getMath(sml);
 
-            	//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
-            	var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + 
+            	//不完善粒总量(含量%)=未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
+            	var bwslzl = (
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + 

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

@@ -1288,8 +1288,8 @@
 													            onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" ng-readonly="isNotEdit" />
 															</label>
 														</td>
-														<td rowspan="7" class="text-center" style="vertical-align: middle;">不完善粒</td>
-														<td class="text-center" colspan="2">总量</td>
+														<td rowspan="6" class="text-center" style="vertical-align: middle;">不完善粒</td>
+														<td class="text-center" colspan="2">含量%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
@@ -1304,12 +1304,20 @@
 															</label>
 														</td>
 														<!-- <td></td> -->
-														<td class="text-center" colspan="2">含量%</td>
+<!-- 														<td class="text-center" colspan="2">含量%</td> -->
+<!-- 														<td class="text-center" colspan="2"> -->
+<!-- 															<label class="input"> -->
+<!-- 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()" -->
+<!-- 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" -->
+<!-- 																 ng-readonly="isNotEdit"> -->
+<!-- 															</label> -->
+<!-- 														</td> -->
+                                                        <td class="text-center" colspan="2">未熟粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()"
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''"
-																 ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
+																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
+																ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1321,10 +1329,10 @@
 															</label>
 														</td>
 														<!-- <td></td> -->
-														<td class="text-center" colspan="2">未熟粒%</td>
+														<td class="text-center" colspan="2">虫蚀粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 																ng-readonly="isNotEdit">
 															</label>
@@ -1339,10 +1347,10 @@
 																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="true">
 															</label>
 														</td>
-														<td class="text-center" colspan="2">虫蚀粒%</td>
+														<td class="text-center" colspan="2">病斑粒</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 																ng-readonly="isNotEdit">
 															</label>
@@ -1357,10 +1365,10 @@
 																 ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td class="text-center" colspan="2">病斑粒</td>
+														<td class="text-center" colspan="2">糙米粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 																ng-readonly="isNotEdit">
 															</label>
@@ -1375,18 +1383,6 @@
 																ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td class="text-center" colspan="2">糙米粒%</td>
-														<td class="text-center" colspan="2">
-															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
-																ng-readonly="isNotEdit">
-															</label>
-														</td>
-													</tr>
-													<tr>
-														<td class="text-center" colspan="2"></td>
-														<td ></td>
 														<td class="text-center" colspan="2">生霉粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
@@ -2615,8 +2611,8 @@
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.water}}
 						</td>
-						<td rowspan="7" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
-						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">总量</td>
+						<td rowspan="6" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
+						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">含量%</td>
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.imperfectgrainsTotal}}
 						</td>
@@ -2626,9 +2622,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.avgLength}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">含量%</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsContent}}
+							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
 						</td>
 					</tr>
 					<tr>
@@ -2636,9 +2632,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.riceGrains}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
+							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
 						</td>
 					</tr>
 					<tr>
@@ -2647,9 +2643,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.brokenriceTotal}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
+							{{qualitycheckInspection.imperfectgrainsScab}}
 						</td>
 					</tr>
 					<tr>
@@ -2657,9 +2653,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.brokenriceBig}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsScab}}
+							{{qualitycheckInspection.imperfectgrainsBrownrice}}
 						</td>
 					</tr>
 					<tr>
@@ -2667,14 +2663,6 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.brokenriceSmall}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsBrownrice}}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2"></td>
-						<td ></td>
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">生霉粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.mildewCount}}

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

@@ -1316,8 +1316,8 @@
 													            onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" ng-readonly="isNotEdit" />
 															</label>
 														</td>
-														<td rowspan="7" class="text-center" style="vertical-align: middle;">不完善粒</td>
-														<td class="text-center" colspan="2">总量</td>
+														<td rowspan="6" class="text-center" style="vertical-align: middle;">不完善粒</td>
+														<td class="text-center" colspan="2">含量%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
@@ -1332,12 +1332,20 @@
 															</label>
 														</td>
 														<!-- <td></td> -->
-														<td class="text-center" colspan="2">含量%</td>
+<!-- 														<td class="text-center" colspan="2">含量%</td> -->
+<!-- 														<td class="text-center" colspan="2"> -->
+<!-- 															<label class="input"> -->
+<!-- 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()" -->
+<!-- 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" -->
+<!-- 																 ng-readonly="isNotEdit"> -->
+<!-- 															</label> -->
+<!-- 														</td> -->
+                                                        <td class="text-center" colspan="2">未熟粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()"
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''"
-																 ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
+																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
+																ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1349,10 +1357,10 @@
 															</label>
 														</td>
 														<!-- <td></td> -->
-														<td class="text-center" colspan="2">未熟粒%</td>
+														<td class="text-center" colspan="2">虫蚀粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 																ng-readonly="isNotEdit">
 															</label>
@@ -1367,10 +1375,10 @@
 																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="true">
 															</label>
 														</td>
-														<td class="text-center" colspan="2">虫蚀粒%</td>
+														<td class="text-center" colspan="2">病斑粒</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 																ng-readonly="isNotEdit">
 															</label>
@@ -1385,10 +1393,10 @@
 																 ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td class="text-center" colspan="2">病斑粒</td>
+														<td class="text-center" colspan="2">糙米粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 																ng-readonly="isNotEdit">
 															</label>
@@ -1403,18 +1411,6 @@
 																ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td class="text-center" colspan="2">糙米粒%</td>
-														<td class="text-center" colspan="2">
-															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
-																ng-readonly="isNotEdit">
-															</label>
-														</td>
-													</tr>
-													<tr>
-														<td class="text-center" colspan="2"></td>
-														<td ></td>
 														<td class="text-center" colspan="2">生霉粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
@@ -2640,8 +2636,8 @@
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.water}}
 						</td>
-						<td rowspan="7" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
-						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">总量</td>
+						<td rowspan="6" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
+						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">含量%</td>
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.imperfectgrainsTotal}}
 						</td>
@@ -2651,9 +2647,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.avgLength}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">含量%</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsContent}}
+							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
 						</td>
 					</tr>
 					<tr>
@@ -2661,9 +2657,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.riceGrains}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
+							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
 						</td>
 					</tr>
 					<tr>
@@ -2672,9 +2668,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.brokenriceTotal}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
+							{{qualitycheckInspection.imperfectgrainsScab}}
 						</td>
 					</tr>
 					<tr>
@@ -2682,9 +2678,9 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.brokenriceBig}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsScab}}
+							{{qualitycheckInspection.imperfectgrainsBrownrice}}
 						</td>
 					</tr>
 					<tr>
@@ -2692,14 +2688,6 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.brokenriceSmall}}
 						</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
-						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.imperfectgrainsBrownrice}}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2"></td>
-						<td ></td>
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">生霉粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.mildewCount}}