rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pqc工单修改

This commit is contained in:
yf001217 2026-06-15 14:58:46 +08:00
parent b34823958d
commit 6054c508e1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java
View File

@ -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("不支持的审批状态");

12
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessMeasureControllerService.java
View File

@ -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)