fanxw 1 vuosi sitten
vanhempi
commit
52e2eabe80

+ 2 - 6
src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -1058,10 +1058,6 @@ angular.module('app.storage')
1058
         		           )/100;
1058
         		           )/100;
1059
         		$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.00' : commonUtilService.checkJqos(zzzl, 2);
1059
         		$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.00' : commonUtilService.checkJqos(zzzl, 2);
1060
 
1060
 
1061
-        		//含量%
1062
-            	var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);
1063
-            	$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath1(hl);
1064
-
1065
             	//未熟粒%
1061
             	//未熟粒%
1066
             	var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);
1062
             	var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);
1067
             	$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
1063
             	$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
@@ -1082,8 +1078,8 @@ angular.module('app.storage')
1082
             	var sml = parseFloat($scope.qualitycheck.mildewCount);
1078
             	var sml = parseFloat($scope.qualitycheck.mildewCount);
1083
             	$scope.qualitycheck.mildewCount = $scope.getMath(sml);
1079
             	$scope.qualitycheck.mildewCount = $scope.getMath(sml);
1084
 
1080
 
1085
-            	//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
1086
-            	var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + 
1081
+            	//不完善粒总量(含量%)=未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
1082
+            	var bwslzl = (
1087
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
1083
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
1088
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
1084
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
1089
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + 
1085
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + 

+ 2 - 6
src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -1060,10 +1060,6 @@ angular.module('app.storage')
1060
         		           )/100;
1060
         		           )/100;
1061
         		$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.00' : commonUtilService.checkJqos(zzzl, 2);
1061
         		$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.00' : commonUtilService.checkJqos(zzzl, 2);
1062
 
1062
 
1063
-        		//含量%
1064
-            	var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);
1065
-            	$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath1(hl);
1066
-
1067
             	//未熟粒%
1063
             	//未熟粒%
1068
             	var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);
1064
             	var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);
1069
             	$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
1065
             	$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
@@ -1084,8 +1080,8 @@ angular.module('app.storage')
1084
             	var sml = parseFloat($scope.qualitycheck.mildewCount);
1080
             	var sml = parseFloat($scope.qualitycheck.mildewCount);
1085
             	$scope.qualitycheck.mildewCount = $scope.getMath(sml);
1081
             	$scope.qualitycheck.mildewCount = $scope.getMath(sml);
1086
 
1082
 
