代码回退，逻辑有变待确认

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsSuspiciousService.java

@@ -77,7 +77,7 @@ public class MesQmsSuspiciousService extends BaseMesService<MesQmsSuspicious> im
                 MesPartInspection partInspectionDao = partInspectionRepository.getByProperty(packBeanNew);
                 String qmsTime = partInspection.getCreateDatetime().substring(0, 13) + ":00:00";
                 if (!StringUtil.isEmpty(partInspectionDao)) {
-                     qmsTime = partInspectionDao.getCreateDatetime().substring(0, 13) + ":00:00";
+                    qmsTime = partInspectionDao.getCreateDatetime().substring(0, 13) + ":00:00";
                 }
                 partInspectionNew.setInspectionDate(qmsTime);
                 mesPartInspectionsListTime.add(partInspectionNew);
@@ -93,10 +93,15 @@ 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);
@@ -131,25 +136,11 @@ public class MesQmsSuspiciousService extends BaseMesService<MesQmsSuspicious> im
                         reworkQty += mesPartInspection.getQty();
                     }
                 }
-                //返工后报废数
-                mesQmsSuspicious.setReworkScrapped(0);
-                //返工合格数
+                mesQmsSuspicious.setReworkQty(reworkQty);
                 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格式: