mes/nalinv-qms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(IQC检验任务判定作业):MES-FW-FDS-QMS03-03-IQC检验任务判定作业-V1.0.docx

Browse Source 
1.調整調用remoteWmsReceiptDetailService格式

refs: #16314
This commit is contained in:
Paul 2023-09-14 08:55:11 +08:00
parent 6731b5af67
commit 629eeda77b
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecJobDTO.java
View File

@ -50,5 +50,4 @@ public class QmsInspecJobDTO extends QmsInspecJob {
private String inspectLevel;
private String supplierBatch;
private String currentResponsible;
}

20
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecJobServiceImpl.java
View File

@ -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<QmsInspecJobMapper, Qms
.collect(Collectors.toList()));
}
if("1".equals(dto.getInspecType())){
return baseMapper.selectIQC(page, dto);
IPage<QmsInspecJobDTO> response = baseMapper.selectIQC(page, dto);
response.getRecords().forEach(qmsInspecJobDTO -> {
List<QmsInspecDetailDTO> 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<QmsInspecJobMapper, Qms
abnType = "2";
detailType = "2";
R<WmsReceiptDetailDTO> wmsReceiptDetailDTO = remoteWmsReceiptDetailService.getById(qmsInspecJob.getTargetBo());
String itemBo = wmsReceiptDetailDTO.getData().getItemBo();
item = HandleBoProcessor.trimHandle(itemBo);
itemRevision = HandleBoProcessor.trimRevision(itemBo);
List<QmsInspecDetailDTO> detailList = qmsInspecDetailService.selectAll(inspecJobBo);
List<String> descList = new ArrayList<>();
detailList.forEach(detail->{
@ -797,6 +812,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
@Override
@Transactional
@GlobalTransactional
public void iqcCreateAbn( String inspecJobBo, String abnGroup, String reasonCode ) {
createAbn(inspecJobBo, abnGroup, reasonCode);
super.update(Wrappers.<QmsInspecJob>lambdaUpdate()
@ -815,7 +831,7 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
if("4".equals(inspecJob.getResult())){
//重验
QmsInspecJob qmsInspecJob = getById(inspecJobBo);
R<WmsReceiptDetailDTO> wmsReceiptDetailDTO = remoteWmsReceiptDetailService.getById(qmsInspecJob.getTargetBo(), SecurityConstants.FROM_IN);
R<WmsReceiptDetailDTO> wmsReceiptDetailDTO = remoteWmsReceiptDetailService.getById(qmsInspecJob.getTargetBo());
InspecJob job = new InspecJob();
job.setQcPlan(HandleBoProcessor.trimHandle(qmsInspecJob.getQcPlanBo()));