1087
-            	//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
1088
-            	var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + 
1083
+            	//不完善粒总量(含量%)=未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
1084
+            	var bwslzl = (
1089
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
1085
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
1090
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
1086
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + 
1091
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + 
1087
 					      (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + 

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

@@ -1288,8 +1288,8 @@
1288
 													            onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" ng-readonly="isNotEdit" />
1288
 													            onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" ng-readonly="isNotEdit" />
1289
 															</label>
1289
 															</label>
1290
 														</td>
1290
 														</td>
1291
-														<td rowspan="7" class="text-center" style="vertical-align: middle;">不完善粒</td>
1292
-														<td class="text-center" colspan="2">总量</td>
1291
+														<td rowspan="6" class="text-center" style="vertical-align: middle;">不完善粒</td>
1292
+														<td class="text-center" colspan="2">含量%</td>
1293
 														<td class="text-center" colspan="2">
1293
 														<td class="text-center" colspan="2">
1294
 															<label class="input">
1294
 															<label class="input">
1295
 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
1295
 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
@@ -1304,12 +1304,20 @@
1304
 															</label>
1304
 															</label>
1305
 														</td>
1305
 														</td>
1306
 														<!-- <td></td> -->
1306
 														<!-- <td></td> -->
1307
-														<td class="text-center" colspan="2">含量%</td>
1307
+<!-- 														<td class="text-center" colspan="2">含量%</td> -->
1308
+<!-- 														<td class="text-center" colspan="2"> -->
1309
+<!-- 															<label class="input"> -->
1310
+<!-- 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()" -->
1311
+<!-- 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" -->
1312
+<!-- 																 ng-readonly="isNotEdit"> -->
1313
+<!-- 															</label> -->
1314
+<!-- 														</td> -->
1315
+                                                        <td class="text-center" colspan="2">未熟粒%</td>
1308
 														<td class="text-center" colspan="2">
1316
 														<td class="text-center" colspan="2">
1309
 															<label class="input">
1317
 															<label class="input">
1310
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()"
1311
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''"
1312
-																 ng-readonly="isNotEdit">
1318
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
1319
+																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1320
+																ng-readonly="isNotEdit">
1313
 															</label>
1321
 															</label>
1314
 														</td>
1322
 														</td>
1315
 													</tr>
1323
 													</tr>
@@ -1321,10 +1329,10 @@
1321
 															</label>
1329
 															</label>
1322
 														</td>
1330
 														</td>
1323
 														<!-- <td></td> -->
1331
 														<!-- <td></td> -->
1324
-														<td class="text-center" colspan="2">未熟粒%</td>
1332
+														<td class="text-center" colspan="2">虫蚀粒%</td>
1325
 														<td class="text-center" colspan="2">
1333
 														<td class="text-center" colspan="2">
1326
 															<label class="input">
1334
 															<label class="input">
1327
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
1335
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
1328
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1336
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1329
 																ng-readonly="isNotEdit">
1337
 																ng-readonly="isNotEdit">
1330
 															</label>
1338
 															</label>
@@ -1339,10 +1347,10 @@
1339
 																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="true">
1347
 																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="true">
1340
 															</label>
1348
 															</label>
1341
 														</td>
1349
 														</td>
1342
-														<td class="text-center" colspan="2">虫蚀粒%</td>
1350
+														<td class="text-center" colspan="2">病斑粒</td>
1343
 														<td class="text-center" colspan="2">
1351
 														<td class="text-center" colspan="2">
1344
 															<label class="input">
1352
 															<label class="input">
1345
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
1353
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
1346
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1354
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1347
 																ng-readonly="isNotEdit">
1355
 																ng-readonly="isNotEdit">
1348
 															</label>
1356
 															</label>
@@ -1357,10 +1365,10 @@
1357
 																 ng-readonly="isNotEdit">
1365
 																 ng-readonly="isNotEdit">
1358
 															</label>
1366
 															</label>
1359
 														</td>
1367
 														</td>
1360
-														<td class="text-center" colspan="2">病斑粒</td>
1368
+														<td class="text-center" colspan="2">糙米粒%</td>
1361
 														<td class="text-center" colspan="2">
1369
 														<td class="text-center" colspan="2">
1362
 															<label class="input">
1370
 															<label class="input">
1363
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
1371
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
1364
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1372
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1365
 																ng-readonly="isNotEdit">
1373
 																ng-readonly="isNotEdit">
1366
 															</label>
1374
 															</label>
@@ -1375,18 +1383,6 @@
1375
 																ng-readonly="isNotEdit">
1383
 																ng-readonly="isNotEdit">
1376
 															</label>
1384
 															</label>
1377
 														</td>
1385
 														</td>
1378
-														<td class="text-center" colspan="2">糙米粒%</td>
1379
-														<td class="text-center" colspan="2">
1380
-															<label class="input">
1381
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
1382
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1383
-																ng-readonly="isNotEdit">
1384
-															</label>
1385
-														</td>
1386
-													</tr>
1387
-													<tr>
1388
-														<td class="text-center" colspan="2"></td>
1389
-														<td ></td>
1390
 														<td class="text-center" colspan="2">生霉粒%</td>
1386
 														<td class="text-center" colspan="2">生霉粒%</td>
1391
 														<td class="text-center" colspan="2">
1387
 														<td class="text-center" colspan="2">
1392
 															<label class="input">
1388
 															<label class="input">
@@ -2615,8 +2611,8 @@
2615
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2611
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2616
 							{{qualitycheck.water}}
2612
 							{{qualitycheck.water}}
2617
 						</td>
2613
 						</td>
2618
-						<td rowspan="7" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
2619
-						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">总量</td>
2614
+						<td rowspan="6" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
2615
+						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">含量%</td>
2620
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2616
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2621
 							{{qualitycheckInspection.imperfectgrainsTotal}}
2617
 							{{qualitycheckInspection.imperfectgrainsTotal}}
2622
 						</td>
2618
 						</td>
@@ -2626,9 +2622,9 @@
2626
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2622
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2627
 							{{qualitycheckInspection.avgLength}}
2623
 							{{qualitycheckInspection.avgLength}}
2628
 						</td>
2624
 						</td>
2629
-						<td colspan="2" style="vertical-align: middle;text-align: center;">含量%</td>
2625
+						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
2630
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2626
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2631
-							{{qualitycheckInspection.imperfectgrainsContent}}
2627
+							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
2632
 						</td>
2628
 						</td>
2633
 					</tr>
2629
 					</tr>
2634
 					<tr>
2630
 					<tr>
@@ -2636,9 +2632,9 @@
2636
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2632
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2637
 							{{qualitycheckInspection.riceGrains}}
2633
 							{{qualitycheckInspection.riceGrains}}
2638
 						</td>
2634
 						</td>
2639
-						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
2635
+						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
2640
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2636
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2641
-							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
2637
+							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
2642
 						</td>
2638
 						</td>
2643
 					</tr>
2639
 					</tr>
2644
 					<tr>
2640
 					<tr>
@@ -2647,9 +2643,9 @@
2647
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2643
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2648
 							{{qualitycheckInspection.brokenriceTotal}}
2644
 							{{qualitycheckInspection.brokenriceTotal}}
2649
 						</td>
2645
 						</td>
2650
-						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
2646
+						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
2651
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2647
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2652
-							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
2648
+							{{qualitycheckInspection.imperfectgrainsScab}}
2653
 						</td>
2649
 						</td>
2654
 					</tr>
2650
 					</tr>
2655
 					<tr>
2651
 					<tr>
@@ -2657,9 +2653,9 @@
2657
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2653
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2658
 							{{qualitycheckInspection.brokenriceBig}}
2654
 							{{qualitycheckInspection.brokenriceBig}}
2659
 						</td>
2655
 						</td>
2660
-						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
2656
+						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
2661
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2657
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2662
-							{{qualitycheckInspection.imperfectgrainsScab}}
2658
+							{{qualitycheckInspection.imperfectgrainsBrownrice}}
2663
 						</td>
2659
 						</td>
2664
 					</tr>
2660
 					</tr>
2665
 					<tr>
2661
 					<tr>
@@ -2667,14 +2663,6 @@
2667
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2663
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2668
 							{{qualitycheckInspection.brokenriceSmall}}
2664
 							{{qualitycheckInspection.brokenriceSmall}}
2669
 						</td>
2665
 						</td>
2670
-						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
2671
-						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2672
-							{{qualitycheckInspection.imperfectgrainsBrownrice}}
2673
-						</td>
2674
-					</tr>
2675
-					<tr>
2676
-						<td colspan="2"></td>
2677
-						<td ></td>
2678
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">生霉粒%</td>
2666
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">生霉粒%</td>
2679
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2667
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2680
 							{{qualitycheck.mildewCount}}
2668
 							{{qualitycheck.mildewCount}}

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

@@ -1316,8 +1316,8 @@
1316
 													            onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" ng-readonly="isNotEdit" />
1316
 													            onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" ng-readonly="isNotEdit" />
1317
 															</label>
1317
 															</label>
1318
 														</td>
1318
 														</td>
1319
-														<td rowspan="7" class="text-center" style="vertical-align: middle;">不完善粒</td>
1320
-														<td class="text-center" colspan="2">总量</td>
1319
+														<td rowspan="6" class="text-center" style="vertical-align: middle;">不完善粒</td>
1320
+														<td class="text-center" colspan="2">含量%</td>
1321
 														<td class="text-center" colspan="2">
1321
 														<td class="text-center" colspan="2">
1322
 															<label class="input">
1322
 															<label class="input">
1323
 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
1323
 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
@@ -1332,12 +1332,20 @@
1332
 															</label>
1332
 															</label>
1333
 														</td>
1333
 														</td>
1334
 														<!-- <td></td> -->
1334
 														<!-- <td></td> -->
1335
-														<td class="text-center" colspan="2">含量%</td>
1335
+<!-- 														<td class="text-center" colspan="2">含量%</td> -->
1336
+<!-- 														<td class="text-center" colspan="2"> -->
1337
+<!-- 															<label class="input"> -->
1338
+<!-- 																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()" -->
1339
+<!-- 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''" -->
1340
+<!-- 																 ng-readonly="isNotEdit"> -->
1341
+<!-- 															</label> -->
1342
+<!-- 														</td> -->
1343
+                                                        <td class="text-center" colspan="2">未熟粒%</td>
1336
 														<td class="text-center" colspan="2">
1344
 														<td class="text-center" colspan="2">
1337
 															<label class="input">
1345
 															<label class="input">
1338
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="imperfectgrainsContent" ng-blur="zjzl()"
1339
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,1})?/) ? this.value.match(/\d+(\.\d{0,1})?/)[0] : ''"
1340
-																 ng-readonly="isNotEdit">
1346
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
1347
+																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1348
+																ng-readonly="isNotEdit">
1341
 															</label>
