From 786385b2e077303d6c78fbd84c1913007f32caaf Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 29 Jul 2024 09:17:44 +0800 Subject: [PATCH] =?UTF-8?q?MES=E5=8F=AF=E7=96=91=E5=93=81=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E4=BF=AE=E6=94=B9=20=E8=BF=94=E5=B7=A5=E6=95=B0/?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E6=95=B0/=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedulejob/MesQmsSuspiciousJob.java | 2 +- .../serviceimpl/base/MesQmsSuspiciousService.java | 25 +++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java index 6efbba4..1482100 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java @@ -97,7 +97,7 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { partInspectionList.add(next); } - + LOGGER.info("MES可疑品汇总 ----- partInspectionList{}",partInspectionList.size()); qmsSuspiciousService.doQmsSuspiciousByPartInspection(partInspectionList, organizeCode); for (MesPartInspection mesPartInspection : mesPartInspectionList) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java index e7b9fb5..f3b5f72 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java @@ -93,15 +93,10 @@ public class MesQmsSuspiciousService extends BaseMesService im mesQmsSuspicious.setOrganizeCode(organizeCode); mesQmsSuspicious.setInspectionDate(next.getInspectionDate()); - //检验数量是全部数量汇总 - double sumQty = mesPartInspections.stream().mapToDouble(MesPartInspection::getQty).sum(); - mesQmsSuspicious.setInspectionQty((int) sumQty); //一次合格数 nc_status=10 inspection_status=10 double qualifiedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == 10 && m.getInspectionStatus() == 10).mapToDouble(MesPartInspection::getQty).sum(); mesQmsSuspicious.setQualifiedQty((int) qualifiedQty); - //不合格数 nc_status=10 inspection_status=20 - double unqualifiedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == 10 && m.getInspectionStatus() == 20).mapToDouble(MesPartInspection::getQty).sum(); - mesQmsSuspicious.setUnqualifiedQty((int) unqualifiedQty); + //误判数量 nc_status=30 inspection_status=20 double misjudgmentQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == 30).mapToDouble(MesPartInspection::getQty).sum(); mesQmsSuspicious.setMisjudgmentQty((int) misjudgmentQty); @@ -136,11 +131,25 @@ public class MesQmsSuspiciousService extends BaseMesService im reworkQty += mesPartInspection.getQty(); } } - mesQmsSuspicious.setReworkQty(reworkQty); + //返工后报废数 + mesQmsSuspicious.setReworkScrapped(0); + //返工合格数 mesQmsSuspicious.setReworkQualified(reworkQualified); + //返工数=返工合格+返工报废数 + mesQmsSuspicious.setReworkQty(mesQmsSuspicious.getReworkScrapped()+mesQmsSuspicious.getReworkQualified()); +// mesQmsSuspicious.setReworkQty(reworkQty); + + // 不合格数 nc_status=10 inspection_status=20 +// double unqualifiedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == 10 && m.getInspectionStatus() == 20).mapToDouble(MesPartInspection::getQty).sum(); +// mesQmsSuspicious.setUnqualifiedQty((int) unqualifiedQty); + //不合格数=误判数+返工数+报废数 + mesQmsSuspicious.setUnqualifiedQty(mesQmsSuspicious.getMisjudgmentQty()+mesQmsSuspicious.getReworkQty()+mesQmsSuspicious.getScrappedQty()); + + //检验数量=一次合格数+不合格数 + mesQmsSuspicious.setInspectionQty(mesQmsSuspicious.getQualifiedQty()+mesQmsSuspicious.getUnqualifiedQty()); + mesQmsSuspicious.setReworkPending(reworkPending); mesQmsSuspicious.setNcPending(0); - mesQmsSuspicious.setReworkScrapped(0); mesQmsSuspicious.setPartNo(key); mesQmsSuspicious.setPartName(next.getPartName()); //缺陷分类，缺陷数量JOSN格式: