MES可疑品汇总修改 返工数/不合格数/检验数量逻辑

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) {

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<MesQmsSuspicious> 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<MesQmsSuspicious> 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格式: