Merge remote-tracking branch '惠信/qms/develop' into qms/develop
This commit is contained in:
曹鹏飞
commit
3b39112245
|
|
@ -1181,6 +1181,7 @@ public class QmsIssueTicketControllerService {
|
|||
vo.setProjectNo(ticket.getProjectNo());
|
||||
vo.setIncidentType(ticket.getIncidentType());
|
||||
vo.setExceptionCode(ticket.getExceptionCode());
|
||||
vo.setImpactQuantity(ticket.getImpactQuantity());
|
||||
vo.setSourceType(ticket.getSourceType());
|
||||
vo.setCreateUserName(ticket.getCreateUserName());
|
||||
vo.setCreateTime(ticket.getCreateTime());
|
||||
|
|
@ -1479,6 +1480,21 @@ public class QmsIssueTicketControllerService {
|
|||
filteredTaskResultIds
|
||||
);
|
||||
}
|
||||
|
||||
issueTicketToDoService.lambdaUpdate()
|
||||
.eq(QmsIssueTicketToDo::getTicketId, entity.getId())
|
||||
.eq(QmsIssueTicketToDo::getHandlerUserId, entity.getCreateUserId())
|
||||
.eq(QmsIssueTicketToDo::getHasProcessed, false)
|
||||
.set(QmsIssueTicketToDo::getHasProcessed, true)
|
||||
.update();
|
||||
|
||||
issueTicketService.lambdaUpdate()
|
||||
.eq(QmsIssueTicket::getId, entity.getId())
|
||||
.set(QmsIssueTicket::getStatus, (short) 1)
|
||||
.set(QmsIssueTicket::getUpdateUserId, userId)
|
||||
.set(QmsIssueTicket::getUpdateUserName, userName)
|
||||
.set(QmsIssueTicket::getUpdateTime, now)
|
||||
.update();
|
||||
}
|
||||
|
||||
private void addIssueTicketProcessAndTodo(Long issueTicketId, Long handlerUserId, List<Long> taskResultIds) {
|
||||
|
|
@ -3345,7 +3361,11 @@ public class QmsIssueTicketControllerService {
|
|||
.set(QmsIssueTicket::getUpdateTime, now)
|
||||
.update();
|
||||
|
||||
issueTicketToDoService.processed(ticket.getId());
|
||||
issueTicketToDoService.lambdaUpdate()
|
||||
.eq(QmsIssueTicketToDo::getTicketId, ticket.getId())
|
||||
.eq(QmsIssueTicketToDo::getHasProcessed, false)
|
||||
.set(QmsIssueTicketToDo::getHasProcessed, true)
|
||||
.update();
|
||||
|
||||
// PDI工单关闭时：创建新任务单，复制内容，不合格项改为合格
|
||||
if (ticket.getSourceType() != null && ticket.getSourceType() == 1 && ticket.getSourceId() != null) {
|
||||
|
|
|
|||
|
|
@ -480,9 +480,10 @@ public class QmsIssueTicketProcessControllerService {
|
|||
public void submitPqcHandler(QmsIssueTicketProcessDraftQO request, QmsIssueTicket ticket,
|
||||
QmsIssueTicketProcess process, LocalDateTime now,
|
||||
Long currentUserId, String currentUserName) {
|
||||
QmsIssueTicketProcess latestProcess = issueTicketProcessService.getById(process.getId());
|
||||
Short approvalStatus = request.getApprovalStatus() != null
|
||||
? request.getApprovalStatus()
|
||||
: process.getApprovalStatus();
|
||||
: latestProcess.getApprovalStatus();
|
||||
VUtil.trueThrowBusinessError(approvalStatus == null).throwMessage("提交时审批状态不能为空");
|
||||
VUtil.trueThrowBusinessError(approvalStatus != 0 && approvalStatus != 1)
|
||||
.throwMessage("不支持的审批状态");
|
||||
|
|
|
|||
|
|
@ -187,6 +187,18 @@ public class QmsIssueTicketProcessMeasureControllerService {
|
|||
} else if (sourceType == 3) {
|
||||
// PQC工单（无领导审批）
|
||||
if (isHandler) {
|
||||
if (Objects.equals(request.getApprovalStatus(), (short) 1)) {
|
||||
issueTicketProcessService.lambdaUpdate()
|
||||
.eq(QmsIssueTicketProcess::getId, processId)
|
||||
.set(QmsIssueTicketProcess::getApprovalStatus, request.getApprovalStatus())
|
||||
.set(request.getApprovalOpinion() != null,
|
||||
QmsIssueTicketProcess::getApprovalOpinion, request.getApprovalOpinion())
|
||||
.set(QmsIssueTicketProcess::getApprovalUserId, currentUserId)
|
||||
.set(QmsIssueTicketProcess::getApprovalUserName, UserUtil.getUserName())
|
||||
.update();
|
||||
return;
|
||||
}
|
||||
|
||||
// 处理人处理：保存根本原因、审批状态和措施
|
||||
issueTicketProcessService.lambdaUpdate()
|
||||
.eq(QmsIssueTicketProcess::getId, processId)
|
||||
|
|
|
|||
|
|
@ -243,14 +243,14 @@ public class QmsPdiInspectionResultsControllerService {
|
|||
.update();
|
||||
|
||||
// 7. 根据总体判定+检测项结果设置状态：有不合格则=3（待流转），全合格则=2（已完成）
|
||||
|
||||
|
||||
// 校验 overdue 字段：无值时根据完成时间与要求完成时间比较设置，有值则保持原值
|
||||
Boolean overdueValue = taskRecord.getOverdue();
|
||||
if (overdueValue == null) {
|
||||
overdueValue = taskRecord.getRequiredCompletionTime() != null
|
||||
&& now.isAfter(taskRecord.getRequiredCompletionTime());
|
||||
}
|
||||
|
||||
|
||||
taskRecordService.lambdaUpdate()
|
||||
.eq(QmsPdiTaskRecord::getId, taskRecord.getId())
|
||||
.set(QmsPdiTaskRecord::getDetectionCompletionTime, now)
|
||||
|
|
@ -481,7 +481,7 @@ public class QmsPdiInspectionResultsControllerService {
|
|||
vo.setOrderNo(task.getOrderNo());
|
||||
vo.setRequiredCompletionTime(task.getRequiredCompletionTime());
|
||||
vo.setInspectionEnable(task.getInspectionEnable());
|
||||
|
||||
vo.setInspectionRuleId(task.getDetectionRulesId());
|
||||
// 查询检测规则获取机型编号和检测版本
|
||||
if (task.getDetectionRulesId() != null) {
|
||||
QmsPdiDetectionRules rules = detectionRulesService.getById(task.getDetectionRulesId());
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package com.nflg.qms.admin.service;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.nflg.wms.common.constant.STATE;
|
||||
import com.nflg.wms.common.exception.NflgException;
|
||||
|
|
@ -465,6 +468,29 @@ public class QmsPdiTaskRecordControllerService {
|
|||
*/
|
||||
public PageData<QmsPdiTaskInspectionResultVO> inspectionResultDetail(QmsPdiTaskInspectionResultQO request) {
|
||||
Page<QmsPdiTaskInspectionResultVO> page = inspectionResultsService.listByTaskId(request);
|
||||
if (ObjUtil.isNotNull(page) && CollectionUtil.isNotEmpty(page.getRecords())) {
|
||||
page.getRecords().forEach(vo -> {
|
||||
if (StrUtil.isNotBlank(vo.getInspectionItemImage())) {
|
||||
List<QmsPdiTaskRecordDetailVO.FileDetailVO> files = new ArrayList<>();
|
||||
String[] imgIds = vo.getInspectionItemImage().split(",");
|
||||
for (String imgId : imgIds) {
|
||||
FileUploadRecord fileUploadRecord = fileUploadRecordService.
|
||||
lambdaQuery().
|
||||
eq(FileUploadRecord::getId, imgId).one();
|
||||
if (ObjUtil.isNotNull(fileUploadRecord)) {
|
||||
QmsPdiTaskRecordDetailVO.FileDetailVO fo = new QmsPdiTaskRecordDetailVO.FileDetailVO();
|
||||
fo.setFileName(fileUploadRecord.getFileName());
|
||||
fo.setUrl(fileUploadRecord.getUrl());
|
||||
fo.setFileType(fileUploadRecord.getFileType());
|
||||
fo.setId(fileUploadRecord.getId());
|
||||
files.add(fo);
|
||||
}
|
||||
}
|
||||
vo.setInspectionItemImages(files);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
PageData<QmsPdiTaskInspectionResultVO> result = new PageData<>();
|
||||
result.setItems(page.getRecords());
|
||||
result.setTotal((int) page.getTotal());
|
||||
|
|
@ -488,7 +514,7 @@ public class QmsPdiTaskRecordControllerService {
|
|||
vo.setFactoryNo(record.getFactoryNo());
|
||||
vo.setInspectionInspection(record.getInspectionInspection());
|
||||
vo.setDetectionCompletionTime(record.getDetectionCompletionTime());
|
||||
|
||||
vo.setInspectionRuleId(record.getDetectionRulesId());
|
||||
// 关联检测规则，获取机型编号、检查版本、检测类型、质检员
|
||||
if (record.getDetectionRulesId() != null) {
|
||||
QmsPdiDetectionRules rules = detectionRulesService.getById(record.getDetectionRulesId());
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.nflg.wms.common.pojo.vo;
|
|||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* PDI任务检验结果详情VO（联查检测项和部件信息）
|
||||
|
|
@ -40,6 +41,10 @@ public class QmsPdiTaskInspectionResultVO {
|
|||
*/
|
||||
private String inspectionItemImage;
|
||||
|
||||
/**
|
||||
* 现场图片/视频详情列表
|
||||
*/
|
||||
private List<QmsPdiTaskRecordDetailVO.FileDetailVO> inspectionItemImages;
|
||||
/**
|
||||
* 检验项结果：false=不合格，true=合格
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public class QmsPdiTaskRecordDetailVO {
|
|||
*/
|
||||
private LocalDateTime inspectionTime;
|
||||
|
||||
/**
|
||||
/*
|
||||
* 检测人
|
||||
*/
|
||||
private String inspectionBy;
|
||||
|
|
@ -172,6 +172,11 @@ public class QmsPdiTaskRecordDetailVO {
|
|||
* 检测完成时间
|
||||
*/
|
||||
private LocalDateTime detectionCompletionTime;
|
||||
|
||||
/**
|
||||
* 检测规则ID
|
||||
*/
|
||||
private Long inspectionRuleId;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -59,4 +59,9 @@ public class QmsPdiTaskRecordSummaryVO {
|
|||
* 质检状态：0=待检查，1=检验中，2=已完成，3=待流转
|
||||
*/
|
||||
private Integer inspectionEnable;
|
||||
|
||||
/**
|
||||
* 检测规则ID
|
||||
*/
|
||||
private Long inspectionRuleId;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue