diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java index 3561149..93304ed 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesQmsScrapService.java @@ -64,7 +64,7 @@ public class MesQmsScrapService extends BaseMesService implements I mesQmsScrap.setAsnNo(""); mesQmsScrap.setSource("MES"); double sum = mesPartInspections.stream().mapToDouble(MesPartInspection::getRejectQty).sum(); - mesQmsScrap.setRejectQty((int) sum); + mesQmsScrap.setRejectQty(sum); mesQmsScrap.setPartNo(keyPartNo); mesQmsScrap.setPartName(next.getPartName()); String defectTypeName = mesPartInspectionDetails.stream().map(MesPartInspectionDetail::getDefectTypeName).collect(Collectors.joining(";")); 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 d2018a6..2d12edf 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; import cn.estsh.i3plus.ext.mes.api.base.IMesQmsSuspiciousService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; @@ -153,28 +154,28 @@ public class MesQmsSuspiciousService extends BaseMesService im //检验数量是全部数量汇总 double sumQty = mesPartInspections.stream().mapToDouble(MesPartInspection::getQty).sum(); - mesQmsSuspicious.setInspectionQty((int) sumQty); + mesQmsSuspicious.setInspectionQty(sumQty); //一次合格数 nc_status=10 inspection_status=10 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); + mesQmsSuspicious.setQualifiedQty(qualifiedQty); //不合格数 nc_status=10 inspection_status=20 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); + mesQmsSuspicious.setUnqualifiedQty(unqualifiedQty); //误判数量 nc_status=30 inspection_status=20 double misjudgmentQty = mesPartInspections.stream().filter(m -> m.getNcStatus() == MesExtEnumUtil.PART_INSPECTION_NC_STATUS.RELEASE.getValue()).mapToDouble(MesPartInspection::getQty).sum(); - mesQmsSuspicious.setMisjudgmentQty((int) misjudgmentQty); + mesQmsSuspicious.setMisjudgmentQty(misjudgmentQty); //一次报废数 nc_status=40 inspection_status=20 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); + mesQmsSuspicious.setScrappedQty(scrappedQty); //返工合格数 nc_status=50 返工单 status=20 - Integer reworkQualified = 0; + Double reworkQualified = new Double(0); //返工pending（创建返工单，未处理） - Integer reworkPending = 0; + Double reworkPending = new Double(0); //返工数 - Integer reworkQty = 0; + Double reworkQty = new Double(0); List mesPartInspectionDetails = new ArrayList<>(); for (MesPartInspection mesPartInspection : mesPartInspections) { if (!StringUtil.isEmpty(idDetailListMap.get(mesPartInspection.getId()))) { @@ -188,21 +189,21 @@ public class MesQmsSuspiciousService extends BaseMesService im if (!StringUtil.isEmpty(reworkTask)) { //返工是否完成 if (reworkTask.getStatus() == MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue()) { - reworkQualified += mesPartInspection.getQty(); + reworkQualified = MathOperation.add(reworkQualified, mesPartInspection.getQty()); } else { - reworkPending += mesPartInspection.getQty(); + reworkPending = MathOperation.add(reworkPending, mesPartInspection.getQty()); } } else { - reworkPending += mesPartInspection.getQty(); + reworkPending = MathOperation.add(reworkPending, mesPartInspection.getQty()); } - reworkQty += mesPartInspection.getQty(); + reworkQty = MathOperation.add(reworkQty, mesPartInspection.getQty()); } } mesQmsSuspicious.setReworkQty(reworkQty); mesQmsSuspicious.setReworkQualified(reworkQualified); mesQmsSuspicious.setReworkPending(reworkPending); - mesQmsSuspicious.setNcPending(0); - mesQmsSuspicious.setReworkScrapped(0); + mesQmsSuspicious.setNcPending(new Double(0)); + mesQmsSuspicious.setReworkScrapped(new Double(0)); mesQmsSuspicious.setPartNo(key); mesQmsSuspicious.setPartName(next.getPartName()); //缺陷分类，缺陷数量JOSN格式:【批次＆单件数量汇总时需要根据检验时间段合并】 diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java index f34cbf3..cc42810 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesInputDefectRecordServiceImpl.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesConfigService; import cn.estsh.i3plus.ext.mes.api.base.IMesPartSapService; import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCenterService; import cn.estsh.i3plus.ext.mes.api.busi.IMesInputDefectRecordService; -import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -20,7 +19,6 @@ import cn.estsh.i3plus.pojo.mes.repository.MesPartInspectionDetailRepository; import cn.estsh.i3plus.pojo.mes.repository.MesPartInspectionRepository; import cn.estsh.i3plus.pojo.mes.repository.MesProduceSnRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; -import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ResultBean; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -102,7 +100,7 @@ public class MesInputDefectRecordServiceImpl implements IMesInputDefectRecordSer partInspection.setInspectionStatus(MesExtEnumUtil.PART_INSPECTION_STATUS.FAIL.getValue()); partInspection.setNcStatus(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue()); partInspection.setSn(sn); - partInspection.setQty(MesCommonConstant.TRUE_INTEGER); + partInspection.setQty(new Double(1)); partInspection.setSourceType(MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()); ConvertBean.serviceModelInitialize(partInspection, userName); return partInspection;