代码评审问题修改

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartInspectionRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.init.ApplicationProperties;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -93,7 +94,7 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob {
                     List<MesPartInspection> partInspectionList = new ArrayList<>();
                     //排序取单件逻辑未同步的一条最新的
                     Map<String, List<MesPartInspection>> partSnMap = mesPartInspectionList.stream()
-                            .filter(p -> p.getSourceType() == 10)
+                            .filter(p -> p.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue())
                             .collect(Collectors.groupingBy(p -> p.getSn() + "-" + p.getPartNo()));
                     for (Map.Entry<String, List<MesPartInspection>> stringListEntry : partSnMap.entrySet()) {
                         List<MesPartInspection> value = stringListEntry.getValue();
@@ -103,7 +104,7 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob {
                     }
                     //批次逻辑的全部汇总数量 42692 MES:可疑品汇总逻辑更新
                     Map<String, List<MesPartInspection>> partMap = mesPartInspectionList.stream()
-                            .filter(p -> p.getSourceType() == 20)
+                            .filter(p -> p.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.LOT.getValue())
                             .collect(Collectors.groupingBy(MesPartInspection::getPartNo));
                     for (Map.Entry<String, List<MesPartInspection>> stringListEntry : partMap.entrySet()) {
                         partInspectionList.addAll(stringListEntry.getValue());

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

@@ -104,7 +104,7 @@ public class MesQmsSuspiciousService extends BaseMesService<MesQmsSuspicious> im
                                 BeanUtils.copyProperties(mesPartInspection, partInspectionNew2);
                                 qmsTime = mesPartInspection.getCreateDatetime().substring(0, 13) + ":00:00";
                                 partInspectionNew2.setInspectionDate(qmsTime);
-                                if (mesPartInspection.getSourceType()==10){
+                                if (mesPartInspection.getSourceType()==MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()){
                                     //如果条码重复出现时，对应最早时间段的零件不是最早，则不统计在汇总数据中
                                     DdlPackBean packBeanSn = DdlPackBean.getDdlPackBean(organizeCode);
                                     DdlPreparedPack.getStringEqualPack(mesPartInspection.getSn(), "sn", packBeanSn);
@@ -155,16 +155,18 @@ public class MesQmsSuspiciousService extends BaseMesService<MesQmsSuspicious> im
                 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();
+                double qualifiedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue()
+                        && m.getInspectionStatus() == MesExtEnumUtil.PART_INSPECTION_STATUS.QUALIFIED.getValue()).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();
+                double unqualifiedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue()
+                        && m.getInspectionStatus() == MesExtEnumUtil.PART_INSPECTION_STATUS.FAIL.getValue()).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();
+                double misjudgmentQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.RELEASE.getValue()).mapToDouble(MesPartInspection::getQty).sum();
                 mesQmsSuspicious.setMisjudgmentQty((int) misjudgmentQty);
                 //一次报废数  nc_status=40 inspection_status=20
-                double scrappedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == 40 && m.getInspectionStatus() == 20).mapToDouble(MesPartInspection::getQty).sum();
+                double scrappedQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.SCRAP.getValue() && m.getInspectionStatus() == MesExtEnumUtil.PART_INSPECTION_STATUS.FAIL.getValue()).mapToDouble(MesPartInspection::getQty).sum();
                 mesQmsSuspicious.setScrappedQty((int) scrappedQty);
 
                 //返工合格数 nc_status=50 返工单 status=20