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

feat(IQC检验任务主画面):新增IQC检验任务主画面

Browse Source 
1.新增IQC检验任务主画面

refs: #16202
This commit is contained in:
Paul 2023-09-08 11:45:22 +08:00
parent 49ec952cd8
commit be2b564f3d
11 changed files with 123 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecDetailDTO.java
View File

@ -5,6 +5,7 @@ import com.foreverwin.iep.qms.entity.QmsInspecResult;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -33,4 +34,6 @@ public class QmsInspecDetailDTO extends QmsInspecDetail {
private QmsInspecResult contentResult;
private List<QmsInspecFactorDTO> factorList;
private List<QmsInspecResultDTO> inspecResultList = new ArrayList<>();
}

16
qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecResultDTO.java Normal file
View File

@ -0,0 +1,16 @@
package com.foreverwin.iep.qms.dto;
import com.foreverwin.iep.qms.entity.QmsInspecResult;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
public class QmsInspecResultDTO extends QmsInspecResult {
private List<QmsInspecResultNccodeDTO> qmsInspecResultNccodeList = new ArrayList<>();
}

20
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsInspecJobController.java
View File

@ -59,6 +59,13 @@ public class QmsInspecJobController {
return R.ok(qmsInspecJobService.getResrce(page, resrce, operation));
}
@ApiOperation(value = "收料单号開窗", notes = "收料单号開窗")
@GetMapping("/receiptNo/page")
public R getReceiptNo(FrontPage page,
@RequestParam(value = "receiptNo", required = false) String receiptNo) {
return R.ok(qmsInspecJobService.getReceiptNo(page, receiptNo));
}
@ApiOperation(value = "檢驗任務創建", notes = "檢驗任務創建")
@PostMapping("/create")
public R create(@RequestBody InspecJob inspecJob) {
@ -84,6 +91,12 @@ public class QmsInspecJobController {
return R.ok(qmsInspecDetailService.getDetailResult(inspecDetailBo));
}
@ApiOperation(value = "IQC檢驗任務明細-檢驗項目查詢", notes = "IQC檢驗任務明細-檢驗項目查詢")
@GetMapping("/iqc/detail/result/{inspecDetailBo}")
public R getIQCDetailResult(@PathVariable("inspecDetailBo") String inspecDetailBo) {
return R.ok(qmsInspecDetailService.getIQCDetailResult(inspecDetailBo));
}
@ApiOperation(value = "檢驗任務明細-檢驗項目結果保存", notes = "檢驗任務明細-檢驗項目結果保存")
@PostMapping("/detail/result")
public R saveDetailResult(@RequestBody QmsInspecDetailDTO dto) {
@ -91,6 +104,13 @@ public class QmsInspecJobController {
return R.ok();
}
@ApiOperation(value = "IQC檢驗任務明細-檢驗項目結果保存", notes = "IQC檢驗任務明細-檢驗項目結果保存")
@PostMapping("/iqc/detail/result")
public R saveIQCResult(@RequestBody QmsInspecDetailDTO dto) {
qmsInspecDetailService.saveIQCResult(dto);
return R.ok();
}
@ApiOperation(value = "檢驗任務-不合格代碼", notes = "檢驗任務-不合格代碼")
@GetMapping("/nc/{inspecJobBo}")
public R getNc(@PathVariable("inspecJobBo") String inspecJobBo) {

4
qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecDetailService.java
View File

@ -19,4 +19,8 @@ public interface QmsInspecDetailService extends IService<QmsInspecDetail> {
QmsInspecDetailDTO getDetailResult(String inspecDetailBo);
void saveResult(QmsInspecDetailDTO dto);
QmsInspecDetailDTO getIQCDetailResult(String inspecDetailBo);
void saveIQCResult(QmsInspecDetailDTO dto);
}

3
qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsInspecJobService.java
View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.iep.common.base.FrontPage;
import com.foreverwin.iep.qms.domain.InspecJob;
import com.foreverwin.iep.qms.domain.Item;
import com.foreverwin.iep.qms.domain.ReceiptInfo;
import com.foreverwin.iep.qms.domain.Resource;
import com.foreverwin.iep.qms.dto.QmsInspecJobDTO;
import com.foreverwin.iep.qms.dto.QmsInspecResultNccodeDTO;
@ -24,6 +25,8 @@ public interface QmsInspecJobService extends IService<QmsInspecJob> {
IPage<Resource> getResrce(FrontPage page, String resrce, String operation);
IPage<ReceiptInfo> getReceiptNo( FrontPage page, String receiptNo);
IPage<QmsInspecJobDTO> selectAll(FrontPage page, QmsInspecJobDTO dto);
QmsInspecJob create(InspecJob inspecJob);

52
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsInspecDetailServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.foreverwin.iep.prd.entity.NcBasis;
import com.foreverwin.iep.prd.mapper.NcBasisMapper;
import com.foreverwin.iep.qms.dto.QmsInspecDetailDTO;
import com.foreverwin.iep.qms.dto.QmsInspecFactorDTO;
import com.foreverwin.iep.qms.dto.QmsInspecResultDTO;
import com.foreverwin.iep.qms.dto.QmsInspecResultNccodeDTO;
import com.foreverwin.iep.qms.entity.*;
import com.foreverwin.iep.qms.mapper.QmsInspecDetailMapper;
@ -221,6 +222,57 @@ public class QmsInspecDetailServiceImpl extends ServiceImpl<QmsInspecDetailMappe
qmsInspecResultNccodeService.saveBatch(inspecResultNcList);
}
@Override
public QmsInspecDetailDTO getIQCDetailResult( String inspecDetailBo ) {
QmsInspecDetailDTO inspecDetail = baseMapper.selectDetail(inspecDetailBo);
List<QmsInspecResult> inspecResults = qmsInspecResultService.list(Wrappers.lambdaQuery(QmsInspecResult.class)
.eq(QmsInspecResult::getInspecDetailBo, inspecDetailBo));
inspecDetail.setFactorList(qmsInspecFactorService.selectAll(inspecDetailBo));
inspecResults.forEach(result ->{
QmsInspecResultDTO resultDTO = new QmsInspecResultDTO();
BeanUtils.copyProperties(result, resultDTO);
resultDTO.setQmsInspecResultNccodeList(qmsInspecResultNccodeService.selectAll(result.getSid()));
inspecDetail.getInspecResultList().add(resultDTO);
});
return inspecDetail;
}
@Override
@Transactional
public void saveIQCResult( QmsInspecDetailDTO dto ) {
String inspecJobBo = dto.getInspecJobBo();
String inspecDetailBo = dto.getHandle();
List<QmsInspecFactorDTO> factorList = dto.getFactorList();
List<QmsInspecResultDTO> resultList = dto.getInspecResultList();
remove(dto.getHandle());
updateJobStatus(inspecJobBo);
saveFactor(inspecDetailBo, factorList);
List<QmsInspecResult> inspecResultList = new ArrayList<>();
List<QmsInspecResultNccode> inspecResultNcList = new ArrayList<>();
resultList.forEach(result->{
result.setSid(SidUtils.genSid());
result.setInspecDetailBo(dto.getHandle());
inspecResultList.add(result);
result.getQmsInspecResultNccodeList().forEach(ncCode -> {
ncCode.setSid(SidUtils.genSid());
ncCode.setInspecResultSid(result.getSid());
inspecResultNcList.add(ncCode);
});
});
updateDetail(dto.getHandle());
qmsInspecResultService.saveBatch(inspecResultList);
qmsInspecResultNccodeService.saveBatch(inspecResultNcList);
}
private QmsInspecSn filterSn(List<QmsInspecSn> inspecSns, String seq) {
return inspecSns.stream()
.filter(filters -> filters.getSeq().equals(seq))

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

@ -33,6 +33,7 @@ import com.foreverwin.iep.qms.constant.Factor;
import com.foreverwin.iep.qms.constant.Freq;
import com.foreverwin.iep.qms.domain.InspecJob;
import com.foreverwin.iep.qms.domain.Item;
import com.foreverwin.iep.qms.domain.ReceiptInfo;
import com.foreverwin.iep.qms.domain.Resource;
import com.foreverwin.iep.qms.dto.*;
import com.foreverwin.iep.qms.entity.*;
@ -108,6 +109,11 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
return baseMapper.selectResrce(page, site, resrce, operation);
}
@Override
public IPage<ReceiptInfo> getReceiptNo( FrontPage page, String receiptNo ) {
return baseMapper.selectReceiptNo(page, TenantContextHolder.getTenantId(), receiptNo);
}
@Override
public IPage<QmsInspecJobDTO> selectAll(FrontPage page, QmsInspecJobDTO dto) {
dto.setSite(TenantContextHolder.getTenantId());
@ -121,7 +127,11 @@ public class QmsInspecJobServiceImpl extends ServiceImpl<QmsInspecJobMapper, Qms
.map(SysRoleDTO::getRoleCode)
.collect(Collectors.toList()));
}
return baseMapper.selectAll(page, dto);
if("1".equals(dto.getInspecType())){
return baseMapper.selectIQC(page, dto);
}else {
return baseMapper.selectAll(page, dto);
}
}
@Transactional(rollbackFor = Exception.class)

4
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcPlanServiceImpl.java
View File

@ -24,6 +24,7 @@ import com.foreverwin.mom.admin.api.feign.RemoteRoleService;
import com.foreverwin.mom.common.core.constant.SecurityConstants;
import com.foreverwin.mom.common.core.exception.BusinessException;
import com.foreverwin.mom.common.core.util.I18nUtil;
import com.foreverwin.mom.common.core.util.R;
import com.foreverwin.mom.common.data.tenant.TenantContextHolder;
import com.foreverwin.mom.common.security.util.SecurityUtils;
import lombok.AllArgsConstructor;
@ -69,6 +70,9 @@ public class QmsQcPlanServiceImpl extends ServiceImpl<QmsQcPlanMapper, QmsQcPlan
qcPlan.setQcPlanDetailList(qmsQcPlanDetailMapper.getFullDetailByQcPlanBo(handle));
qcPlan.setCreatedJob(getQmsInspecJobService().count(Wrappers.<QmsInspecJob>lambdaQuery()
.eq(QmsInspecJob::getQcPlanBo, handle)) > 0);
return qcPlan;
}

2
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsSamplePlanServiceImpl.java
View File

@ -274,7 +274,7 @@ public class QmsSamplePlanServiceImpl extends ServiceImpl<QmsSamplePlanMapper, Q
.findFirst()
.orElse(null);
if (ObjectUtil.isNull(qmsSamplePlanCustomize)) {
return null;
throw BusinessException.build(I18nUtil.getI18nText("qms.inspec.job.error7"));
}
BigDecimal sampleSize = new BigDecimal(qmsSamplePlanCustomize.getSampleSize());

1
qms-core/src/main/resources/qms/i18n/messages.properties
View File

@ -21,6 +21,7 @@ qms.inspec.job.error3=\u7F16\u53F7\u89C4\u5219\u7C7B\u578B\u300E{0}\u300F\u4E0D\
qms.inspec.job.error4=\u7528\u6237\u6240\u914D\u7F6E\u7684\u89D2\u8272\uFF0C\u4E0D\u5C5E\u4E8E\u68C0\u9A8C\u4EBA\u5458\u7FA4\u7EC4\u300E{0}\u300F\uFF0C\u4E0D\u53EF\u6267\u884C\u5B8C\u6210
qms.inspec.job.error5=\u7528\u6237\u6240\u914D\u7F6E\u7684\u89D2\u8272\uFF0C\u4E0D\u5C5E\u4E8E\u68C0\u9A8C\u4EBA\u5458\u7FA4\u7EC4\u300E{0}\u300F\u7684\u7236\u9636\u7FA4\u7EC4\u300E{1}\u300F\uFF0C\u4E0D\u53EF\u6267\u884C\u5224\u5B9A
qms.inspec.job.error6=\u7528\u6237\u6240\u914D\u7F6E\u7684\u89D2\u8272\uFF0C\u4E0D\u5C5E\u4E8E\u68C0\u9A8C\u4EBA\u5458\u7FA4\u7EC4\u300E{0}\u300F\u6216\u5176\u7236\u9636\u7FA4\u7EC4\u300E{1}\u300F\uFF0C\u4E0D\u53EF\u6267\u884C\u5173\u95ED
qms.inspec.job.error7=\u672A\u5B9A\u4E49\u81EA\u5B9A\u62BD\u6837\u533A\u95F4
qms.inspec.msg=\u68C0\u9A8C\u4EFB\u52A1\u5355\u53F7\uFF1A\u300E{0}\u300F\n\u68C0\u9A8C\u8BA1\u5212\u7F16\u53F7\uFF1A\u300E{1}\u300F/\u300E{2}\u300F\n\u68C0\u9A8C\u8BA1\u5212\u8BF4\u660E\uFF1A\u300E{3}\u300F\n\u8BBE\u5907\u7F16\u53F7\uFF1A\u300E{4}\u300F\n\u5224\u5B9A\u4EBA\u5458\uFF1A\u300E{5}\u300F
qms.next.number.QMS_INSPEC_JOB=\u68C0\u9A8C\u4EFB\u52A1

8
qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsInspecJobMapper.java
View File

@ -3,6 +3,7 @@ package com.foreverwin.iep.qms.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.iep.common.base.FrontPage;
import com.foreverwin.iep.qms.domain.Item;
import com.foreverwin.iep.qms.domain.ReceiptInfo;
import com.foreverwin.iep.qms.domain.Resource;
import com.foreverwin.iep.qms.dto.QmsInspecJobDTO;
import com.foreverwin.iep.qms.entity.QmsInspecJob;
@ -28,6 +29,13 @@ public interface QmsInspecJobMapper extends MomBaseMapper<QmsInspecJob> {
@Param("resrce") String resrce,
@Param("operation") String operation);
IPage<ReceiptInfo> selectReceiptNo( FrontPage page,
@Param("site") String site,
@Param("receiptNo") String receiptNo);
IPage<QmsInspecJobDTO> selectAll(FrontPage page,
@Param("dto") QmsInspecJobDTO dto);
IPage<QmsInspecJobDTO> selectIQC(FrontPage page,
@Param("dto") QmsInspecJobDTO dto);
}