1349
 															</label>
1342
 														</td>
1350
 														</td>
1343
 													</tr>
1351
 													</tr>
@@ -1349,10 +1357,10 @@
1349
 															</label>
1357
 															</label>
1350
 														</td>
1358
 														</td>
1351
 														<!-- <td></td> -->
1359
 														<!-- <td></td> -->
1352
-														<td class="text-center" colspan="2">未熟粒%</td>
1360
+														<td class="text-center" colspan="2">虫蚀粒%</td>
1353
 														<td class="text-center" colspan="2">
1361
 														<td class="text-center" colspan="2">
1354
 															<label class="input">
1362
 															<label class="input">
1355
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" 
1363
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
1356
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1364
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1357
 																ng-readonly="isNotEdit">
1365
 																ng-readonly="isNotEdit">
1358
 															</label>
1366
 															</label>
@@ -1367,10 +1375,10 @@
1367
 																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="true">
1375
 																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="true">
1368
 															</label>
1376
 															</label>
1369
 														</td>
1377
 														</td>
1370
-														<td class="text-center" colspan="2">虫蚀粒%</td>
1378
+														<td class="text-center" colspan="2">病斑粒</td>
1371
 														<td class="text-center" colspan="2">
1379
 														<td class="text-center" colspan="2">
1372
 															<label class="input">
