fix(service): 修复审批完成时间设置及工单标题生成逻辑

- 在审批状态更新时设置工单完成时间为当前时间
- 优化工单标题生成流程,调整条件判断格式
- 补充对未定义检测类型的异常处理逻辑
This commit is contained in:
曹鹏飞 2026-05-09 18:06:37 +08:00
parent 63c6d74901
commit a065ebde4d
1 changed files with 4 additions and 3 deletions

View File

@ -295,6 +295,7 @@ public class QmsIssueTicketControllerService {
entity.setApprovalStatus(request.getApprovalStatus()) entity.setApprovalStatus(request.getApprovalStatus())
.setStatus((short) 2) .setStatus((short) 2)
.setCompleteTime(LocalDateTime.now())
.setApprovalOpinion(request.getApprovalOpinion()) .setApprovalOpinion(request.getApprovalOpinion())
.setIncidentType(request.getIncidentType()) .setIncidentType(request.getIncidentType())
.setApprovalUserId(userId) .setApprovalUserId(userId)
@ -495,15 +496,15 @@ public class QmsIssueTicketControllerService {
.setUpdateUserId(userId) .setUpdateUserId(userId)
.setUpdateUserName(userName) .setUpdateUserName(userName)
.setUpdateTime(now); .setUpdateTime(now);
if (detail.getInspectionType() == 0){ if (detail.getInspectionType() == 0) {
entity.setTicketTitle(generateTicketTitle(detail.getSupplierName(), detail.getMaterialNo() entity.setTicketTitle(generateTicketTitle(detail.getSupplierName(), detail.getMaterialNo()
, detail.getPurchaseOrderNo(), detail.getDeliveryOrderNo(), detail.getStandardVersion()) , detail.getPurchaseOrderNo(), detail.getDeliveryOrderNo(), detail.getStandardVersion())
); );
}else if (detail.getInspectionType() == 1){ } else if (detail.getInspectionType() == 1) {
entity.setTicketTitle(generateTicketTitle(detail.getFactory(), detail.getWarehouse() entity.setTicketTitle(generateTicketTitle(detail.getFactory(), detail.getWarehouse()
, detail.getMaterialNo(), detail.getStorageDays(), detail.getStandardVersion()) , detail.getMaterialNo(), detail.getStorageDays(), detail.getStandardVersion())
); );
}else { } else {
VUtil.trueThrowBusinessError(true).throwMessage("该检测类型未定义工单标题生成方式"); VUtil.trueThrowBusinessError(true).throwMessage("该检测类型未定义工单标题生成方式");
} }