diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java b/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java index b03db99..188033a 100644 --- a/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java +++ b/qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java @@ -50,5 +50,4 @@ public class QmsInspecJobDTO extends QmsInspecJob { private String inspectLevel; private String supplierBatch; private String currentResponsible; - } diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java index a90e970..80354b0 100644 --- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java +++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.iep.abn.dto.AbnDetailDTO; import com.foreverwin.iep.abn.dto.AbnMasterDTO; +import com.foreverwin.iep.abn.entity.AbnMaster; import com.foreverwin.iep.abn.feign.RemoteAbnService; import com.foreverwin.iep.common.base.FrontPage; import com.foreverwin.iep.common.constant.BaseConstants; @@ -131,7 +132,16 @@ public class QmsInspecJobServiceImpl extends ServiceImpl response = baseMapper.selectIQC(page, dto); + response.getRecords().forEach(qmsInspecJobDTO -> { + List detailList = qmsInspecDetailService.selectAll(qmsInspecJobDTO.getHandle()); + qmsInspecJobDTO.setInspecResult(detailList.stream().allMatch(x-> "1".equals(x.getResult()))? "OK" : "NG"); + + if(StrUtil.isNotBlank(qmsInspecJobDTO.getReasonCodeBo())){ + qmsInspecJobDTO.setReasonCode(HandleBoProcessor.trimHandle(qmsInspecJobDTO.getReasonCodeBo())); + } + }); + return response; }else { return baseMapper.selectAll(page, dto); } @@ -739,6 +749,11 @@ public class QmsInspecJobServiceImpl extends ServiceImpl wmsReceiptDetailDTO = remoteWmsReceiptDetailService.getById(qmsInspecJob.getTargetBo()); + String itemBo = wmsReceiptDetailDTO.getData().getItemBo(); + item = HandleBoProcessor.trimHandle(itemBo); + itemRevision = HandleBoProcessor.trimRevision(itemBo); + List detailList = qmsInspecDetailService.selectAll(inspecJobBo); List descList = new ArrayList<>(); detailList.forEach(detail->{ @@ -797,6 +812,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpllambdaUpdate() @@ -815,7 +831,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpl wmsReceiptDetailDTO = remoteWmsReceiptDetailService.getById(qmsInspecJob.getTargetBo(), SecurityConstants.FROM_IN); + R wmsReceiptDetailDTO = remoteWmsReceiptDetailService.getById(qmsInspecJob.getTargetBo()); InspecJob job = new InspecJob(); job.setQcPlan(HandleBoProcessor.trimHandle(qmsInspecJob.getQcPlanBo()));