1380
 															<label class="input">
1373
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" 
1381
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
1374
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1382
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1375
 																ng-readonly="isNotEdit">
1383
 																ng-readonly="isNotEdit">
1376
 															</label>
1384
 															</label>
@@ -1385,10 +1393,10 @@
1385
 																 ng-readonly="isNotEdit">
1393
 																 ng-readonly="isNotEdit">
1386
 															</label>
1394
 															</label>
1387
 														</td>
1395
 														</td>
1388
-														<td class="text-center" colspan="2">病斑粒</td>
1396
+														<td class="text-center" colspan="2">糙米粒%</td>
1389
 														<td class="text-center" colspan="2">
1397
 														<td class="text-center" colspan="2">
1390
 															<label class="input">
1398
 															<label class="input">
1391
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" 
1399
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
1392
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1400
 																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1393
 																ng-readonly="isNotEdit">
1401
 																ng-readonly="isNotEdit">
1394
 															</label>
1402
 															</label>
@@ -1403,18 +1411,6 @@
1403
 																ng-readonly="isNotEdit">
1411
 																ng-readonly="isNotEdit">
1404
 															</label>
1412
 															</label>
1405
 														</td>
1413
 														</td>
1406
-														<td class="text-center" colspan="2">糙米粒%</td>
1407
-														<td class="text-center" colspan="2">
1408
-															<label class="input">
1409
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" 
1410
-																onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1411
-																ng-readonly="isNotEdit">
1412
-															</label>
1413
-														</td>
1414
-													</tr>
1415
-													<tr>
1416
-														<td class="text-center" colspan="2"></td>
1417
-														<td ></td>
1418
 														<td class="text-center" colspan="2">生霉粒%</td>
1414
 														<td class="text-center" colspan="2">生霉粒%</td>
1419
 														<td class="text-center" colspan="2">
1415
 														<td class="text-center" colspan="2">
1420
 															<label class="input">
1416
 															<label class="input">
