质检

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

@@ -921,6 +921,7 @@ angular.module('app.storage')
         		if($scope.qualitycheckInspection.impurityOrganic != null){
         			var organic = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
             		//organic = isNaN(organic) ? 0 : organic;
+        			organic = $scope.checkJqos(organic,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(organic);
         		}
         		if($scope.qualitycheckInspection.sieveResidue != null){
@@ -954,7 +955,22 @@ angular.module('app.storage')
             		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
         		}
         		
-        		var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
+        		if(black == null || black == undefined){
+        			black = 0;
+    			}
+    			if(gibberella == null || gibberella == undefined){
+    				gibberella = 0;
+    			}
+    			if(qtbl == null || qtbl == undefined){
+    				qtbl = 0;
+    			}
+    			if(black == 0 && gibberella == 0 && qtbl == 0){
+    				$scope.qualitycheckInspection.imperfectgrainsScabTotal = null;
+    			}else{
+            		var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
+            		bblzl = $scope.checkJqos(bblzl,1);
+        			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+    			}
         		//bblzl = isNaN(bblzl) ? 0 : bblzl;
         		//$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
         		
@@ -968,20 +984,73 @@ angular.module('app.storage')
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量
-        			var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
-        			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
-        			zzzl = $scope.checkJqos(zzzl,1);
-        			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			if(mineral == null || mineral == undefined){
+        				mineral = 0;
+        			}
+        			if(inorganic == null || inorganic == undefined){
+        				inorganic = 0;
+        			}
+        			if(organic == null || organic == undefined){
+        				organic = 0;
+        			}
+        			if(sieveResidue == null || sieveResidue == undefined){
+        				sieveResidue = 0;
+        			}
+        			
+        			if(mineral == 0 && inorganic == 0 && organic == 0 && sieveResidue == 0){
+        				$scope.qualitycheckInspection.impurityTotal = null;
+        			}else{
+        				var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
+            			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
+            			zzzl = $scope.checkJqos(zzzl,1);
+            			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			}
+        			
         			//病斑粒总量
-        			var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
-        			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
-        			bblzl = $scope.checkJqos(bblzl,1);
-        			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+        			if(black == null || black == undefined){
+        				black = 0;
+        			}
+        			if(gibberella == null || gibberella == undefined){
+        				gibberella = 0;
+        			}
+        			if(qtbl == null || qtbl == undefined){
+        				qtbl = 0;
+        			}
+        			if(black == 0 && gibberella == 0 && qtbl == 0){
+        				$scope.qualitycheckInspection.imperfectgrainsScabTotal = null;
+        			}else{
+        				var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
+            			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
+            			bblzl = $scope.checkJqos(bblzl,1);
+            			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
+        			}
+        			
         			//不完善粒总量
-        			var bwslzl = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;
-        			//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
-        			bwslzl = $scope.checkJqos(bwslzl,1);
-        			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			if(csl == null || csl == undefined){
+        				csl = 0;
+        			}
+        			if(psl == null || psl == undefined){
+        				psl = 0;
+        			}
+        			if(sml == null || sml == undefined){
+        				sml = 0;
+        			}
+        			if(bblzl == null || bblzl == undefined){
+        				bblzl = 0;
+        			}
+        			if(syl == null || syl == undefined){
+        				syl = 0;
+        			}
+        			
+        			if(csl == 0 && psl ==0 && sml == 0 && bblzl == 0 && syl == 0){
+        				$scope.qualitycheckInspection.imperfectgrainsTotal = null;
+        			}else{
+        				var bwslzl = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;
+            			//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
+            			bwslzl = $scope.checkJqos(bwslzl,1);
+            			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			}
+        			
         		}
         	} else if (pz=="3166") {
         		if($scope.qualitycheck.water != null){
@@ -1069,15 +1138,350 @@ angular.module('app.storage')
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
-        			var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
-        			zzzl = $scope.checkJqos(zzzl, 1);
-        			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			if(sieveResidue == null || sieveResidue == undefined){
+        				sieveResidue = 0;
+        			}
+        			if(yjzz == null || yjzz == undefined){
+        				yjzz = 0;
+        			}
+        			if(wjzz == null || wjzz == undefined){
+        				wjzz = 0;
+        			}
+        			if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
+        				$scope.qualitycheckInspection.impurityTotal = null;
+        			}else{
+        				var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
+            			zzzl = $scope.checkJqos(zzzl, 1);
+            			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			}
+        			
         			//zzzl.toFixed(1);
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
         			//不完善粒总量=未熟粒+虫蚀粒+病斑粒+生芽粒+生霉粒
-        			var bwslzl = ((parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
+        			if(wsl == null || wsl == undefined){
+        				wsl = 0;
+        			}
+        			if(csl == null || csl == undefined){
+        				csl = 0;
+        			}
+        			if(bbl == null || bbl == undefined){
+        				bbl = 0;
+        			}
+        			if(syl == null || syl == undefined){
+        				syl = 0;
+        			}
+        			if(sml == null || sml == undefined){
+        				sml = 0;
+        			}
+        			
+        			if(wsl == 0 && csl == 0 && bbl == 0 && syl == 0 && sml == 0){
+        				$scope.qualitycheckInspection.imperfectgrainsTotal = null;
+        			}else{
+        				var bwslzl = ((parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
+            			bwslzl = $scope.checkJqos(bwslzl, 1);
+            			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			}
+        			
+        		}
+        	}else if(pz=="3165"){
+
+        		if($scope.qualitycheck.water != null){
+        			var sf = parseFloat($scope.qualitycheck.water);//水分
+            		sf = $scope.checkJqos(sf,1);
+            		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		}
+        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
+        			yjzz = $scope.checkJqos(yjzz,2);
+            		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
+        		}
+        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
+            		wjzz = $scope.checkJqos(wjzz,2);
+            		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
+        		}
+        		if($scope.qualitycheckInspection.sieveResidue != null){
+        			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
+            		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
+            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
+            		//csl = isNaN(csl) ? 0 : csl;
+            		csl = $scope.checkJqos(csl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
+            		bbl = $scope.checkJqos(bbl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
+        			var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
+            		//psl = isNaN(psl) ? 0 : psl;
+            		psl = $scope.checkJqos(psl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
+        			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
+            		//syl = isNaN(syl) ? 0 : syl;
+            		syl = $scope.checkJqos(syl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
+        		}
+        		if($scope.qualitycheck.mildewCount != null){
+        			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
+            		//sml = isNaN(sml) ? 0 : sml;
+            		sml = $scope.checkJqos(sml,2);
+            		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
+        		}
+        		if($scope.qualitycheckInspection.mildew != null){
+        			var mbl = parseFloat($scope.qualitycheckInspection.mildew);//霉变粒%
+        			mbl = $scope.checkJqos(mbl,2);
+            		$scope.qualitycheckInspection.mildew = $scope.getMath(mbl);
+        		}
+        		if($scope.qualitycheckInspection.naturally != null){
+        			var zrrssl = parseFloat($scope.qualitycheckInspection.naturally);//自然热损伤粒%
+            		//sml = isNaN(sml) ? 0 : sml;
+        			zrrssl = $scope.checkJqos(zrrssl,2);
+            		$scope.qualitycheckInspection.naturally = $scope.getMath(zrrssl);
+        		}
+        		if($scope.qualitycheckInspection.stoving != null){
+        			var hgrssl = parseFloat($scope.qualitycheckInspection.stoving);//烘干热损伤粒%
+        			hgrssl = $scope.checkJqos(hgrssl,2);
+            		$scope.qualitycheckInspection.stoving = $scope.getMath(hgrssl);
+        		}
+        		
+        		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
+        			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
+        			if(sieveResidue == null || sieveResidue == undefined){
+        				sieveResidue = 0;
+        			}
+        			if(yjzz == null || yjzz == undefined){
+        				yjzz = 0;
+        			}
+        			if(wjzz == null || wjzz == undefined){
+        				wjzz = 0;
+        			}
+        			if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
+        				$scope.qualitycheckInspection.impurityTotal = null;
+        			}else{
+        				var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
+            			zzzl = $scope.checkJqos(zzzl, 1);
+            			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			}
+        			
+        			//zzzl.toFixed(1);
+        			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
+        			//不完善粒总量=虫蚀粒+病斑粒++破损粒+生芽粒+生霉粒
+        			if(csl == null || csl == undefined){
+        				csl = 0;
+        			}
+        			if(bbl == null || bbl == undefined){
+        				bbl = 0;
+        			}
+        			if(psl == null || psl == undefined){
+        				psl = 0;
+        			}
+        			if(syl == null || syl == undefined){
+        				syl = 0;
+        			}
+        			if(sml == null || sml == undefined){
+        				sml = 0;
+        			}
+        			
+        			if(csl == 0 && bbl == 0 && psl == 0 && syl == 0 && sml == 0){
+        				bwslzl = null;
+        				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
+        			}else{
+        				var bwslzl = ((parseFloat(psl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
+            			bwslzl = $scope.checkJqos(bwslzl, 1);
+            			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
+        			}
+        			//$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			
+        		}
+        	
+        	
+        	}else if(pz == "7107"){
+        		if($scope.qualitycheck.water != null){
+        			var sf = parseFloat($scope.qualitycheck.water);//水分
+            		sf = $scope.checkJqos(sf,1);
+            		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		}
+        		if($scope.qualitycheckInspection.avgLength != null){
+        			var pjcd = parseFloat($scope.qualitycheckInspection.avgLength);//平均长度
+        			pjcd = $scope.checkJqos(pjcd,2);
+            		$scope.qualitycheckInspection.avgLength = $scope.getMath(pjcd);
+        		}
+        		if($scope.qualitycheckInspection.riceGrains != null){
+        			var wzml = parseFloat($scope.qualitycheckInspection.riceGrains);//完整米粒
+        			wzml = $scope.checkJqos(wzml,2);
+            		$scope.qualitycheckInspection.riceGrains = $scope.getMath(wzml);
+        		}
+        		if($scope.qualitycheckInspection.brokenriceBig != null){
+        			var dsm = parseFloat($scope.qualitycheckInspection.brokenriceBig);//大碎米
+            		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
+        			dsm = $scope.checkJqos(dsm,2);
+            		$scope.qualitycheckInspection.brokenriceBig = $scope.getMath(dsm);
+        		}
+        		if($scope.qualitycheckInspection.brokenriceSmall != null){
+        			var xsm = parseFloat($scope.qualitycheckInspection.brokenriceSmall);//小碎米
+            		//csl = isNaN(csl) ? 0 : csl;
+        			xsm = $scope.checkJqos(xsm,2);
+            		$scope.qualitycheckInspection.brokenriceSmall = $scope.getMath(xsm);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsContent != null){
+        			var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);//含量
+            		//csl = isNaN(csl) ? 0 : csl;
+        			hl = $scope.checkJqos(hl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath(hl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
+        			var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
+            		wsl = $scope.checkJqos(wsl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
+            		csl = $scope.checkJqos(csl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
+            		bbl = $scope.checkJqos(bbl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsBrownrice != null){
+        			var cml = parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice);//糙米粒
+        			cml = $scope.checkJqos(cml,2);
+            		$scope.qualitycheckInspection.imperfectgrainsBrownrice = $scope.getMath(cml);
+        		}
+        		if($scope.qualitycheck.mildewCount != null){
+        			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
+            		//sml = isNaN(sml) ? 0 : sml;
+            		sml = $scope.checkJqos(sml,2);
+            		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
+        		}
+        		if($scope.qualitycheckInspection.machiningaccuracyEssence != null){
+        			var jn = parseFloat($scope.qualitycheckInspection.machiningaccuracyEssence);//精碾
+            		//sml = isNaN(sml) ? 0 : sml;
+        			jn = $scope.checkJqos(jn,2);
+            		$scope.qualitycheckInspection.machiningaccuracyEssence = $scope.getMath(jn);
+        		}
+        		if($scope.qualitycheckInspection.machiningaccuracySuitable != null){
+        			var sn = parseFloat($scope.qualitycheckInspection.machiningaccuracySuitable);//适碾
+            		//sml = isNaN(sml) ? 0 : sml;
+        			sn = $scope.checkJqos(sn,2);
+            		$scope.qualitycheckInspection.machiningaccuracySuitable = $scope.getMath(sn);
+        		}
+        		if($scope.qualitycheckInspection.yellowRice != null){
+        			var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
+            		hlm = $scope.checkJqos(hlm, 1);
+            		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
+        		}
+        		if($scope.qualitycheck.intermixingRate != null){
+        			var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
+            		hhl = $scope.checkJqos(hhl, 1);
+            		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
+        		}
+        		if($scope.qualitycheckInspection.impurityBranPowder != null){
+        			var kf = parseFloat($scope.qualitycheckInspection.impurityBranPowder);//糠粉
+        			kf = $scope.checkJqos(kf, 2);
+            		$scope.qualitycheckInspection.impurityBranPowder = $scope.getMath1(kf);
+        		}
+        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
+            		yjzz = $scope.checkJqos(yjzz,2);
+            		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
+        		}
+        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
+            		wjzz = $scope.checkJqos(wjzz,2);
+            		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
+        		}
+        		if($scope.qualitycheckInspection.chalkiness != null){
+        			var ebd = parseFloat($scope.qualitycheckInspection.chalkiness);//垩白度
+        			ebd = $scope.checkJqos(ebd,2);
+            		$scope.qualitycheckInspection.chalkiness = $scope.getMath(ebd);
+        		}
+        		if($scope.qualitycheckInspection.amylose != null){
+        			var zldfhl = parseFloat($scope.qualitycheckInspection.amylose);//直链淀粉含量
+        			zldfhl = $scope.checkJqos(zldfhl,2);
+            		$scope.qualitycheckInspection.amylose = $scope.getMath(zldfhl);
+        		}
+        		
+        		//杂质总量=糠粉+有机杂质+无机杂质，四舍五入，保留一位小数
+    			if(kf == null || kf == undefined){
+    				kf = 0;
+    			}
+    			if(yjzz == null || yjzz == undefined){
+    				yjzz = 0;
+    			}
+    			if(wjzz == null || wjzz == undefined){
+    				wjzz = 0;
+    			}
+    			if(kf == 0 && yjzz == 0 && wjzz == 0){
+    				$scope.qualitycheckInspection.impurityTotal = null;
+    			}else{
+    				var zzzl = ((parseFloat(kf)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
+        			zzzl = $scope.checkJqos(zzzl, 1);
+        			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+    			}
+    			
+    			//zzzl.toFixed(1);
+    			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
+    			//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
+    			if(hl == null || hl == undefined){
+    				hl = 0;
+    			}
+    			if(wsl == null || wsl == undefined){
+    				wsl = 0;
+    			}
+    			if(csl == null || csl == undefined){
+    				csl = 0;
+    			}
+    			if(bbl == null || bbl == undefined){
+    				bbl = 0;
+    			}
+    			if(cml == null || cml == undefined){
+    				cml = 0;
+    			}
+    			if(sml == null || sml == undefined){
+    				sml = 0;
+    			}
+    			
+    			if(hl == 0 && wsl == 0 && csl == 0 && bbl == 0 && cml == 0 && sml == 0){
+    				bwslzl = null;
+    				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
+    			}else{
+    				var bwslzl = ((parseFloat(hl)*100) + (parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(cml)*100) + (parseFloat(sml)*100))/100;
+        			bwslzl = $scope.checkJqos(bwslzl, 1);
+        			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
+    			}
+    			
+    			
+    			//碎米 = 大碎米 + 小碎米；
+    			if(dsm == null || dsm == undefined){
+    				dsm = 0;
+    			}
+    			if(xsm == null || xsm == undefined){
+    				xsm = 0;
+    			}
+    			
+    			if(xsm == 0 && dsm == 0){
+    				bwslzl = null;
+    				$scope.qualitycheckInspection.brokenriceTotal = bwslzl;
+    			}else{
+    				var bwslzl = ((parseFloat(dsm)*100) + (parseFloat(xsm)*100))/100;
         			bwslzl = $scope.checkJqos(bwslzl, 1);
-        			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			$scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(bwslzl);
+    			}
+        	}else if(pz == "7051" || pz == "7038"){
+        		if($scope.qualitycheck.water != null){
+        			var sf = parseFloat($scope.qualitycheck.water);//水分
+            		sf = $scope.checkJqos(sf,1);
+            		$scope.qualitycheck.water = $scope.getMath1(sf);
         		}
         	}
         };

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

@@ -945,6 +945,7 @@ angular.module('app.storage')
         		if($scope.qualitycheckInspection.impurityOrganic != null){
         			var organic = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
             		//organic = isNaN(organic) ? 0 : organic;
+        			organic = $scope.checkJqos(organic,2);
             		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(organic);
         		}
         		if($scope.qualitycheckInspection.sieveResidue != null){
@@ -992,16 +993,52 @@ angular.module('app.storage')
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量
+        			if(mineral == null || mineral == undefined){
+        				mineral = 0;
+        			}
+        			if(inorganic == null || inorganic == undefined){
+        				inorganic = 0;
+        			}
+        			if(organic == null || organic == undefined){
+        				organic = 0;
+        			}
+        			if(sieveResidue == null || sieveResidue == undefined){
+        				sieveResidue = 0;
+        			}
         			var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
         			zzzl = $scope.checkJqos(zzzl,1);
         			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
         			//病斑粒总量
+        			if(black == null || black == undefined){
+        				black = 0;
+        			}
+        			if(gibberella == null || gibberella == undefined){
+        				gibberella = 0;
+        			}
+        			if(qtbl == null || qtbl == undefined){
+        				qtbl = 0;
+        			}
         			var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
         			//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
         			bblzl = $scope.checkJqos(bblzl,1);
         			$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
         			//不完善粒总量
+        			if(csl == null || csl == undefined){
+        				csl = 0;
+        			}
+        			if(psl == null || psl == undefined){
+        				psl = 0;
+        			}
+        			if(sml == null || sml == undefined){
+        				sml = 0;
+        			}
+        			if(bblzl == null || bblzl == undefined){
+        				bblzl = 0;
+        			}
+        			if(syl == null || syl == undefined){
+        				syl = 0;
+        			}
         			var bwslzl = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;
         			//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
         			bwslzl = $scope.checkJqos(bwslzl,1);
@@ -1093,16 +1130,345 @@ angular.module('app.storage')
         		
         		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
         			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
+        			if(sieveResidue == null || sieveResidue == undefined){
+        				sieveResidue = 0;
+        			}
+        			if(yjzz == null || yjzz == undefined){
+        				yjzz = 0;
+        			}
+        			if(wjzz == null || wjzz == undefined){
+        				wjzz = 0;
+        			}
+        			
         			var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
         			zzzl = $scope.checkJqos(zzzl, 1);
         			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
         			//zzzl.toFixed(1);
         			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
         			//不完善粒总量=未熟粒+虫蚀粒+病斑粒+生芽粒+生霉粒
+        			if(wsl == null || wsl == undefined){
+        				wsl = 0;
+        			}
+        			if(csl == null || csl == undefined){
+        				csl = 0;
+        			}
+        			if(bbl == null || bbl == undefined){
+        				bbl = 0;
+        			}
+        			if(syl == null || syl == undefined){
+        				syl = 0;
+        			}
+        			if(sml == null || sml == undefined){
+        				sml = 0;
+        			}
         			var bwslzl = ((parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
         			bwslzl = $scope.checkJqos(bwslzl, 1);
         			$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
         		}
+        	}else if(pz=="3165"){
+
+
+        		if($scope.qualitycheck.water != null){
+        			var sf = parseFloat($scope.qualitycheck.water);//水分
+            		sf = $scope.checkJqos(sf,1);
+            		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		}
+        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
+        			yjzz = $scope.checkJqos(yjzz,2);
+            		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
+        		}
+        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
+            		wjzz = $scope.checkJqos(wjzz,2);
+            		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
+        		}
+        		if($scope.qualitycheckInspection.sieveResidue != null){
+        			var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
+            		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
+            		sieveResidue = $scope.checkJqos(sieveResidue,2);
+            		$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
+            		//csl = isNaN(csl) ? 0 : csl;
+            		csl = $scope.checkJqos(csl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
+            		bbl = $scope.checkJqos(bbl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
+        			var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
+            		//psl = isNaN(psl) ? 0 : psl;
+            		psl = $scope.checkJqos(psl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
+        			var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
+            		//syl = isNaN(syl) ? 0 : syl;
+            		syl = $scope.checkJqos(syl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
+        		}
+        		if($scope.qualitycheck.mildewCount != null){
+        			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
+            		//sml = isNaN(sml) ? 0 : sml;
+            		sml = $scope.checkJqos(sml,2);
+            		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
+        		}
+        		if($scope.qualitycheckInspection.mildew != null){
+        			var mbl = parseFloat($scope.qualitycheckInspection.mildew);//霉变粒%
+        			mbl = $scope.checkJqos(mbl,2);
+            		$scope.qualitycheckInspection.mildew = $scope.getMath(mbl);
+        		}
+        		if($scope.qualitycheckInspection.naturally != null){
+        			var zrrssl = parseFloat($scope.qualitycheckInspection.naturally);//自然热损伤粒%
+            		//sml = isNaN(sml) ? 0 : sml;
+        			zrrssl = $scope.checkJqos(zrrssl,2);
+            		$scope.qualitycheckInspection.naturally = $scope.getMath(zrrssl);
+        		}
+        		if($scope.qualitycheckInspection.stoving != null){
+        			var hgrssl = parseFloat($scope.qualitycheckInspection.stoving);//烘干热损伤粒%
+        			hgrssl = $scope.checkJqos(hgrssl,2);
+            		$scope.qualitycheckInspection.stoving = $scope.getMath(hgrssl);
+        		}
+        		
+        		if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
+        			//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
+        			if(sieveResidue == null || sieveResidue == undefined){
+        				sieveResidue = 0;
+        			}
+        			if(yjzz == null || yjzz == undefined){
+        				yjzz = 0;
+        			}
+        			if(wjzz == null || wjzz == undefined){
+        				wjzz = 0;
+        			}
+        			if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
+        				$scope.qualitycheckInspection.impurityTotal = null;
+        			}else{
+        				var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
+            			zzzl = $scope.checkJqos(zzzl, 1);
+            			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+        			}
+        			
+        			//zzzl.toFixed(1);
+        			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
+        			//不完善粒总量=虫蚀粒+病斑粒++破损粒+生芽粒+生霉粒
+        			if(csl == null || csl == undefined){
+        				csl = 0;
+        			}
+        			if(bbl == null || bbl == undefined){
+        				bbl = 0;
+        			}
+        			if(psl == null || psl == undefined){
+        				psl = 0;
+        			}
+        			if(syl == null || syl == undefined){
+        				syl = 0;
+        			}
+        			if(sml == null || sml == undefined){
+        				sml = 0;
+        			}
+        			
+        			if(csl == 0 && bbl == 0 && psl == 0 && syl == 0 && sml == 0){
+        				bwslzl = null;
+        				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
+        			}else{
+        				var bwslzl = ((parseFloat(psl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
+            			bwslzl = $scope.checkJqos(bwslzl, 1);
+            			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
+        			}
+        			//$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
+        			
+        		}
+        	
+        	
+        	
+        	}else if(pz == "7107"){
+
+        		if($scope.qualitycheck.water != null){
+        			var sf = parseFloat($scope.qualitycheck.water);//水分
+            		sf = $scope.checkJqos(sf,1);
+            		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		}
+        		if($scope.qualitycheckInspection.avgLength != null){
+        			var pjcd = parseFloat($scope.qualitycheckInspection.avgLength);//平均长度
+        			pjcd = $scope.checkJqos(pjcd,2);
+            		$scope.qualitycheckInspection.avgLength = $scope.getMath(pjcd);
+        		}
+        		if($scope.qualitycheckInspection.riceGrains != null){
+        			var wzml = parseFloat($scope.qualitycheckInspection.riceGrains);//完整米粒
+        			wzml = $scope.checkJqos(wzml,2);
+            		$scope.qualitycheckInspection.riceGrains = $scope.getMath(wzml);
+        		}
+        		if($scope.qualitycheckInspection.brokenriceBig != null){
+        			var dsm = parseFloat($scope.qualitycheckInspection.brokenriceBig);//大碎米
+            		//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
+        			dsm = $scope.checkJqos(dsm,2);
+            		$scope.qualitycheckInspection.brokenriceBig = $scope.getMath(dsm);
+        		}
+        		if($scope.qualitycheckInspection.brokenriceSmall != null){
+        			var xsm = parseFloat($scope.qualitycheckInspection.brokenriceSmall);//小碎米
+            		//csl = isNaN(csl) ? 0 : csl;
+        			xsm = $scope.checkJqos(xsm,2);
+            		$scope.qualitycheckInspection.brokenriceSmall = $scope.getMath(xsm);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsContent != null){
+        			var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);//含量
+            		//csl = isNaN(csl) ? 0 : csl;
+        			hl = $scope.checkJqos(hl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath(hl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
+        			var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
+            		wsl = $scope.checkJqos(wsl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
+        			var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
+            		csl = $scope.checkJqos(csl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsScab != null){
+        			var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
+            		bbl = $scope.checkJqos(bbl,2);
+            		$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
+        		}
+        		if($scope.qualitycheckInspection.imperfectgrainsBrownrice != null){
+        			var cml = parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice);//糙米粒
+        			cml = $scope.checkJqos(cml,2);
+            		$scope.qualitycheckInspection.imperfectgrainsBrownrice = $scope.getMath(cml);
+        		}
+        		if($scope.qualitycheck.mildewCount != null){
+        			var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
+            		//sml = isNaN(sml) ? 0 : sml;
+            		sml = $scope.checkJqos(sml,2);
+            		$scope.qualitycheck.mildewCount = $scope.getMath(sml);
+        		}
+        		if($scope.qualitycheckInspection.machiningaccuracyEssence != null){
+        			var jn = parseFloat($scope.qualitycheckInspection.machiningaccuracyEssence);//精碾
+            		//sml = isNaN(sml) ? 0 : sml;
+        			jn = $scope.checkJqos(jn,2);
+            		$scope.qualitycheckInspection.machiningaccuracyEssence = $scope.getMath(jn);
+        		}
+        		if($scope.qualitycheckInspection.machiningaccuracySuitable != null){
+        			var sn = parseFloat($scope.qualitycheckInspection.machiningaccuracySuitable);//适碾
+            		//sml = isNaN(sml) ? 0 : sml;
+        			sn = $scope.checkJqos(sn,2);
+            		$scope.qualitycheckInspection.machiningaccuracySuitable = $scope.getMath(sn);
+        		}
+        		if($scope.qualitycheckInspection.yellowRice != null){
+        			var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
+            		hlm = $scope.checkJqos(hlm, 1);
+            		$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
+        		}
+        		if($scope.qualitycheck.intermixingRate != null){
+        			var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
+            		hhl = $scope.checkJqos(hhl, 1);
+            		$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
+        		}
+        		if($scope.qualitycheckInspection.impurityBranPowder != null){
+        			var kf = parseFloat($scope.qualitycheckInspection.impurityBranPowder);//糠粉
+        			kf = $scope.checkJqos(kf, 2);
+            		$scope.qualitycheckInspection.impurityBranPowder = $scope.getMath1(kf);
+        		}
+        		if($scope.qualitycheckInspection.impurityOrganic != null){
+        			var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
+            		yjzz = $scope.checkJqos(yjzz,2);
+            		$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
+        		}
+        		if($scope.qualitycheckInspection.impurityInorganic != null){
+        			var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
+            		wjzz = $scope.checkJqos(wjzz,2);
+            		$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
+        		}
+        		if($scope.qualitycheckInspection.chalkiness != null){
+        			var ebd = parseFloat($scope.qualitycheckInspection.chalkiness);//垩白度
+        			ebd = $scope.checkJqos(ebd,2);
+            		$scope.qualitycheckInspection.chalkiness = $scope.getMath(ebd);
+        		}
+        		if($scope.qualitycheckInspection.amylose != null){
+        			var zldfhl = parseFloat($scope.qualitycheckInspection.amylose);//直链淀粉含量
+        			zldfhl = $scope.checkJqos(zldfhl,2);
+            		$scope.qualitycheckInspection.amylose = $scope.getMath(zldfhl);
+        		}
+        		
+        		//杂质总量=糠粉+有机杂质+无机杂质，四舍五入，保留一位小数
+    			if(kf == null || kf == undefined){
+    				kf = 0;
+    			}
+    			if(yjzz == null || yjzz == undefined){
+    				yjzz = 0;
+    			}
+    			if(wjzz == null || wjzz == undefined){
+    				wjzz = 0;
+    			}
+    			if(kf == 0 && yjzz == 0 && wjzz == 0){
+    				$scope.qualitycheckInspection.impurityTotal = null;
+    			}else{
+    				var zzzl = ((parseFloat(kf)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
+        			zzzl = $scope.checkJqos(zzzl, 1);
+        			$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
+    			}
+    			
+    			//zzzl.toFixed(1);
+    			//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
+    			//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
+    			if(hl == null || hl == undefined){
+    				hl = 0;
+    			}
+    			if(wsl == null || wsl == undefined){
+    				wsl = 0;
+    			}
+    			if(csl == null || csl == undefined){
+    				csl = 0;
+    			}
+    			if(bbl == null || bbl == undefined){
+    				bbl = 0;
+    			}
+    			if(cml == null || cml == undefined){
+    				cml = 0;
+    			}
+    			if(sml == null || sml == undefined){
+    				sml = 0;
+    			}
+    			
+    			if(hl == 0 && wsl == 0 && csl == 0 && bbl == 0 && cml == 0 && sml == 0){
+    				bwslzl = null;
+    				$scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
+    			}else{
+    				var bwslzl = ((parseFloat(hl)*100) + (parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(cml)*100) + (parseFloat(sml)*100))/100;
+        			bwslzl = $scope.checkJqos(bwslzl, 1);
+        			$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
+    			}
+    			
+    			
+    			//碎米 = 大碎米 + 小碎米；
+    			if(dsm == null || dsm == undefined){
+    				dsm = 0;
+    			}
+    			if(xsm == null || xsm == undefined){
+    				xsm = 0;
+    			}
+    			
+    			if(xsm == 0 && dsm == 0){
+    				bwslzl = null;
+    				$scope.qualitycheckInspection.brokenriceTotal = bwslzl;
+    			}else{
+    				var bwslzl = ((parseFloat(dsm)*100) + (parseFloat(xsm)*100))/100;
+        			bwslzl = $scope.checkJqos(bwslzl, 1);
+        			$scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(bwslzl);
+    			}
+        	
+        	}else if(pz == "7051" || pz == "7038"){
+        		if($scope.qualitycheck.water != null){
+        			var sf = parseFloat($scope.qualitycheck.water);//水分
+            		sf = $scope.checkJqos(sf,1);
+            		$scope.qualitycheck.water = $scope.getMath1(sf);
+        		}
         	}
         };
 

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

@@ -278,7 +278,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">样品数量：</label>
+													<label class="label">样品数量(kg)：</label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.ypsl" ng-readonly="isNotEdit"
 															   name="ypsl"  placeholder="样品数量" validNumber="true">
@@ -287,7 +287,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">代表数量：</label>
+													<label class="label">代表数量(kg)：</label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.dbsl" ng-readonly="isNotEdit"
 															   name="dbsl"  placeholder="代表数量" validNumber="true">
@@ -342,7 +342,7 @@
 														<td class="text-center" colspan="2">总量</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -365,7 +365,7 @@
 														<td>总量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td rowspan="3" class="text-center" style="vertical-align: middle;">病斑粒</td>
@@ -495,7 +495,7 @@
 														<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="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -519,7 +519,7 @@
 														<td>总量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">病斑粒</td>
@@ -645,7 +645,7 @@
 														<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="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -699,7 +699,7 @@
 														<td>总量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 
@@ -804,7 +804,7 @@
 														<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="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -843,7 +843,7 @@
 														<td>总量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">病斑粒</td>
@@ -1139,7 +1139,7 @@
 														<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="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -1263,7 +1263,7 @@
 														<td class="text-center">总量</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td class="text-center" colspan="3">垩白度%</td>

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

@@ -211,7 +211,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">样品数量：<span style="color: red;">*</span></label>
+													<label class="label">样品数量(kg)：<span style="color: red;">*</span></label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.ypsl" ng-readonly="isNotEdit"
 															   name="ypsl"  placeholder="样品数量" validNumber="true" required />
@@ -220,7 +220,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">代表数量：<span style="color: red;">*</span></label>
+													<label class="label">代表数量(kg)：<span style="color: red;">*</span></label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.dbsl" ng-readonly="isNotEdit"
 															   name="dbsl"  placeholder="代表数量" validNumber="true" required />
@@ -403,11 +403,11 @@
 																<input type="text" ng-model="qualitycheck.water" name="water" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td rowspan="9" class="text-center" style="vertical-align: middle;">不完善粒</td>
+														<td rowspan="10" class="text-center" style="vertical-align: middle;">不完善粒</td>
 														<td class="text-center" colspan="2">总量</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -430,7 +430,7 @@
 														<td>总量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-disabled="isShow">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td rowspan="4" class="text-center" style="vertical-align: middle;">病斑粒</td>
@@ -518,22 +518,33 @@
 														</td>
 													</tr>
 													<tr>
-														<td colspan="2" class="text-center">
+														<td colspan="2" class="text-center">色泽、气味</td>
+														<td class="text-center">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.inputOne" name="inputOne" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.colorSmell" name="colorSmell" ng-readonly="isNotEdit"  ng-blur="zjzl()">
 															</label>
 														</td>
-														<td>
+														<td colspan="2" class="text-center">生芽粒%</td>
+														<td colspan="2" class="text-center">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-blur="zjzl()" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel"  ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td colspan="2" class="text-center">生芽粒%</td>
+													</tr>
+													<tr>
 														<td colspan="2" class="text-center">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel"  ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.inputOne" name="inputOne" ng-readonly="isNotEdit">
+															</label>
+														</td>
+														<td>
+															<label class="input">
+																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
+														<td colspan="2" class="text-center"></td>
+														<td colspan="2" class="text-center"></td>
+													
 													</tr>
 												</table>
 											</div>
@@ -582,14 +593,14 @@
 														<td class="text-center" colspan="2">水分%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.water" name="water" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.water" name="water" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td rowspan="8" class="text-center" style="vertical-align: middle;">不完善粒</td>
+														<td rowspan="9" 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="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" ng-blur="zjzl()" name="imperfectgrainsTotal" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -604,7 +615,7 @@
 														<td class="text-center" colspan="2">虫蚀粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -613,13 +624,13 @@
 														<td>总量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">病斑粒</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" name="imperfectgrainsScab" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -627,13 +638,13 @@
 														<td>有机杂质%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityOrganic" name="impurityOrganic" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityOrganic" ng-blur="zjzl()" name="impurityOrganic" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">破损粒%</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsDamage" name="imperfectgrainsDamage" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsDamage" ng-blur="zjzl()" name="imperfectgrainsDamage" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -641,13 +652,13 @@
 														<td>无机杂质%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityInorganic" name="impurityInorganic" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityInorganic" ng-blur="zjzl()" name="impurityInorganic" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">生芽粒%</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsSproutedkernel" ng-blur="zjzl()" name="imperfectgrainsSproutedkernel" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -655,13 +666,13 @@
 														<td>筛下物%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.sieveResidue" name="impurityInorganic" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.sieveResidue" ng-blur="zjzl()" name="impurityInorganic" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">生霉粒%</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.mildewCount" ng-blur="zjzl()" name="mildewCount" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -669,14 +680,28 @@
 														<td class="text-center" colspan="2">霉变粒%</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.mildew" name="mildew" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.mildew" name="mildew" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td rowspan="2" class="text-center" style="vertical-align: middle;">热损伤粒%</td>
 														<td class="text-center">自然热损伤粒</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.naturally" name="naturally" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.naturally" name="naturally" ng-blur="zjzl()" ng-readonly="isNotEdit">
+															</label>
+														</td>
+													</tr>
+													<tr>
+														<td colspan="2" class="text-center">色泽、气味</td>
+														<td>
+															<label class="input">
+																<input type="text" ng-model="qualitycheckInspection.colorSmell" name="colorSmell" ng-readonly="isNotEdit">
+															</label>
+														</td>
+														<td class="text-center">烘干热损伤粒</td>
+														<td colspan="2" >
+															<label class="input">
+																<input type="text" ng-model="qualitycheckInspection.stoving" name="stoving"  ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -691,12 +716,8 @@
 																<input type="text" ng-model="qualitycheckInspection.inputTwo" name="inputTwo" ng-readonly="isNotEdit">
 															</label>
 														</td>
-														<td class="text-center">烘干热损伤粒</td>
-														<td colspan="2" >
-															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.stoving" name="stoving" ng-readonly="isNotEdit">
-															</label>
-														</td>
+														<td colspan="2"></td>
+														<td></td>
 													</tr>
 												</table>
 											</div>
@@ -752,12 +773,12 @@
 													<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="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-readonly="true">
 														</label>
 													</td>
 												</tr>
 												<tr>
-													<td class="text-center" colspan="2">完整粒率%)</td>
+													<td class="text-center" colspan="2">完整粒率%</td>
 													<td>
 														<label class="input">
 															<input type="text" ng-model="qualitycheck.goodpart" name="goodpart" ng-readonly="isNotEdit">
@@ -806,7 +827,7 @@
 													<td>总量%</td>
 													<td>
 														<label class="input">
-															<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+															<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="true">
 														</label>
 													</td>
 
@@ -865,6 +886,16 @@
 														</label>
 													</td>
 												</tr>
+												<tr>
+													<td class="text-center" colspan="2">色泽、气味</td>
+													<td>
+														<label class="input">
+															<input type="text" ng-model="qualitycheckInspection.colorSmell" name="colorSmell" ng-readonly="isNotEdit">
+														</label>
+													</td>
+													<td colspan="3"></td>
+													<td colspan="2"></td>
+												</tr>
 											</table>
 										</div>
 									</fieldset>
@@ -1043,6 +1074,16 @@
 															</label>
 														</td>
 													</tr>
+													<tr>
+														<td colspan="2" class="text-center">色泽、气味</td>
+														<td>
+															<label class="input">
+																<input type="text" ng-model="qualitycheckInspection.colorSmell" name="colorSmell"  ng-readonly="isNotEdit">
+															</label>
+														</td>
+														<td colspan="3" class="text-center"></td>
+														<td colspan="2" class="text-center"></td>
+													</tr>
 												</table>
 											</div>
 										</fieldset>
@@ -1089,13 +1130,13 @@
 														<td class="text-center" colspan="2">气味、滋味</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.smelltaste" name="smelltaste" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.smelltaste" name="smelltaste" ng-readonly="isNotEdit" >
 															</label>
 														</td>
 														<td class="text-center" colspan="2">水分及挥发物含量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.waterVolatiles" name="waterVolatiles" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.waterVolatiles" name="waterVolatiles" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1103,13 +1144,13 @@
 														<td class="text-center" colspan="2">不溶性杂质含量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.insolubleImpurity" name="insolubleImpurity" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.insolubleImpurity" name="insolubleImpurity" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">酸价（KOH）/(mg/g)</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.acidValue" name="acidValue" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.acidValue" name="acidValue" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1117,13 +1158,13 @@
 														<td class="text-center" colspan="2">过氧化值（mmol/kg）</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.peroxideValue" name="peroxideValue" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.peroxideValue" name="peroxideValue" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">溶剂残留量（mg/kg）</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.residualSolvent" name="residualSolvent" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.residualSolvent" name="residualSolvent" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1176,7 +1217,7 @@
 														<td class="text-center" colspan="2">水分及挥发物含量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.waterVolatiles" name="waterVolatiles" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.waterVolatiles" name="waterVolatiles" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1184,13 +1225,13 @@
 														<td class="text-center" colspan="2">不溶性杂质含量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.insolubleImpurity" name="insolubleImpurity" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.insolubleImpurity" name="insolubleImpurity" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">酸价（KOH）/(mg/g)</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.acidValue" name="acidValue" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.acidValue" name="acidValue" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1198,13 +1239,13 @@
 														<td class="text-center" colspan="2">过氧化值（mmol/kg）</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.peroxideValue" name="peroxideValue" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.peroxideValue" name="peroxideValue" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">溶剂残留量（mg/kg）</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.residualSolvent" name="residualSolvent" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.residualSolvent" name="residualSolvent" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1212,7 +1253,7 @@
 														<td class="text-center" colspan="2">含皂量%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.soapContent" name="soapContent" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.soapContent" name="soapContent" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">加热实验（280℃）</td>
@@ -1260,7 +1301,8 @@
 									</div>
 									
 									<!-- 大米 -->
-									<div ng-if="qualitycheck.subType==7107">
+								  <div ng-if="qualitycheck.subType==7107">
+									<div>
 										<header>质量指标</header>
 										<fieldset>
 											<div class="col-xs-15 col-sm-15">
@@ -1269,14 +1311,14 @@
 														<td class="text-center" colspan="2">水分%</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.water" name="water" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.water" name="water" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td rowspan="7" 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="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsTotal" name="imperfectgrainsTotal" ng-blur="zjzl()" ng-readonly="true">
 															</label>
 														</td>
 													</tr>
@@ -1284,14 +1326,14 @@
 														<td class="text-center" colspan="2">平均长度</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.avgLength" name="avgLength" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.avgLength" name="avgLength" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<!-- <td></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="avgLength" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsContent" name="avgLength" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1299,14 +1341,14 @@
 														<td class="text-center" colspan="2">完整米粒</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.riceGrains" name="riceGrains" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.riceGrains" name="riceGrains" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<!-- <td></td> -->
 														<td class="text-center" colspan="2">未熟粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" name="imperfectgrainsImmaturegrain" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsImmaturegrain" ng-blur="zjzl()" name="imperfectgrainsImmaturegrain" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1316,13 +1358,13 @@
 														<td class="text-center">总量</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" name="brokenriceTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.brokenriceTotal" ng-blur="zjzl()" name="brokenriceTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td class="text-center" colspan="2">虫蚀粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" ng-blur="zjzl()" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1330,13 +1372,13 @@
 														<td class="text-center">大碎米</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.brokenriceBig" name="brokenriceBig" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.brokenriceBig" ng-blur="zjzl()" name="brokenriceBig" 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.imperfectgrainsScab" name="imperfectgrainsScab" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsScab" ng-blur="zjzl()" name="imperfectgrainsScab" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1344,13 +1386,13 @@
 														<td class="text-center">小碎米</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.brokenriceSmall" name="brokenriceSmall" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.brokenriceSmall" ng-blur="zjzl()" name="brokenriceSmall" 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" name="imperfectgrainsBrownrice" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsBrownrice" ng-blur="zjzl()" name="imperfectgrainsBrownrice" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1360,7 +1402,7 @@
 														<td class="text-center" colspan="2">生霉粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.mildewCount" name="mildewCount" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1370,13 +1412,13 @@
 														<td class="text-center">精碾</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.machiningaccuracyEssence" name="machiningaccuracyEssence" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.machiningaccuracyEssence" ng-blur="zjzl()" name="machiningaccuracyEssence" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="3">黄粒米%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.yellowRice" name="yellowRice" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.yellowRice" ng-blur="zjzl()" name="yellowRice" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1384,13 +1426,13 @@
 														<td class="text-center">适碾</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.machiningaccuracySuitable" name="machiningaccuracySuitable" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.machiningaccuracySuitable" ng-blur="zjzl()" name="machiningaccuracySuitable" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="3">互混率%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.intermixingRate" name="intermixingRate" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.intermixingRate" name="intermixingRate" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1400,13 +1442,13 @@
 														<td class="text-center">总量</td>
 														<td>
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityTotal" name="impurityTotal" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityTotal" ng-blur="zjzl()" name="impurityTotal" ng-readonly="true">
 															</label>
 														</td>
 														<td class="text-center" colspan="3">垩白度%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.chalkiness" name="chalkiness" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.chalkiness" name="chalkiness" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1414,13 +1456,13 @@
 														<td class="text-center">糠粉%</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityBranPowder" name="impurityBranPowder" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityBranPowder" ng-blur="zjzl()" name="impurityBranPowder" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="3">直链淀粉含量%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.amylose" name="amylose" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.amylose" name="amylose" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>
@@ -1428,7 +1470,7 @@
 														<td class="text-center">有机杂质%</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityOrganic" name="impurityOrganic" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityOrganic" ng-blur="zjzl()" name="impurityOrganic" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="3"></td>
@@ -1438,7 +1480,7 @@
 														<td class="text-center">无机杂质%</td>
 														<td >
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.impurityInorganic" name="impurityInorganic" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.impurityInorganic" ng-blur="zjzl()" name="impurityInorganic" ng-readonly="isNotEdit">
 															</label>
 														</td>
 														<td class="text-center" colspan="3">
@@ -1452,6 +1494,16 @@
 															</label>
 														</td>
 													</tr>
+													<tr>
+														<td class="text-center" colspan="2">色泽、气味</td>
+														<td >
+															<label class="input">
+																<input type="text" ng-model="qualitycheckInspection.colorSmell"  name="colorSmell" ng-readonly="isNotEdit">
+															</label>
+														</td>
+														<td class="text-center" colspan="3"></td>
+														<td class="text-center" colspan="2"></td>
+													</tr>
 												</table>
 											</div>
 										</fieldset>
@@ -1478,7 +1530,7 @@
 											</div>
 										</fieldset>
 									</div>
-
+						</div>
 									<!-- 小麦粉7038和混合小麦粉7051 -->
 									<div ng-if="qualitycheck.subType==7051 || qualitycheck.subType==7038">
 										<header>质量指标</header>
@@ -1489,13 +1541,13 @@
 														<td class="text-center" colspan="2">水分%</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheck.water" name="water" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheck.water" name="water" ng-blur="zjzl()" 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.siltContent" name="siltContent" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.siltContent" name="siltContent" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 													</tr>
@@ -1517,7 +1569,7 @@
 														<td class="text-center" colspan="2">灰分%（以干物计）</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.ashContent" name="ashContent" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.ashContent" name="ashContent" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">脂肪酸值（以湿基计）</td>
@@ -1531,7 +1583,7 @@
 														<td class="text-center" colspan="2">粗细度%</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.coarseness" name="coarseness" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.coarseness" name="coarseness" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">气味、口味</td>
@@ -1545,7 +1597,7 @@
 														<td class="text-center" colspan="2">面筋质%（以湿重计）</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.gluten" name="gluten" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.gluten" name="gluten" ng-readonly="isNotEdit" validNumber=true>
 															</label>
 														</td>
 														<td class="text-center" colspan="2">
@@ -1886,7 +1938,7 @@
 						<td style="width: 20%;vertical-align: middle;text-align: center;color: #888;">
 							{{qualitycheck.water}}
 						</td>
-						<td rowspan="9" style="vertical-align: middle;text-align: center;width:10%;">不完善粒</td>
+						<td rowspan="10" style="vertical-align: middle;text-align: center;width:10%;">不完善粒</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;width:20%;">总量</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;width:20%;color: #888;">
 							{{qualitycheckInspection.imperfectgrainsTotal}}
@@ -1965,17 +2017,25 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">
-							{{qualitycheckInspection.inputOne}}
-						</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">色泽、气味</td>
 						<td style="vertical-align: middle;text-align: center;color: #888;">
-							{{qualitycheckInspection.inputTwo}}
+						  {{qualitycheckInspection.colorSmell}}
 						</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;">生霉粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;color: #888;">
 							{{qualitycheck.mildewCount}}
 						</td>
 					</tr>
+					<tr>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">
+							{{qualitycheckInspection.inputOne}}
+						</td>
+						<td style="vertical-align: middle;text-align: center;color: #888;">
+							{{qualitycheckInspection.inputTwo}}
+						</td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;"></td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;color: #888;"></td>
+					</tr>
 					<tr ng-if="qualitycheckInspection.inputThree != null">
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">
 							{{qualitycheckInspection.inputThree}}
@@ -2020,7 +2080,7 @@
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.water}}
 						</td>
-						<td rowspan="8" style="vertical-align: middle;text-align: center;width:10%;">不完善粒</td>
+						<td rowspan="9" style="vertical-align: middle;text-align: center;width:10%;">不完善粒</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;width:20%;">总量</td>
 						<td colspan="2" style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.imperfectgrainsTotal}}
@@ -2037,7 +2097,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td rowspan="3" style="vertical-align: middle;text-align: center;">杂质</td>
+						<td rowspan="4" style="vertical-align: middle;text-align: center;">杂质</td>
 						<td style="height:30px;vertical-align: middle;text-align: center;">总量%</td>
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.impurityTotal}}
@@ -2068,9 +2128,9 @@
 						</td>
 					</tr>
 					<tr>
-						<td ccolspan="2" style="height:30px;vertical-align: middle;text-align: center;">霉变粒%</td>
+						<td style="height:30px;vertical-align: middle;text-align: center;">筛下物%</td>
 						<td style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.mildew}}
+							{{qualitycheckInspection.sieveResidue}}
 						</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;">生霉粒%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
@@ -2078,8 +2138,10 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;"></td>
-						<td></td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">霉变粒%</td>
+						<td style="vertical-align: middle;text-align: center; color:#888;">
+							{{qualitycheckInspection.mildew}}
+						</td>
 						<td rowspan="2" style="vertical-align: middle;text-align: center;">热损伤粒%</td>
 						<td style="height:30px;vertical-align: middle;text-align: center;">自然热损伤粒</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
@@ -2087,21 +2149,22 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" class="text-center"></td>
-						<td></td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">色泽、气味</td>
+						<td>{{qualitycheckInspection.colorSmell}}</td>
 						<td style="height:30px;vertical-align: middle;text-align: center;">烘干热损伤粒</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.stoving}}
 						</td>
+						
 					</tr>
 					<tr>
-						<td colspan="2" class="text-center">
+						<td colspan="2"  style="height:30px;vertical-align: middle;text-align: center;">
 							{{qualitycheckInspection.inputOne}}
 						</td>
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.inputTwo}}
 						</td>
-						<td colspan="3" class="text-center">
+						<td colspan="2"  style="height:30px;vertical-align: middle;text-align: center;">
 							{{qualitycheckInspection.inputThree}}
 						</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
@@ -2223,6 +2286,16 @@
 							{{qualitycheckInspection.inputTwo}}
 						</td>
 					</tr>
+					<tr>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">色泽、气味</td>
+						<td style="vertical-align: middle;text-align: center; color:#888;">
+							{{qualitycheckInspection.colorSmell}}
+						</td>
+						<td colspan="3" style="vertical-align: middle;text-align: center;"></td>
+						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;"></td>
+							
+						
+					</tr>
 					<tr ng-if="qualitycheckInspection.inputThree != null">
 						<td colspan="2" class="text-center">
 							{{qualitycheckInspection.inputThree}}
@@ -2347,6 +2420,15 @@
 							{{qualitycheckInspection.inputTwo}}
 						</td>
 					</tr>
+					<tr>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">色泽、气味</td>
+						<td style="vertical-align: middle;text-align: center; color:#888;">
+							{{qualitycheckInspection.colorSmell}}
+						</td>
+						<td colspan="3" style="vertical-align: middle;text-align: center;"></td>
+						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;"></td>
+						
+					</tr>
 					<tr ng-if="qualitycheckInspection.inputThree != null">
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">
 							{{qualitycheckInspection.inputThree}}
@@ -2526,8 +2608,9 @@
 
 		<div ng-if="qualitycheck.subType==7107">
 			<div class="col-xs-15 col-sm-15">
-				<table class="table table-striped  table-bordered table-hover" style="border-collapse:collapse;border:none;" border="1" width="100%">
-					<tr colspan="8">
+			<table class="table table-striped  table-bordered table-hover" bordercolor="#999999" style="border-style:solid;border-collapse:collapse;" border="1" width="100%">
+<!-- 				<table class="table table-striped  table-bordered table-hover" style="border-collapse:collapse;border:none;" border="1" width="100%">
+ -->					<tr colspan="8">
 						<td colspan="2" style="height:30px;width:20%;vertical-align: middle;text-align: center;">水分%</td>
 						<td style="width:20%;vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.water}}
@@ -2613,7 +2696,7 @@
 						<td style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.machiningaccuracySuitable}}
 						</td>
