抽样算法优化

master
Yangwl 4 days ago
parent 86179dbd1d
commit bb11a37b52

@ -200,6 +200,19 @@ public class QcProCheckServiceImpl implements QcProCheckService {
qcd.setDefectQualitys(defectInfo.getDefectQualitys()); qcd.setDefectQualitys(defectInfo.getDefectQualitys());
qcd.setClassTypeCodes(defectInfo.getClassId()); qcd.setClassTypeCodes(defectInfo.getClassId());
} }
if (qcd.getSampleNum() != null){
qcd.setSampleQuality(String.valueOf(qcd.getSampleNum()));
}
else if (qcd.getSampleNum() == null){
//抽样算法
if (StringUtils.isNotBlank(qcd.getSamplingPlan())){
if ((StringUtils.isEmpty(qcd.getSampleQuality()) || "0".equals(qcd.getSampleQuality()))){
String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan());
int sampleSize = GB2828Sampler.getSampleSize(letter);
qcd.setSampleQuality(String.valueOf(sampleSize));
}
}
}
} }
dto.setQcCheckTaskDetails(qcCheckTaskDetails); dto.setQcCheckTaskDetails(qcCheckTaskDetails);
@ -245,15 +258,21 @@ public class QcProCheckServiceImpl implements QcProCheckService {
qcd.setDefectQualitys(defectInfo.getDefectQualitys()); qcd.setDefectQualitys(defectInfo.getDefectQualitys());
qcd.setClassTypeCodes(defectInfo.getClassId()); qcd.setClassTypeCodes(defectInfo.getClassId());
} }
if (StringUtils.isNotBlank(qcd.getSamplingPlan())){ if (qcd.getSampleNum() != null){
qcd.setSampleQuality(String.valueOf(qcd.getSampleNum()));
}
else if (qcd.getSampleNum() == null){
//抽样算法 //抽样算法
if (StringUtils.isEmpty(qcd.getSampleQuality()) || "0".equals(qcd.getSampleQuality())){ if (StringUtils.isNotBlank(qcd.getSamplingPlan())){
if ((StringUtils.isEmpty(qcd.getSampleQuality()) || "0".equals(qcd.getSampleQuality()))){
String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan()); String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan());
int sampleSize = GB2828Sampler.getSampleSize(letter); int sampleSize = GB2828Sampler.getSampleSize(letter);
qcd.setSampleQuality(String.valueOf(sampleSize)); qcd.setSampleQuality(String.valueOf(sampleSize));
} }
} }
} }
}
dto.setQcCheckTaskDetails(qcCheckTaskDetails); dto.setQcCheckTaskDetails(qcCheckTaskDetails);
List<QcCheckTaskDefect> defects = qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail); List<QcCheckTaskDefect> defects = qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail);
if (CollectionUtils.isEmpty(defects)) { if (CollectionUtils.isEmpty(defects)) {

Loading…
Cancel
Save