|
|
|
@ -200,6 +200,19 @@ public class QcProCheckServiceImpl implements QcProCheckService {
|
|
|
|
|
qcd.setDefectQualitys(defectInfo.getDefectQualitys());
|
|
|
|
|
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);
|
|
|
|
@ -245,14 +258,20 @@ public class QcProCheckServiceImpl implements QcProCheckService {
|
|
|
|
|
qcd.setDefectQualitys(defectInfo.getDefectQualitys());
|
|
|
|
|
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())){
|
|
|
|
|
String letter = GB2828Sampler.getSampleSizeLetter(qcd.getQuality().setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan());
|
|
|
|
|
int sampleSize = GB2828Sampler.getSampleSize(letter);
|
|
|
|
|
qcd.setSampleQuality(String.valueOf(sampleSize));
|
|
|
|
|
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);
|
|
|
|
|
List<QcCheckTaskDefect> defects = qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail);
|
|
|
|
|