-						<td ccolspan="3" style="vertical-align: middle;text-align: center;">互混率%</td>
+						<td colspan="3" style="vertical-align: middle;text-align: center;">互混率%</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheck.intermixingRate}}
 						</td>
@@ -2659,6 +2742,14 @@
 							{{qualitycheckInspection.inputTwo}}
 						</td>
 					</tr>
+					<tr>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">色泽、气味</td>
+						<td style="vertical-align: middle;text-align: center; color:#888;">
+							{{qualitycheckInspection.colorSmell}}
+						</td>
+						<td colspan="3" style="vertical-align: middle;text-align: center;"></td>
+						<td colspan="2" style="vertical-align: middle;text-align: center;"></td>
+					</tr>
 					<tr ng-if="qualitycheckInspection.inputThree != null">
 						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">
 							{{qualitycheckInspection.inputThree}}

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

@@ -211,7 +211,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">样品数量：<span style="color: red;">*</span></label>
+													<label class="label">样品数量(kg)：<span style="color: red;">*</span></label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.ypsl" ng-readonly="isNotEdit"
 															   name="ypsl"  placeholder="样品数量" validNumber="true" required />
@@ -220,7 +220,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">代表数量：<span style="color: red;">*</span></label>
+													<label class="label">代表数量(kg)：<span style="color: red;">*</span></label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.dbsl" ng-readonly="isNotEdit"
 															   name="dbsl"  placeholder="代表数量" validNumber="true" required />

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

@@ -200,7 +200,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">样品数量：<span style="color: red;">*</span></label>
+													<label class="label">样品数量(kg)：<span style="color: red;">*</span></label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.ypsl" ng-readonly="isNotEdit"
 															   name="ypsl"  placeholder="样品数量" validNumber="true" required />
@@ -209,7 +209,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">代表数量：<span style="color: red;">*</span></label>
+													<label class="label">代表数量(kg)：<span style="color: red;">*</span></label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.dbsl" ng-readonly="isNotEdit"
 															   name="dbsl"  placeholder="代表数量" validNumber="true" required />

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

@@ -340,7 +340,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">样品数量：</label>
+													<label class="label">样品数量(kg)：</label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.ypsl" ng-readonly="isNotEdit"
 															   name="ypsl"  placeholder="样品数量" validNumber="true">
@@ -349,7 +349,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="select">
-													<label class="label">代表数量：</label>
+													<label class="label">代表数量(kg)：</label>
 													<label class="input">
 														<input type="text" ng-model="qualitycheck.dbsl" ng-readonly="isNotEdit"
 															   name="dbsl"  placeholder="代表数量" validNumber="true">
@@ -596,7 +596,7 @@
 														<td class="text-center" colspan="2">虫蚀粒%</td>
 														<td class="text-center" colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" name="imperfectgrainsInjuredkernel" ng-readonly="isNotEdit">
+																<input type="text" ng-model="qualitycheckInspection.imperfectgrainsInjuredkernel" name="imperfectgrainsInjuredkernel" ng-blur="zjzl()" ng-readonly="isNotEdit">
 															</label>
 														</td>
 													</tr>