diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index b61035380..a307a0f86 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -208,12 +208,13 @@ public class QcProCheckServiceImpl implements QcProCheckService { 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)); char eighthChar = dto.getMaterialCode().charAt(7); if(eighthChar == '1' &&StringUtils.isNotEmpty(String.valueOf(dto.getUmrez()))){ - qcd.setSampleQuality(String.valueOf(sampleSize*dto.getUmrez())); + BigDecimal result2 = qcd.getQuality().multiply(new BigDecimal(dto.getUmrez())); + letter = GB2828Sampler.getSampleSizeLetter(result2.setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan()); } + int sampleSize = GB2828Sampler.getSampleSize(letter); + qcd.setSampleQuality(String.valueOf(sampleSize)); } } } @@ -270,12 +271,13 @@ public class QcProCheckServiceImpl implements QcProCheckService { 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)); char eighthChar = dto.getMaterialCode().charAt(7); if(eighthChar == '1' &&StringUtils.isNotEmpty(String.valueOf(dto.getUmrez()))){ - qcd.setSampleQuality(String.valueOf(sampleSize*dto.getUmrez())); + BigDecimal result2 = qcd.getQuality().multiply(new BigDecimal(dto.getUmrez())); + letter = GB2828Sampler.getSampleSizeLetter(result2.setScale(0, RoundingMode.HALF_UP).intValue(), qcd.getSamplingPlan()); } + int sampleSize = GB2828Sampler.getSampleSize(letter); + qcd.setSampleQuality(String.valueOf(sampleSize)); } } }