From 7969709b5b9238beb5f67c64e96592727d7b9526 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 14 Aug 2025 17:35:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E6=8A=BD=E6=A3=80=E6=95=B0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcProCheckServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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)); } } }