|
|
@@ -782,7 +782,7 @@ angular.module('app.storage')
|
|
782
|
782
|
|
|
783
|
783
|
$scope.getMath = function(v) {
|
|
784
|
784
|
if (isNaN(v) || v == "") {
|
|
785
|
|
- v = 0.00;
|
|
|
785
|
+ v = "0.00";
|
|
786
|
786
|
} else {
|
|
787
|
787
|
v = Math.round(v*100)/100;
|
|
788
|
788
|
v = v.toString();
|
|
|
@@ -797,7 +797,7 @@ angular.module('app.storage')
|
|
797
|
797
|
}
|
|
798
|
798
|
$scope.getMath1 = function(v) {
|
|
799
|
799
|
if (isNaN(v) || v == "") {
|
|
800
|
|
- v = 0.0;
|
|
|
800
|
+ v = "0.0";
|
|
801
|
801
|
} else {
|
|
802
|
802
|
v = Math.round(v*10)/10;
|
|
803
|
803
|
v = v.toString();
|
|
|
@@ -873,616 +873,518 @@ angular.module('app.storage')
|
|
873
|
873
|
$scope.zjzl = function() {
|
|
874
|
874
|
var pz = $scope.qualitycheck.subType;
|
|
875
|
875
|
if (pz=="3164") {
|
|
876
|
|
- if($scope.qualitycheck.water != null){
|
|
|
876
|
+
|
|
877
|
877
|
var sf = parseFloat($scope.qualitycheck.water);//水分
|
|
878
|
|
- sf = $scope.checkJqos(sf,1);
|
|
|
878
|
+ //sf = $scope.checkJqos(sf,1);
|
|
879
|
879
|
$scope.qualitycheck.water = $scope.getMath1(sf);
|
|
880
|
|
- }
|
|
|
880
|
+
|
|
881
|
881
|
/*if($scope.qualitycheckInspection.unitWeight != null){
|
|
882
|
882
|
var rz = parseFloat($scope.qualitycheckInspection.unitWeight);//容重
|
|
883
|
883
|
rz = $scope.checkJqos(rz,1);
|
|
884
|
884
|
$scope.qualitycheckInspection.unitWeight = $scope.getMath1(rz);
|
|
885
|
885
|
}*/
|
|
886
|
|
- if($scope.qualitycheck.hardIndex != null){
|
|
|
886
|
+
|
|
887
|
887
|
var xmydzs = parseFloat($scope.qualitycheck.hardIndex);//小麦硬度指数
|
|
888
|
|
- xmydzs = $scope.checkJqos(xmydzs,1);
|
|
|
888
|
+ //xmydzs = $scope.checkJqos(xmydzs,1);
|
|
889
|
889
|
$scope.qualitycheck.hardIndex = $scope.getMath1(xmydzs);
|
|
890
|
|
- }
|
|
891
|
|
- if($scope.qualitycheck.mineral != null){
|
|
|
890
|
+
|
|
|
891
|
+
|
|
892
|
892
|
var mineral = parseFloat($scope.qualitycheck.mineral);//矿物质
|
|
893
|
|
- mineral = $scope.checkJqos(mineral,2);
|
|
|
893
|
+ //mineral = $scope.checkJqos(mineral,2);
|
|
894
|
894
|
//mineral = isNaN(mineral) ? 0.00 : mineral;
|
|
895
|
895
|
$scope.qualitycheck.mineral = $scope.getMath(mineral);
|
|
896
|
|
- }
|
|
897
|
|
- if($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo != null){
|
|
|
896
|
+
|
|
|
897
|
+
|
|
898
|
898
|
var black = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo);//黒胚粒
|
|
899
|
|
- black = $scope.checkJqos(black,2);
|
|
|
899
|
+ //black = $scope.checkJqos(black,2);
|
|
900
|
900
|
//black = isNaN(black) ? 0 : black;
|
|
901
|
901
|
$scope.qualitycheckInspection.imperfectgrainsScabBlackembryo = $scope.getMath(black);
|
|
902
|
|
- }
|
|
903
|
|
- if($scope.qualitycheckInspection.impurityInorganic != null){
|
|
|
902
|
+
|
|
|
903
|
+
|
|
904
|
904
|
var inorganic = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
|
|
905
|
905
|
//inorganic = isNaN(inorganic) ? 0 : inorganic;
|
|
906
|
|
- inorganic = $scope.checkJqos(inorganic,2);
|
|
|
906
|
+ //inorganic = $scope.checkJqos(inorganic,2);
|
|
907
|
907
|
$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(inorganic);
|
|
908
|
|
- }
|
|
909
|
|
- if($scope.qualitycheckInspection.imperfectgrainsScabGibberella != null){
|
|
|
908
|
+
|
|
|
909
|
+
|
|
910
|
910
|
var gibberella = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella);//赤霉病粒
|
|
911
|
911
|
//gibberella = isNaN(gibberella) ? 0 : gibberella;
|
|
912
|
|
- gibberella = $scope.checkJqos(gibberella,2);
|
|
|
912
|
+ //gibberella = $scope.checkJqos(gibberella,2);
|
|
913
|
913
|
$scope.qualitycheckInspection.imperfectgrainsScabGibberella = $scope.getMath(gibberella);
|
|
914
|
|
- }
|
|
915
|
|
- if($scope.qualitycheckInspection.imperfectgrainsScabQtbl != null){
|
|
|
914
|
+
|
|
|
915
|
+
|
|
916
|
916
|
var qtbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl);//其它病粒
|
|
917
|
917
|
//qtbl = isNaN(qtbl) ? 0 : qtbl;
|
|
918
|
|
- qtbl = $scope.checkJqos(qtbl,2);
|
|
|
918
|
+ //qtbl = $scope.checkJqos(qtbl,2);
|
|
919
|
919
|
$scope.qualitycheckInspection.imperfectgrainsScabQtbl = $scope.getMath(qtbl);
|
|
920
|
|
- }
|
|
921
|
|
- if($scope.qualitycheckInspection.impurityOrganic != null){
|
|
|
920
|
+
|
|
|
921
|
+
|
|
922
|
922
|
var organic = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
|
|
923
|
923
|
//organic = isNaN(organic) ? 0 : organic;
|
|
924
|
|
- organic = $scope.checkJqos(organic,2);
|
|
|
924
|
+ //organic = $scope.checkJqos(organic,2);
|
|
925
|
925
|
$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(organic);
|
|
926
|
|
- }
|
|
927
|
|
- if($scope.qualitycheckInspection.sieveResidue != null){
|
|
|
926
|
+
|
|
|
927
|
+
|
|
928
|
928
|
var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
|
|
929
|
929
|
//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
|
|
930
|
|
- sieveResidue = $scope.checkJqos(sieveResidue,2);
|
|
|
930
|
+ //sieveResidue = $scope.checkJqos(sieveResidue,2);
|
|
931
|
931
|
$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
|
|
932
|
|
- }
|
|
933
|
|
- if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
|
|
|
932
|
+
|
|
|
933
|
+
|
|
934
|
934
|
var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
|
|
935
|
935
|
//csl = isNaN(csl) ? 0 : csl;
|
|
936
|
|
- csl = $scope.checkJqos(csl,2);
|
|
|
936
|
+ //csl = $scope.checkJqos(csl,2);
|
|
937
|
937
|
$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
|
|
938
|
|
- }
|
|
939
|
|
- if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
|
|
|
938
|
+
|
|
|
939
|
+
|
|
940
|
940
|
var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
|
|
941
|
941
|
//psl = isNaN(psl) ? 0 : psl;
|
|
942
|
|
- psl = $scope.checkJqos(psl,2);
|
|
|
942
|
+ //psl = $scope.checkJqos(psl,2);
|
|
943
|
943
|
$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
|
|
944
|
|
- }
|
|
945
|
|
- if($scope.qualitycheck.mildewCount != null){
|
|
|
944
|
+
|
|
|
945
|
+
|
|
946
|
946
|
var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
|
|
947
|
947
|
//sml = isNaN(sml) ? 0 : sml;
|
|
948
|
|
- sml = $scope.checkJqos(sml,2);
|
|
|
948
|
+ //sml = $scope.checkJqos(sml,2);
|
|
949
|
949
|
$scope.qualitycheck.mildewCount = $scope.getMath(sml);
|
|
950
|
|
- }
|
|
951
|
|
- if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
|
|
|
950
|
+
|
|
|
951
|
+
|
|
952
|
952
|
var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
|
|
953
|
953
|
//syl = isNaN(syl) ? 0 : syl;
|
|
954
|
|
- syl = $scope.checkJqos(syl,2);
|
|
|
954
|
+ //syl = $scope.checkJqos(syl,2);
|
|
955
|
955
|
$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
|
|
956
|
|
- }
|
|
957
|
956
|
|
|
958
|
|
- if(black == null || black == undefined){
|
|
959
|
|
- black = 0;
|
|
960
|
|
- }
|
|
961
|
|
- if(gibberella == null || gibberella == undefined){
|
|
962
|
|
- gibberella = 0;
|
|
963
|
|
- }
|
|
964
|
|
- if(qtbl == null || qtbl == undefined){
|
|
965
|
|
- qtbl = 0;
|
|
966
|
|
- }
|
|
967
|
|
- if(black == 0 && gibberella == 0 && qtbl == 0){
|
|
968
|
|
- $scope.qualitycheckInspection.imperfectgrainsScabTotal = null;
|
|
969
|
|
- }else{
|
|
970
|
|
- var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
|
|
971
|
|
- bblzl = $scope.checkJqos(bblzl,1);
|
|
972
|
|
- $scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
|
|
973
|
|
- }
|
|
|
957
|
+
|
|
|
958
|
+
|
|
|
959
|
+ //var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;//病斑粒总量%
|
|
|
960
|
+ //bblzl = $scope.checkJqos(bblzl,1);
|
|
|
961
|
+ //$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
|
|
|
962
|
+
|
|
974
|
963
|
//bblzl = isNaN(bblzl) ? 0 : bblzl;
|
|
975
|
964
|
//$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
|
|
976
|
965
|
|
|
977
|
|
- if($scope.qualitycheckInspection.inputTwo != null){
|
|
|
966
|
+
|
|
978
|
967
|
var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
|
|
979
|
|
- zdy = $scope.checkJqos(zdy,1);
|
|
|
968
|
+ //zdy = $scope.checkJqos(zdy,1);
|
|
980
|
969
|
$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
|
|
981
|
|
- }
|
|
|
970
|
+
|
|
982
|
971
|
|
|
983
|
972
|
|
|
984
|
973
|
|
|
985
|
974
|
if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
|
|
986
|
975
|
//杂质总量
|
|
987
|
|
- if(mineral == null || mineral == undefined){
|
|
988
|
|
- mineral = 0;
|
|
989
|
|
- }
|
|
990
|
|
- if(inorganic == null || inorganic == undefined){
|
|
991
|
|
- inorganic = 0;
|
|
992
|
|
- }
|
|
993
|
|
- if(organic == null || organic == undefined){
|
|
994
|
|
- organic = 0;
|
|
995
|
|
- }
|
|
996
|
|
- if(sieveResidue == null || sieveResidue == undefined){
|
|
997
|
|
- sieveResidue = 0;
|
|
998
|
|
- }
|
|
999
|
976
|
|
|
1000
|
|
- if(mineral == 0 && inorganic == 0 && organic == 0 && sieveResidue == 0){
|
|
1001
|
|
- $scope.qualitycheckInspection.impurityTotal = null;
|
|
1002
|
|
- }else{
|
|
1003
|
|
- var zzzl = ((parseFloat(mineral)*100) + (parseFloat(inorganic)*100)+ (parseFloat(organic)*100)+ (parseFloat(sieveResidue)*100))/100;
|
|
|
977
|
+
|
|
|
978
|
+ var zzzl = ((parseFloat($scope.qualitycheck.mineral)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+
|
|
|
979
|
+ (parseFloat($scope.qualitycheckInspection.impurityInorganic)*100)+ (parseFloat($scope.qualitycheckInspection.sieveResidue)*100))/100;
|
|
1004
|
980
|
//$scope.qualitycheckInspection.impurityTotal = $scope.getMath($scope.qualitycheckInspection.impurityTotal);
|
|
1005
|
|
- zzzl = $scope.checkJqos(zzzl,1);
|
|
|
981
|
+ //zzzl = $scope.checkJqos(zzzl,1);
|
|
1006
|
982
|
$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
|
|
1007
|
|
- }
|
|
|
983
|
+
|
|
1008
|
984
|
|
|
1009
|
985
|
//病斑粒总量
|
|
1010
|
|
- if(black == null || black == undefined){
|
|
1011
|
|
- black = 0;
|
|
1012
|
|
- }
|
|
1013
|
|
- if(gibberella == null || gibberella == undefined){
|
|
1014
|
|
- gibberella = 0;
|
|
1015
|
|
- }
|
|
1016
|
|
- if(qtbl == null || qtbl == undefined){
|
|
1017
|
|
- qtbl = 0;
|
|
1018
|
|
- }
|
|
1019
|
|
- if(black == 0 && gibberella == 0 && qtbl == 0){
|
|
1020
|
|
- $scope.qualitycheckInspection.imperfectgrainsScabTotal = null;
|
|
1021
|
|
- }else{
|
|
1022
|
|
- var bblzl = ((parseFloat(black)*100) + (parseFloat(gibberella)*100) + (parseFloat(qtbl)*100))/100;
|
|
|
986
|
+
|
|
|
987
|
+ var bblzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsScabBlackembryo)*100) +
|
|
|
988
|
+ (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabGibberella)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabQtbl)*100))/100;
|
|
1023
|
989
|
//$scope.qualitycheckInspection.imperfectgrainsScabTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsScabTotal);
|
|
1024
|
|
- bblzl = $scope.checkJqos(bblzl,1);
|
|
|
990
|
+ //bblzl = $scope.checkJqos(bblzl,1);
|
|
1025
|
991
|
$scope.qualitycheckInspection.imperfectgrainsScabTotal = isNaN(bblzl) ? '0.0' : $scope.getMath1(bblzl);
|
|
1026
|
|
- }
|
|
|
992
|
+
|
|
1027
|
993
|
|
|
1028
|
994
|
//不完善粒总量
|
|
1029
|
|
- if(csl == null || csl == undefined){
|
|
1030
|
|
- csl = 0;
|
|
1031
|
|
- }
|
|
1032
|
|
- if(psl == null || psl == undefined){
|
|
1033
|
|
- psl = 0;
|
|
1034
|
|
- }
|
|
1035
|
|
- if(sml == null || sml == undefined){
|
|
1036
|
|
- sml = 0;
|
|
1037
|
|
- }
|
|
1038
|
|
- if(bblzl == null || bblzl == undefined){
|
|
1039
|
|
- bblzl = 0;
|
|
1040
|
|
- }
|
|
1041
|
|
- if(syl == null || syl == undefined){
|
|
1042
|
|
- syl = 0;
|
|
1043
|
|
- }
|
|
1044
|
995
|
|
|
1045
|
|
- if(csl == 0 && psl ==0 && sml == 0 && bblzl == 0 && syl == 0){
|
|
1046
|
|
- $scope.qualitycheckInspection.imperfectgrainsTotal = null;
|
|
1047
|
|
- }else{
|
|
1048
|
|
- var bwslzl = ((parseFloat(csl)*100) + (parseFloat(psl)*100)+(parseFloat(sml)*100) + (parseFloat(bblzl)*100) + (parseFloat(syl)*100))/100;
|
|
|
996
|
+ var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage)*100)
|
|
|
997
|
+ +(parseFloat($scope.qualitycheck.mildewCount)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScabTotal)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100))/100;
|
|
1049
|
998
|
//$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath($scope.qualitycheckInspection.imperfectgrainsTotal);
|
|
1050
|
|
- bwslzl = $scope.checkJqos(bwslzl,1);
|
|
|
999
|
+ //bwslzl = $scope.checkJqos(bwslzl,1);
|
|
1051
|
1000
|
$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
|
|
1052
|
|
- }
|
|
|
1001
|
+
|
|
1053
|
1002
|
|
|
1054
|
1003
|
}
|
|
1055
|
1004
|
} else if (pz=="3166") {
|
|
1056
|
|
- if($scope.qualitycheck.water != null){
|
|
|
1005
|
+
|
|
1057
|
1006
|
var sf = parseFloat($scope.qualitycheck.water);//水分
|
|
1058
|
|
- sf = $scope.checkJqos(sf,1);
|
|
|
1007
|
+ //sf = $scope.checkJqos(sf,1);
|
|
1059
|
1008
|
$scope.qualitycheck.water = $scope.getMath1(sf);
|
|
1060
|
|
- }
|
|
1061
|
|
- if($scope.qualitycheck.huskedRation != null){
|
|
|
1009
|
+
|
|
|
1010
|
+
|
|
1062
|
1011
|
var ccl = parseFloat($scope.qualitycheck.huskedRation);//出糙率
|
|
1063
|
|
- ccl = $scope.checkJqos(ccl,1);
|
|
|
1012
|
+ //ccl = $scope.checkJqos(ccl,1);
|
|
1064
|
1013
|
$scope.qualitycheck.huskedRation = $scope.getMath1(ccl);
|
|
1065
|
|
- }
|
|
1066
|
|
- if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
|
|
|
1014
|
+
|
|
|
1015
|
+
|
|
1067
|
1016
|
var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
|
|
1068
|
|
- wsl = $scope.checkJqos(wsl,2);
|
|
|
1017
|
+ //wsl = $scope.checkJqos(wsl,2);
|
|
1069
|
1018
|
$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
|
|
1070
|
|
- }
|
|
1071
|
|
- if($scope.qualitycheck.fullGoodRation != null){
|
|
|
1019
|
+
|
|
|
1020
|
+
|
|
1072
|
1021
|
var zjml = parseFloat($scope.qualitycheck.fullGoodRation);//整精米率
|
|
1073
|
|
- zjml = $scope.checkJqos(zjml,1);
|
|
|
1022
|
+ //zjml = $scope.checkJqos(zjml,1);
|
|
1074
|
1023
|
$scope.qualitycheck.fullGoodRation = $scope.getMath1(zjml);
|
|
1075
|
|
- }
|
|
1076
|
|
- if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
|
|
|
1024
|
+
|
|
|
1025
|
+
|
|
1077
|
1026
|
var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
|
|
1078
|
|
- csl = $scope.checkJqos(csl,2);
|
|
|
1027
|
+ //csl = $scope.checkJqos(csl,2);
|
|
1079
|
1028
|
$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
|
|
1080
|
|
- }
|
|
1081
|
|
- if($scope.qualitycheckInspection.imperfectgrainsScab != null){
|
|
|
1029
|
+
|
|
|
1030
|
+
|
|
1082
|
1031
|
var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
|
|
1083
|
|
- bbl = $scope.checkJqos(bbl,2);
|
|
|
1032
|
+ //bbl = $scope.checkJqos(bbl,2);
|
|
1084
|
1033
|
$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
|
|
1085
|
|
- }
|
|
1086
|
|
- if($scope.qualitycheckInspection.sieveResidue != null){
|
|
|
1034
|
+
|
|
|
1035
|
+
|
|
1087
|
1036
|
var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
|
|
1088
|
|
- sieveResidue = $scope.checkJqos(sieveResidue,2);
|
|
|
1037
|
+ //sieveResidue = $scope.checkJqos(sieveResidue,2);
|
|
1089
|
1038
|
$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
|
|
1090
|
|
- }
|
|
1091
|
|
- if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null ){
|
|
|
1039
|
+
|
|
|
1040
|
+
|
|
1092
|
1041
|
var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒
|
|
1093
|
|
- syl = $scope.checkJqos(syl,2);
|
|
|
1042
|
+ //syl = $scope.checkJqos(syl,2);
|
|
1094
|
1043
|
$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
|
|
1095
|
|
- }
|
|
1096
|
|
- if($scope.qualitycheckInspection.impurityOrganic != null){
|
|
|
1044
|
+
|
|
|
1045
|
+
|
|
1097
|
1046
|
var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
|
|
1098
|
|
- yjzz = $scope.checkJqos(yjzz,2);
|
|
|
1047
|
+ //yjzz = $scope.checkJqos(yjzz,2);
|
|
1099
|
1048
|
$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
|
|
1100
|
|
- }
|
|
1101
|
|
- if($scope.qualitycheck.mildewCount != null){
|
|
|
1049
|
+
|
|
|
1050
|
+
|
|
1102
|
1051
|
var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒
|
|
1103
|
|
- sml = $scope.checkJqos(sml,2);
|
|
|
1052
|
+ //sml = $scope.checkJqos(sml,2);
|
|
1104
|
1053
|
$scope.qualitycheck.mildewCount = $scope.getMath(sml);
|
|
1105
|
|
- }
|
|
1106
|
|
- if($scope.qualitycheckInspection.impurityInorganic != null){
|
|
|
1054
|
+
|
|
|
1055
|
+
|
|
1107
|
1056
|
var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
|
|
1108
|
|
- wjzz = $scope.checkJqos(wjzz,2);
|
|
|
1057
|
+ //wjzz = $scope.checkJqos(wjzz,2);
|
|
1109
|
1058
|
$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
|
|
1110
|
|
- }
|
|
1111
|
|
- if($scope.qualitycheck.outHuskedRation != null){
|
|
|
1059
|
+
|
|
|
1060
|
+
|
|
1112
|
1061
|
var gwcm = parseFloat($scope.qualitycheck.outHuskedRation);//谷外糙米
|
|
1113
|
|
- gwcm = $scope.checkJqos(gwcm, 1);
|
|
|
1062
|
+ //gwcm = $scope.checkJqos(gwcm, 1);
|
|
1114
|
1063
|
$scope.qualitycheck.outHuskedRation = $scope.getMath1(gwcm);
|
|
1115
|
|
- }
|
|
1116
|
|
- if($scope.qualitycheckInspection.riceYield != null){
|
|
|
1064
|
+
|
|
|
1065
|
+
|
|
1117
|
1066
|
var cml = parseFloat($scope.qualitycheckInspection.riceYield);//出米率
|
|
1118
|
|
- cml = $scope.checkJqos(cml, 1);
|
|
|
1067
|
+ //cml = $scope.checkJqos(cml, 1);
|
|
1119
|
1068
|
$scope.qualitycheckInspection.riceYield = $scope.getMath1(cml);
|
|
1120
|
|
- }
|
|
1121
|
|
- if($scope.qualitycheckInspection.yellowRice != null){
|
|
|
1069
|
+
|
|
|
1070
|
+
|
|
1122
|
1071
|
var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
|
|
1123
|
|
- hlm = $scope.checkJqos(hlm, 1);
|
|
|
1072
|
+ //hlm = $scope.checkJqos(hlm, 1);
|
|
1124
|
1073
|
$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
|
|
1125
|
|
- }
|
|
1126
|
|
- if($scope.qualitycheck.intermixingRate != null){
|
|
|
1074
|
+
|
|
|
1075
|
+
|
|
1127
|
1076
|
var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
|
|
1128
|
|
- hhl = $scope.checkJqos(hhl, 1);
|
|
|
1077
|
+ //hhl = $scope.checkJqos(hhl, 1);
|
|
1129
|
1078
|
$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
|
|
1130
|
|
- }
|
|
1131
|
|
- if($scope.qualitycheckInspection.inputTwo != null){
|
|
|
1079
|
+
|
|
|
1080
|
+
|
|
1132
|
1081
|
var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
|
|
1133
|
|
- zdy = $scope.checkJqos(zdy, 1);
|
|
|
1082
|
+ //zdy = $scope.checkJqos(zdy, 1);
|
|
1134
|
1083
|
$scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
|
|
1135
|
|
- }
|
|
1136
|
|
-
|
|
1137
|
1084
|
|
|
1138
|
1085
|
|
|
1139
|
1086
|
if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
|
|
1140
|
1087
|
//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
|
|
1141
|
|
- if(sieveResidue == null || sieveResidue == undefined){
|
|
1142
|
|
- sieveResidue = 0;
|
|
1143
|
|
- }
|
|
1144
|
|
- if(yjzz == null || yjzz == undefined){
|
|
1145
|
|
- yjzz = 0;
|
|
1146
|
|
- }
|
|
1147
|
|
- if(wjzz == null || wjzz == undefined){
|
|
1148
|
|
- wjzz = 0;
|
|
1149
|
|
- }
|
|
1150
|
|
- if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
|
|
1151
|
|
- $scope.qualitycheckInspection.impurityTotal = null;
|
|
1152
|
|
- }else{
|
|
1153
|
|
- var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
|
|
1154
|
|
- zzzl = $scope.checkJqos(zzzl, 1);
|
|
|
1088
|
+
|
|
|
1089
|
+ var zzzl = ((parseFloat($scope.qualitycheckInspection.sieveResidue)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+ (parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
|
|
|
1090
|
+ //zzzl = $scope.checkJqos(zzzl, 1);
|
|
1155
|
1091
|
$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
|
|
1156
|
|
- }
|
|
|
1092
|
+
|
|
1157
|
1093
|
|
|
1158
|
1094
|
//zzzl.toFixed(1);
|
|
1159
|
1095
|
//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
|
|
1160
|
1096
|
//不完善粒总量=未熟粒+虫蚀粒+病斑粒+生芽粒+生霉粒
|
|
1161
|
|
- if(wsl == null || wsl == undefined){
|
|
1162
|
|
- wsl = 0;
|
|
1163
|
|
- }
|
|
1164
|
|
- if(csl == null || csl == undefined){
|
|
1165
|
|
- csl = 0;
|
|
1166
|
|
- }
|
|
1167
|
|
- if(bbl == null || bbl == undefined){
|
|
1168
|
|
- bbl = 0;
|
|
1169
|
|
- }
|
|
1170
|
|
- if(syl == null || syl == undefined){
|
|
1171
|
|
- syl = 0;
|
|
1172
|
|
- }
|
|
1173
|
|
- if(sml == null || sml == undefined){
|
|
1174
|
|
- sml = 0;
|
|
1175
|
|
- }
|
|
1176
|
1097
|
|
|
1177
|
|
- if(wsl == 0 && csl == 0 && bbl == 0 && syl == 0 && sml == 0){
|
|
1178
|
|
- $scope.qualitycheckInspection.imperfectgrainsTotal = null;
|
|
1179
|
|
- }else{
|
|
1180
|
|
- var bwslzl = ((parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
|
|
1181
|
|
- bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
|
1098
|
+
|
|
|
1099
|
+
|
|
|
1100
|
+ var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) +
|
|
|
1101
|
+ (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) + (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
|
|
|
1102
|
+ //bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
1182
|
1103
|
$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
|
|
1183
|
|
- }
|
|
|
1104
|
+
|
|
1184
|
1105
|
|
|
1185
|
1106
|
}
|
|
1186
|
1107
|
}else if(pz=="3165"){
|
|
1187
|
1108
|
|
|
1188
|
|
- if($scope.qualitycheck.water != null){
|
|
|
1109
|
+
|
|
1189
|
1110
|
var sf = parseFloat($scope.qualitycheck.water);//水分
|
|
1190
|
|
- sf = $scope.checkJqos(sf,1);
|
|
|
1111
|
+ //sf = $scope.checkJqos(sf,1);
|
|
1191
|
1112
|
$scope.qualitycheck.water = $scope.getMath1(sf);
|
|
1192
|
|
- }
|
|
1193
|
|
- if($scope.qualitycheckInspection.impurityOrganic != null){
|
|
|
1113
|
+
|
|
|
1114
|
+
|
|
1194
|
1115
|
var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
|
|
1195
|
|
- yjzz = $scope.checkJqos(yjzz,2);
|
|
|
1116
|
+ //yjzz = $scope.checkJqos(yjzz,2);
|
|
1196
|
1117
|
$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
|
|
1197
|
|
- }
|
|
1198
|
|
- if($scope.qualitycheckInspection.impurityInorganic != null){
|
|
|
1118
|
+
|
|
|
1119
|
+
|
|
1199
|
1120
|
var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
|
|
1200
|
|
- wjzz = $scope.checkJqos(wjzz,2);
|
|
|
1121
|
+ //wjzz = $scope.checkJqos(wjzz,2);
|
|
1201
|
1122
|
$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
|
|
1202
|
|
- }
|
|
1203
|
|
- if($scope.qualitycheckInspection.sieveResidue != null){
|
|
|
1123
|
+
|
|
|
1124
|
+
|
|
1204
|
1125
|
var sieveResidue = parseFloat($scope.qualitycheckInspection.sieveResidue);//筛下物%
|
|
1205
|
1126
|
//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
|
|
1206
|
|
- sieveResidue = $scope.checkJqos(sieveResidue,2);
|
|
|
1127
|
+ //sieveResidue = $scope.checkJqos(sieveResidue,2);
|
|
1207
|
1128
|
$scope.qualitycheckInspection.sieveResidue = $scope.getMath(sieveResidue);
|
|
1208
|
|
- }
|
|
1209
|
|
- if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
|
|
|
1129
|
+
|
|
|
1130
|
+
|
|
1210
|
1131
|
var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
|
|
1211
|
1132
|
//csl = isNaN(csl) ? 0 : csl;
|
|
1212
|
|
- csl = $scope.checkJqos(csl,2);
|
|
|
1133
|
+ //csl = $scope.checkJqos(csl,2);
|
|
1213
|
1134
|
$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
|
|
1214
|
|
- }
|
|
1215
|
|
- if($scope.qualitycheckInspection.imperfectgrainsScab != null){
|
|
|
1135
|
+
|
|
|
1136
|
+
|
|
1216
|
1137
|
var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
|
|
1217
|
|
- bbl = $scope.checkJqos(bbl,2);
|
|
|
1138
|
+ //bbl = $scope.checkJqos(bbl,2);
|
|
1218
|
1139
|
$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
|
|
1219
|
|
- }
|
|
1220
|
|
- if($scope.qualitycheckInspection.imperfectgrainsDamage != null){
|
|
|
1140
|
+
|
|
|
1141
|
+
|
|
1221
|
1142
|
var psl = parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage);//破损粒%
|
|
1222
|
1143
|
//psl = isNaN(psl) ? 0 : psl;
|
|
1223
|
|
- psl = $scope.checkJqos(psl,2);
|
|
|
1144
|
+ //psl = $scope.checkJqos(psl,2);
|
|
1224
|
1145
|
$scope.qualitycheckInspection.imperfectgrainsDamage = $scope.getMath(psl);
|
|
1225
|
|
- }
|
|
1226
|
|
- if($scope.qualitycheckInspection.imperfectgrainsSproutedkernel != null){
|
|
|
1146
|
+
|
|
|
1147
|
+
|
|
1227
|
1148
|
var syl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽粒%
|
|
1228
|
1149
|
//syl = isNaN(syl) ? 0 : syl;
|
|
1229
|
|
- syl = $scope.checkJqos(syl,2);
|
|
|
1150
|
+ //syl = $scope.checkJqos(syl,2);
|
|
1230
|
1151
|
$scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syl);
|
|
1231
|
|
- }
|
|
1232
|
|
- if($scope.qualitycheck.mildewCount != null){
|
|
|
1152
|
+
|
|
|
1153
|
+
|
|
1233
|
1154
|
var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
|
|
1234
|
1155
|
//sml = isNaN(sml) ? 0 : sml;
|
|
1235
|
|
- sml = $scope.checkJqos(sml,2);
|
|
|
1156
|
+ //sml = $scope.checkJqos(sml,2);
|
|
1236
|
1157
|
$scope.qualitycheck.mildewCount = $scope.getMath(sml);
|
|
1237
|
|
- }
|
|
1238
|
|
- if($scope.qualitycheckInspection.mildew != null){
|
|
|
1158
|
+
|
|
|
1159
|
+
|
|
1239
|
1160
|
var mbl = parseFloat($scope.qualitycheckInspection.mildew);//霉变粒%
|
|
1240
|
|
- mbl = $scope.checkJqos(mbl,2);
|
|
|
1161
|
+ //mbl = $scope.checkJqos(mbl,2);
|
|
1241
|
1162
|
$scope.qualitycheckInspection.mildew = $scope.getMath(mbl);
|
|
1242
|
|
- }
|
|
1243
|
|
- if($scope.qualitycheckInspection.naturally != null){
|
|
|
1163
|
+
|
|
|
1164
|
+
|
|
1244
|
1165
|
var zrrssl = parseFloat($scope.qualitycheckInspection.naturally);//自然热损伤粒%
|
|
1245
|
1166
|
//sml = isNaN(sml) ? 0 : sml;
|
|
1246
|
|
- zrrssl = $scope.checkJqos(zrrssl,2);
|
|
|
1167
|
+ //zrrssl = $scope.checkJqos(zrrssl,2);
|
|
1247
|
1168
|
$scope.qualitycheckInspection.naturally = $scope.getMath(zrrssl);
|
|
1248
|
|
- }
|
|
1249
|
|
- if($scope.qualitycheckInspection.stoving != null){
|
|
|
1169
|
+
|
|
|
1170
|
+
|
|
1250
|
1171
|
var hgrssl = parseFloat($scope.qualitycheckInspection.stoving);//烘干热损伤粒%
|
|
1251
|
|
- hgrssl = $scope.checkJqos(hgrssl,2);
|
|
|
1172
|
+ //hgrssl = $scope.checkJqos(hgrssl,2);
|
|
1252
|
1173
|
$scope.qualitycheckInspection.stoving = $scope.getMath(hgrssl);
|
|
1253
|
|
- }
|
|
|
1174
|
+
|
|
1254
|
1175
|
|
|
1255
|
1176
|
if($scope.qualitycheck !== undefined && $scope.qualitycheck !== ""){
|
|
1256
|
1177
|
//杂质总量=筛下物+有机杂质+无机杂质，四舍五入，保留一位小数
|
|
1257
|
|
- if(sieveResidue == null || sieveResidue == undefined){
|
|
1258
|
|
- sieveResidue = 0;
|
|
1259
|
|
- }
|
|
1260
|
|
- if(yjzz == null || yjzz == undefined){
|
|
1261
|
|
- yjzz = 0;
|
|
1262
|
|
- }
|
|
1263
|
|
- if(wjzz == null || wjzz == undefined){
|
|
1264
|
|
- wjzz = 0;
|
|
1265
|
|
- }
|
|
1266
|
|
- if(sieveResidue == 0 && yjzz == 0 && wjzz == 0){
|
|
1267
|
|
- $scope.qualitycheckInspection.impurityTotal = null;
|
|
1268
|
|
- }else{
|
|
1269
|
|
- var zzzl = ((parseFloat(sieveResidue)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
|
|
1270
|
|
- zzzl = $scope.checkJqos(zzzl, 1);
|
|
|
1178
|
+
|
|
|
1179
|
+
|
|
|
1180
|
+ var zzzl = ((parseFloat($scope.qualitycheckInspection.sieveResidue)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+
|
|
|
1181
|
+ (parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
|
|
|
1182
|
+ //zzzl = $scope.checkJqos(zzzl, 1);
|
|
1271
|
1183
|
$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
|
|
1272
|
|
- }
|
|
|
1184
|
+
|
|
1273
|
1185
|
|
|
1274
|
1186
|
//zzzl.toFixed(1);
|
|
1275
|
1187
|
//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
|
|
1276
|
1188
|
//不完善粒总量=虫蚀粒+病斑粒++破损粒+生芽粒+生霉粒
|
|
1277
|
|
- if(csl == null || csl == undefined){
|
|
1278
|
|
- csl = 0;
|
|
1279
|
|
- }
|
|
1280
|
|
- if(bbl == null || bbl == undefined){
|
|
1281
|
|
- bbl = 0;
|
|
1282
|
|
- }
|
|
1283
|
|
- if(psl == null || psl == undefined){
|
|
1284
|
|
- psl = 0;
|
|
1285
|
|
- }
|
|
1286
|
|
- if(syl == null || syl == undefined){
|
|
1287
|
|
- syl = 0;
|
|
1288
|
|
- }
|
|
1289
|
|
- if(sml == null || sml == undefined){
|
|
1290
|
|
- sml = 0;
|
|
1291
|
|
- }
|
|
1292
|
1189
|
|
|
1293
|
|
- if(csl == 0 && bbl == 0 && psl == 0 && syl == 0 && sml == 0){
|
|
1294
|
|
- bwslzl = null;
|
|
1295
|
|
- $scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
|
|
1296
|
|
- }else{
|
|
1297
|
|
- var bwslzl = ((parseFloat(psl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(syl)*100) + (parseFloat(sml)*100))/100;
|
|
1298
|
|
- bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
|
1190
|
+
|
|
|
1191
|
+ var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsDamage)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) +
|
|
|
1192
|
+ (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) +
|
|
|
1193
|
+ (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
|
|
|
1194
|
+ //bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
1299
|
1195
|
$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
|
|
1300
|
|
- }
|
|
|
1196
|
+
|
|
1301
|
1197
|
//$scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(bwslzl) ? '0.0' : $scope.getMath1(bwslzl);
|
|
1302
|
1198
|
|
|
1303
|
1199
|
}
|
|
1304
|
1200
|
|
|
1305
|
1201
|
|
|
1306
|
1202
|
}else if(pz == "7107"){
|
|
1307
|
|
- if($scope.qualitycheck.water != null){
|
|
|
1203
|
+
|
|
1308
|
1204
|
var sf = parseFloat($scope.qualitycheck.water);//水分
|
|
1309
|
|
- sf = $scope.checkJqos(sf,1);
|
|
|
1205
|
+ //sf = $scope.checkJqos(sf,1);
|
|
1310
|
1206
|
$scope.qualitycheck.water = $scope.getMath1(sf);
|
|
1311
|
|
- }
|
|
1312
|
|
- if($scope.qualitycheckInspection.avgLength != null){
|
|
|
1207
|
+
|
|
|
1208
|
+
|
|
1313
|
1209
|
var pjcd = parseFloat($scope.qualitycheckInspection.avgLength);//平均长度
|
|
1314
|
|
- pjcd = $scope.checkJqos(pjcd,2);
|
|
1315
|
|
- $scope.qualitycheckInspection.avgLength = $scope.getMath(pjcd);
|
|
1316
|
|
- }
|
|
1317
|
|
- if($scope.qualitycheckInspection.riceGrains != null){
|
|
|
1210
|
+ //pjcd = $scope.checkJqos(pjcd,1);
|
|
|
1211
|
+ $scope.qualitycheckInspection.avgLength = $scope.getMath1(pjcd);
|
|
|
1212
|
+
|
|
|
1213
|
+
|
|
1318
|
1214
|
var wzml = parseFloat($scope.qualitycheckInspection.riceGrains);//完整米粒
|
|
1319
|
|
- wzml = $scope.checkJqos(wzml,2);
|
|
1320
|
|
- $scope.qualitycheckInspection.riceGrains = $scope.getMath(wzml);
|
|
1321
|
|
- }
|
|
1322
|
|
- if($scope.qualitycheckInspection.brokenriceBig != null){
|
|
|
1215
|
+ //wzml = $scope.checkJqos(wzml,1);
|
|
|
1216
|
+ $scope.qualitycheckInspection.riceGrains = $scope.getMath1(wzml);
|
|
|
1217
|
+
|
|
|
1218
|
+
|
|
1323
|
1219
|
var dsm = parseFloat($scope.qualitycheckInspection.brokenriceBig);//大碎米
|
|
1324
|
1220
|
//sieveResidue = isNaN(sieveResidue) ? 0 : sieveResidue;
|
|
1325
|
|
- dsm = $scope.checkJqos(dsm,2);
|
|
|
1221
|
+ //dsm = $scope.checkJqos(dsm,2);
|
|
1326
|
1222
|
$scope.qualitycheckInspection.brokenriceBig = $scope.getMath(dsm);
|
|
1327
|
|
- }
|
|
1328
|
|
- if($scope.qualitycheckInspection.brokenriceSmall != null){
|
|
|
1223
|
+
|
|
|
1224
|
+
|
|
1329
|
1225
|
var xsm = parseFloat($scope.qualitycheckInspection.brokenriceSmall);//小碎米
|
|
1330
|
1226
|
//csl = isNaN(csl) ? 0 : csl;
|
|
1331
|
|
- xsm = $scope.checkJqos(xsm,2);
|
|
|
1227
|
+ //xsm = $scope.checkJqos(xsm,2);
|
|
1332
|
1228
|
$scope.qualitycheckInspection.brokenriceSmall = $scope.getMath(xsm);
|
|
1333
|
|
- }
|
|
1334
|
|
- if($scope.qualitycheckInspection.imperfectgrainsContent != null){
|
|
|
1229
|
+
|
|
|
1230
|
+
|
|
1335
|
1231
|
var hl = parseFloat($scope.qualitycheckInspection.imperfectgrainsContent);//含量
|
|
1336
|
1232
|
//csl = isNaN(csl) ? 0 : csl;
|
|
1337
|
|
- hl = $scope.checkJqos(hl,2);
|
|
|
1233
|
+ //hl = $scope.checkJqos(hl,2);
|
|
1338
|
1234
|
$scope.qualitycheckInspection.imperfectgrainsContent = $scope.getMath(hl);
|
|
1339
|
|
- }
|
|
1340
|
|
- if($scope.qualitycheckInspection.imperfectgrainsImmaturegrain != null){
|
|
|
1235
|
+
|
|
|
1236
|
+
|
|
1341
|
1237
|
var wsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain);//未熟粒
|
|
1342
|
|
- wsl = $scope.checkJqos(wsl,2);
|
|
|
1238
|
+ //wsl = $scope.checkJqos(wsl,2);
|
|
1343
|
1239
|
$scope.qualitycheckInspection.imperfectgrainsImmaturegrain = $scope.getMath(wsl);
|
|
1344
|
|
- }
|
|
1345
|
|
- if($scope.qualitycheckInspection.imperfectgrainsInjuredkernel != null){
|
|
|
1240
|
+
|
|
|
1241
|
+
|
|
1346
|
1242
|
var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒
|
|
1347
|
|
- csl = $scope.checkJqos(csl,2);
|
|
|
1243
|
+ //csl = $scope.checkJqos(csl,2);
|
|
1348
|
1244
|
$scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
|
|
1349
|
|
- }
|
|
1350
|
|
- if($scope.qualitycheckInspection.imperfectgrainsScab != null){
|
|
|
1245
|
+
|
|
|
1246
|
+
|
|
1351
|
1247
|
var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
|
|
1352
|
|
- bbl = $scope.checkJqos(bbl,2);
|
|
|
1248
|
+ //bbl = $scope.checkJqos(bbl,2);
|
|
1353
|
1249
|
$scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
|
|
1354
|
|
- }
|
|
1355
|
|
- if($scope.qualitycheckInspection.imperfectgrainsBrownrice != null){
|
|
|
1250
|
+
|
|
|
1251
|
+
|
|
1356
|
1252
|
var cml = parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice);//糙米粒
|
|
1357
|
|
- cml = $scope.checkJqos(cml,2);
|
|
|
1253
|
+ //cml = $scope.checkJqos(cml,2);
|
|
1358
|
1254
|
$scope.qualitycheckInspection.imperfectgrainsBrownrice = $scope.getMath(cml);
|
|
1359
|
|
- }
|
|
1360
|
|
- if($scope.qualitycheck.mildewCount != null){
|
|
|
1255
|
+
|
|
|
1256
|
+
|
|
1361
|
1257
|
var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
|
|
1362
|
1258
|
//sml = isNaN(sml) ? 0 : sml;
|
|
1363
|
|
- sml = $scope.checkJqos(sml,2);
|
|
|
1259
|
+ //sml = $scope.checkJqos(sml,2);
|
|
1364
|
1260
|
$scope.qualitycheck.mildewCount = $scope.getMath(sml);
|
|
1365
|
|
- }
|
|
1366
|
|
- /*if($scope.qualitycheckInspection.machiningaccuracyEssence != null){
|
|
1367
|
|
- var jn = parseFloat($scope.qualitycheckInspection.machiningaccuracyEssence);//精碾
|
|
1368
|
|
- //sml = isNaN(sml) ? 0 : sml;
|
|
1369
|
|
- jn = $scope.checkJqos(jn,2);
|
|
1370
|
|
- $scope.qualitycheckInspection.machiningaccuracyEssence = $scope.getMath(jn);
|
|
1371
|
|
- }
|
|
1372
|
|
- if($scope.qualitycheckInspection.machiningaccuracySuitable != null){
|
|
1373
|
|
- var sn = parseFloat($scope.qualitycheckInspection.machiningaccuracySuitable);//适碾
|
|
1374
|
|
- //sml = isNaN(sml) ? 0 : sml;
|
|
1375
|
|
- sn = $scope.checkJqos(sn,2);
|
|
1376
|
|
- $scope.qualitycheckInspection.machiningaccuracySuitable = $scope.getMath(sn);
|
|
1377
|
|
- }*/
|
|
1378
|
|
- if($scope.qualitycheckInspection.yellowRice != null){
|
|
|
1261
|
+
|
|
|
1262
|
+
|
|
1379
|
1263
|
var hlm = parseFloat($scope.qualitycheckInspection.yellowRice);//黄粒米
|
|
1380
|
|
- hlm = $scope.checkJqos(hlm, 1);
|
|
|
1264
|
+ //hlm = $scope.checkJqos(hlm, 1);
|
|
1381
|
1265
|
$scope.qualitycheckInspection.yellowRice = $scope.getMath1(hlm);
|
|
1382
|
|
- }
|
|
1383
|
|
- if($scope.qualitycheck.intermixingRate != null){
|
|
|
1266
|
+
|
|
|
1267
|
+
|
|
1384
|
1268
|
var hhl = parseFloat($scope.qualitycheck.intermixingRate);//互混率
|
|
1385
|
|
- hhl = $scope.checkJqos(hhl, 1);
|
|
|
1269
|
+ //hhl = $scope.checkJqos(hhl, 1);
|
|
1386
|
1270
|
$scope.qualitycheck.intermixingRate = $scope.getMath1(hhl);
|
|
1387
|
|
- }
|
|
1388
|
|
- if($scope.qualitycheckInspection.impurityBranPowder != null){
|
|
|
1271
|
+
|
|
|
1272
|
+
|
|
1389
|
1273
|
var kf = parseFloat($scope.qualitycheckInspection.impurityBranPowder);//糠粉
|
|
1390
|
|
- kf = $scope.checkJqos(kf, 2);
|
|
1391
|
|
- $scope.qualitycheckInspection.impurityBranPowder = $scope.getMath1(kf);
|
|
1392
|
|
- }
|
|
1393
|
|
- if($scope.qualitycheckInspection.impurityOrganic != null){
|
|
|
1274
|
+ //kf = $scope.checkJqos(kf, 2);
|
|
|
1275
|
+ $scope.qualitycheckInspection.impurityBranPowder = $scope.getMath(kf);
|
|
|
1276
|
+
|
|
|
1277
|
+
|
|
1394
|
1278
|
var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
|
|
1395
|
|
- yjzz = $scope.checkJqos(yjzz,2);
|
|
|
1279
|
+ //yjzz = $scope.checkJqos(yjzz,2);
|
|
1396
|
1280
|
$scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
|
|
1397
|
|
- }
|
|
1398
|
|
- if($scope.qualitycheckInspection.impurityInorganic != null){
|
|
|
1281
|
+
|
|
|
1282
|
+
|
|
1399
|
1283
|
var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
|
|
1400
|
|
- wjzz = $scope.checkJqos(wjzz,2);
|
|
|
1284
|
+ //wjzz = $scope.checkJqos(wjzz,2);
|
|
1401
|
1285
|
$scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
|
|
1402
|
|
- }
|
|
1403
|
|
- if($scope.qualitycheckInspection.chalkiness != null){
|
|
|
1286
|
+
|
|
|
1287
|
+
|
|
1404
|
1288
|
var ebd = parseFloat($scope.qualitycheckInspection.chalkiness);//垩白度
|
|
1405
|
|
- ebd = $scope.checkJqos(ebd,2);
|
|
1406
|
|
- $scope.qualitycheckInspection.chalkiness = $scope.getMath(ebd);
|
|
1407
|
|
- }
|
|
1408
|
|
- if($scope.qualitycheckInspection.amylose != null){
|
|
|
1289
|
+ //ebd = $scope.checkJqos(ebd,1);
|
|
|
1290
|
+ $scope.qualitycheckInspection.chalkiness = $scope.getMath1(ebd);
|
|
|
1291
|
+
|
|
|
1292
|
+
|
|
1409
|
1293
|
var zldfhl = parseFloat($scope.qualitycheckInspection.amylose);//直链淀粉含量
|
|
1410
|
|
- zldfhl = $scope.checkJqos(zldfhl,2);
|
|
1411
|
|
- $scope.qualitycheckInspection.amylose = $scope.getMath(zldfhl);
|
|
1412
|
|
- }
|
|
|
1294
|
+ //zldfhl = $scope.checkJqos(zldfhl,1);
|
|
|
1295
|
+ $scope.qualitycheckInspection.amylose = $scope.getMath1(zldfhl);
|
|
|
1296
|
+
|
|
1413
|
1297
|
|
|
1414
|
1298
|
//杂质总量=糠粉+有机杂质+无机杂质，四舍五入，保留一位小数
|
|
1415
|
|
- if(kf == null || kf == undefined){
|
|
1416
|
|
- kf = 0;
|
|
1417
|
|
- }
|
|
1418
|
|
- if(yjzz == null || yjzz == undefined){
|
|
1419
|
|
- yjzz = 0;
|
|
1420
|
|
- }
|
|
1421
|
|
- if(wjzz == null || wjzz == undefined){
|
|
1422
|
|
- wjzz = 0;
|
|
1423
|
|
- }
|
|
1424
|
|
- if(kf == 0 && yjzz == 0 && wjzz == 0){
|
|
1425
|
|
- $scope.qualitycheckInspection.impurityTotal = null;
|
|
1426
|
|
- }else{
|
|
1427
|
|
- var zzzl = ((parseFloat(kf)*100) + (parseFloat(yjzz)*100)+ (parseFloat(wjzz)*100))/100;
|
|
1428
|
|
- zzzl = $scope.checkJqos(zzzl, 1);
|
|
|
1299
|
+
|
|
|
1300
|
+
|
|
|
1301
|
+ var zzzl = ((parseFloat($scope.qualitycheckInspection.impurityBranPowder)*100) + (parseFloat($scope.qualitycheckInspection.impurityOrganic)*100)+
|
|
|
1302
|
+ (parseFloat($scope.qualitycheckInspection.impurityInorganic)*100))/100;
|
|
|
1303
|
+ //zzzl = $scope.checkJqos(zzzl, 1);
|
|
1429
|
1304
|
$scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
|
|
1430
|
|
- }
|
|
|
1305
|
+
|
|
1431
|
1306
|
|
|
1432
|
1307
|
//zzzl.toFixed(1);
|
|
1433
|
1308
|
//$scope.qualitycheckInspection.impurityTotal = $scope.getMath1($scope.qualitycheckInspection.impurityTotal);
|
|
1434
|
1309
|
//不完善粒总量=含量+未熟粒+虫蚀粒+病斑粒+糙米粒+生霉粒
|
|
1435
|
|
- if(hl == null || hl == undefined){
|
|
1436
|
|
- hl = 0;
|
|
1437
|
|
- }
|
|
1438
|
|
- if(wsl == null || wsl == undefined){
|
|
1439
|
|
- wsl = 0;
|
|
1440
|
|
- }
|
|
1441
|
|
- if(csl == null || csl == undefined){
|
|
1442
|
|
- csl = 0;
|
|
1443
|
|
- }
|
|
1444
|
|
- if(bbl == null || bbl == undefined){
|
|
1445
|
|
- bbl = 0;
|
|
1446
|
|
- }
|
|
1447
|
|
- if(cml == null || cml == undefined){
|
|
1448
|
|
- cml = 0;
|
|
1449
|
|
- }
|
|
1450
|
|
- if(sml == null || sml == undefined){
|
|
1451
|
|
- sml = 0;
|
|
1452
|
|
- }
|
|
1453
|
1310
|
|
|
1454
|
|
- if(hl == 0 && wsl == 0 && csl == 0 && bbl == 0 && cml == 0 && sml == 0){
|
|
1455
|
|
- bwslzl = null;
|
|
1456
|
|
- $scope.qualitycheckInspection.imperfectgrainsTotal = bwslzl;
|
|
1457
|
|
- }else{
|
|
1458
|
|
- var bwslzl = ((parseFloat(hl)*100) + (parseFloat(wsl)*100) + (parseFloat(csl)*100) + (parseFloat(bbl)*100) + (parseFloat(cml)*100) + (parseFloat(sml)*100))/100;
|
|
1459
|
|
- bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
|
1311
|
+
|
|
|
1312
|
+ var bwslzl = ((parseFloat($scope.qualitycheckInspection.imperfectgrainsContent)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsImmaturegrain)*100) +
|
|
|
1313
|
+ (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) +
|
|
|
1314
|
+ (parseFloat($scope.qualitycheckInspection.imperfectgrainsBrownrice)*100) + (parseFloat($scope.qualitycheck.mildewCount)*100))/100;
|
|
|
1315
|
+ //bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
1460
|
1316
|
$scope.qualitycheckInspection.imperfectgrainsTotal = $scope.getMath1(bwslzl);
|
|
1461
|
|
- }
|
|
|
1317
|
+
|
|
1462
|
1318
|
|
|
1463
|
1319
|
|
|
1464
|
1320
|
//碎米 = 大碎米 + 小碎米；
|
|
1465
|
|
- if(dsm == null || dsm == undefined){
|
|
1466
|
|
- dsm = 0;
|
|
1467
|
|
- }
|
|
1468
|
|
- if(xsm == null || xsm == undefined){
|
|
1469
|
|
- xsm = 0;
|
|
1470
|
|
- }
|
|
1471
|
1321
|
|
|
1472
|
|
- if(xsm == 0 && dsm == 0){
|
|
1473
|
|
- bwslzl = null;
|
|
1474
|
|
- $scope.qualitycheckInspection.brokenriceTotal = bwslzl;
|
|
1475
|
|
- }else{
|
|
1476
|
|
- var bwslzl = ((parseFloat(dsm)*100) + (parseFloat(xsm)*100))/100;
|
|
1477
|
|
- bwslzl = $scope.checkJqos(bwslzl, 1);
|
|
1478
|
|
- $scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(bwslzl);
|
|
1479
|
|
- }
|
|
|
1322
|
+ var sm = ((parseFloat($scope.qualitycheckInspection.brokenriceBig)*100) + (parseFloat($scope.qualitycheckInspection.brokenriceSmall)*100))/100;
|
|
|
1323
|
+ //sm = $scope.checkJqos(sm, 1);
|
|
|
1324
|
+ $scope.qualitycheckInspection.brokenriceTotal = $scope.getMath1(sm);
|
|
|
1325
|
+
|
|
1480
|
1326
|
}else if(pz == "7051" || pz == "7038"){
|
|
1481
|
|
- if($scope.qualitycheck.water != null){
|
|
|
1327
|
+
|
|
1482
|
1328
|
var sf = parseFloat($scope.qualitycheck.water);//水分
|
|
1483
|
|
- sf = $scope.checkJqos(sf,1);
|
|
|
1329
|
+ //sf = $scope.checkJqos(sf,1);
|
|
1484
|
1330
|
$scope.qualitycheck.water = $scope.getMath1(sf);
|
|
1485
|
|
- }
|
|
|
1331
|
+
|
|
|
1332
|
+ }else if(pz == "2777"){//大豆
|
|
|
1333
|
+
|
|
|
1334
|
+ var sf = parseFloat($scope.qualitycheck.water);//水分
|
|
|
1335
|
+ $scope.qualitycheck.water = $scope.getMath1(sf);
|
|
|
1336
|
+
|
|
|
1337
|
+ var wzll = parseFloat($scope.qualitycheck.goodpart);//完整粒率
|
|
|
1338
|
+ $scope.qualitycheck.goodpart = $scope.getMath1(wzll);
|
|
|
1339
|
+
|
|
|
1340
|
+ var wsll = parseFloat($scope.qualitycheckInspection.immatureGrainRate);//未熟粒率
|
|
|
1341
|
+ $scope.qualitycheckInspection.immatureGrainRate = $scope.getMath1(wsll);
|
|
|
1342
|
+
|
|
|
1343
|
+ var psl = parseFloat($scope.qualitycheckInspection.crushingRate);//破碎率
|
|
|
1344
|
+ $scope.qualitycheckInspection.crushingRate = $scope.getMath1(psl);
|
|
|
1345
|
+
|
|
|
1346
|
+
|
|
|
1347
|
+ var yjzz = parseFloat($scope.qualitycheckInspection.impurityOrganic);//有机杂质
|
|
|
1348
|
+ $scope.qualitycheckInspection.impurityOrganic = $scope.getMath(yjzz);
|
|
|
1349
|
+
|
|
|
1350
|
+ var wjzz = parseFloat($scope.qualitycheckInspection.impurityInorganic);//无机杂质
|
|
|
1351
|
+ $scope.qualitycheckInspection.impurityInorganic = $scope.getMath(wjzz);
|
|
|
1352
|
+
|
|
|
1353
|
+
|
|
|
1354
|
+ var zzzl = ((parseFloat(yjzz)*100) + (parseFloat(wjzz)*100))/100;
|
|
|
1355
|
+ $scope.qualitycheckInspection.impurityTotal = isNaN(zzzl) ? '0.0' : $scope.getMath1(zzzl);
|
|
|
1356
|
+
|
|
|
1357
|
+ var czfhl = parseFloat($scope.qualitycheckInspection.crudeFatContent);//粗脂肪含量（干基）
|
|
|
1358
|
+ $scope.qualitycheckInspection.crudeFatContent = $scope.getMath1(czfhl);
|
|
|
1359
|
+
|
|
|
1360
|
+
|
|
|
1361
|
+ var rssl = parseFloat($scope.qualitycheck.hotDamageRatio);//热损伤粒
|
|
|
1362
|
+ $scope.qualitycheck.hotDamageRatio = $scope.getMath(rssl);
|
|
|
1363
|
+
|
|
|
1364
|
+ var csl = parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel);//虫蚀粒%
|
|
|
1365
|
+ $scope.qualitycheckInspection.imperfectgrainsInjuredkernel = $scope.getMath(csl);
|
|
|
1366
|
+
|
|
|
1367
|
+
|
|
|
1368
|
+ var bbl = parseFloat($scope.qualitycheckInspection.imperfectgrainsScab);//病斑粒
|
|
|
1369
|
+ $scope.qualitycheckInspection.imperfectgrainsScab = $scope.getMath(bbl);
|
|
|
1370
|
+
|
|
|
1371
|
+ var syzdl = parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel);//生芽、涨大粒
|
|
|
1372
|
+ $scope.qualitycheckInspection.imperfectgrainsSproutedkernel = $scope.getMath(syzdl);
|
|
|
1373
|
+
|
|
|
1374
|
+ var sml = parseFloat($scope.qualitycheck.mildewCount);//生霉粒%
|
|
|
1375
|
+ $scope.qualitycheck.mildewCount = $scope.getMath(sml);
|
|
|
1376
|
+
|
|
|
1377
|
+ var dsl = parseFloat($scope.qualitycheckInspection.imperfectgrainsFrostbite);//冻伤粒%
|
|
|
1378
|
+ $scope.qualitycheckInspection.imperfectgrainsFrostbite = $scope.getMath(dsl);
|
|
|
1379
|
+
|
|
|
1380
|
+
|
|
|
1381
|
+ var ssllzl = ((parseFloat($scope.qualitycheck.hotDamageRatio)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsInjuredkernel)*100)+
|
|
|
1382
|
+ (parseFloat($scope.qualitycheckInspection.imperfectgrainsScab)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsSproutedkernel)*100) +
|
|
|
1383
|
+ (parseFloat($scope.qualitycheck.mildewCount)*100) + (parseFloat($scope.qualitycheckInspection.imperfectgrainsFrostbite)*100))/100;
|
|
|
1384
|
+ $scope.qualitycheckInspection.imperfectgrainsTotal = isNaN(ssllzl) ? '0.0' : $scope.getMath1(ssllzl);
|
|
|
1385
|
+
|
|
|
1386
|
+ var zdy = parseFloat($scope.qualitycheckInspection.inputTwo);//自定义属性
|
|
|
1387
|
+ $scope.qualitycheckInspection.inputTwo = $scope.getMath1(zdy);
|
|
1486
|
1388
|
}
|
|
1487
|
1389
|
};
|
|
1488
|
1390
|
|
|
|
@@ -1512,6 +1414,7 @@ angular.module('app.storage')
|
|
1512
|
1414
|
// 提交表单
|
|
1513
|
1415
|
var validator = $("#qualitycheck-form").validate();
|
|
1514
|
1416
|
$scope.saveData = function (checktype) {
|
|
|
1417
|
+ $scope.zjzl();
|
|
1515
|
1418
|
var zblbId ="";
|
|
1516
|
1419
|
var storeQualityId ="";
|
|
1517
|
1420
|
if($scope.qualitycheck.zblb == null || $scope.qualitycheck.zblb == ""){
|
gaodd