@@ -2640,8 +2636,8 @@
2640
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2636
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2641
 							{{qualitycheck.water}}
2637
 							{{qualitycheck.water}}
2642
 						</td>
2638
 						</td>
2643
-						<td rowspan="7" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
2644
-						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">总量</td>
2639
+						<td rowspan="6" style="width:10%;vertical-align: middle;text-align: center;">不完善粒</td>
2640
+						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center;">含量%</td>
2645
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2641
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
2646
 							{{qualitycheckInspection.imperfectgrainsTotal}}
2642
 							{{qualitycheckInspection.imperfectgrainsTotal}}
2647
 						</td>
2643
 						</td>
@@ -2651,9 +2647,9 @@
2651
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2647
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2652
 							{{qualitycheckInspection.avgLength}}
2648
 							{{qualitycheckInspection.avgLength}}
2653
 						</td>
2649
 						</td>
2654
-						<td colspan="2" style="vertical-align: middle;text-align: center;">含量%</td>
2650
+						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
2655
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2651
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2656
-							{{qualitycheckInspection.imperfectgrainsContent}}
2652
+							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
2657
 						</td>
2653
 						</td>
2658
 					</tr>
2654
 					</tr>
2659
 					<tr>
2655
 					<tr>
@@ -2661,9 +2657,9 @@
2661
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2657
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2662
 							{{qualitycheckInspection.riceGrains}}
2658
 							{{qualitycheckInspection.riceGrains}}
2663
 						</td>
2659
 						</td>
2664
-						<td colspan="2" style="vertical-align: middle;text-align: center;">未熟粒%</td>
2660
+						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
2665
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2661
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2666
-							{{qualitycheckInspection.imperfectgrainsImmaturegrain}}
2662
+							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
2667
 						</td>
2663
 						</td>
2668
 					</tr>
2664
 					</tr>
2669
 					<tr>
2665
 					<tr>
@@ -2672,9 +2668,9 @@
2672
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2668
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2673
 							{{qualitycheckInspection.brokenriceTotal}}
2669
 							{{qualitycheckInspection.brokenriceTotal}}
2674
 						</td>
2670
 						</td>
2675
-						<td colspan="2" style="vertical-align: middle;text-align: center;">虫蚀粒%</td>
2671
+						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
2676
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2672
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2677
-							{{qualitycheckInspection.imperfectgrainsInjuredkernel}}
2673
+							{{qualitycheckInspection.imperfectgrainsScab}}
2678
 						</td>
2674
 						</td>
2679
 					</tr>
2675
 					</tr>
2680
 					<tr>
2676
 					<tr>
@@ -2682,9 +2678,9 @@
2682
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2678
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2683
 							{{qualitycheckInspection.brokenriceBig}}
2679
 							{{qualitycheckInspection.brokenriceBig}}
2684
 						</td>
2680
 						</td>
2685
-						<td colspan="2" style="vertical-align: middle;text-align: center;">病斑粒</td>
2681
+						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
2686
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2682
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2687
-							{{qualitycheckInspection.imperfectgrainsScab}}
2683
+							{{qualitycheckInspection.imperfectgrainsBrownrice}}
2688
 						</td>
2684
 						</td>
2689
 					</tr>
2685
 					</tr>
2690
 					<tr>
2686
 					<tr>
@@ -2692,14 +2688,6 @@
2692
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2688
 						<td style="vertical-align: middle;text-align: center; color:#888;">
2693
 							{{qualitycheckInspection.brokenriceSmall}}
2689
 							{{qualitycheckInspection.brokenriceSmall}}
2694
 						</td>
2690
 						</td>
2695
-						<td colspan="2" style="vertical-align: middle;text-align: center;">糙米粒%</td>
2696
-						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2697
-							{{qualitycheckInspection.imperfectgrainsBrownrice}}
2698
-						</td>
2699
-					</tr>
2700
-					<tr>
2701
-						<td colspan="2"></td>
2702
-						<td ></td>
2703
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">生霉粒%</td>
2691
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">生霉粒%</td>
2704
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2692
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
2705
 							{{qualitycheck.mildewCount}}
2693
 							{{qualitycheck.mildewCount}}