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

巡检工单创建修改

This commit is contained in:
yf001217 2026-06-26 15:38:14 +08:00
parent 9f582fae2c
commit c375ef3f64
3 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketController.java
View File

@ -31,7 +31,7 @@ public class QmsIssueTicketController extends BaseController {
private QmsIssueTicketControllerService issueTicketControllerService;
/**
* 新增质量问题工单
* 新增巡检工单
* 工单编号自动生成，来源类型固定为2（巡检）
*/
@PostMapping("add")
@ -71,8 +71,8 @@ public class QmsIssueTicketController extends BaseController {
}
/**
* 新增巡检工单并发布
* 一步完成：创建工单 + 设置负责人 + 状态改为处理中
* 新增巡检工单并设置负责人
* 一步完成：创建工单 + 设置负责人
*/
@PostMapping("addAndDispatch")
public ApiResult<Void> addAndDispatch(@Valid @RequestBody QmsIssueTicketAddAndDispatchQO request) {

20
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -1009,7 +1009,7 @@ public class QmsIssueTicketControllerService {
}
/**
* 新增质量问题工单
* 新增巡检工单
* 工单编号自动生成，来源类型固定为2（巡检），状态默认为0（待流转）
*/
@Transactional(rollbackFor = Exception.class)
@ -1018,13 +1018,12 @@ public class QmsIssueTicketControllerService {
String userName = UserUtil.getUserName();
LocalDateTime now = LocalDateTime.now();
// 校验 ticketTitle + projectNo 不能重复
// 校验工单标题不能重复
boolean exists = issueTicketService.lambdaQuery()
.eq(QmsIssueTicket::getTicketTitle, request.getTicketTitle())
.eq(QmsIssueTicket::getProjectNo, request.getProjectNo())
.exists();
if (exists) {
throw new NflgException(STATE.BusinessError, "已存在相同标题和工程编号的工单，请勿重复创建");
throw new NflgException(STATE.BusinessError, "工单已存在");
}
// 自动生成工单编号
@ -1036,13 +1035,7 @@ public class QmsIssueTicketControllerService {
.setTicketNo(ticketNo)
.setTicketTitle(request.getTicketTitle())
.setProjectNo(request.getProjectNo())
.setIncidentType(request.getIncidentType())
.setExceptionCode(request.getExceptionCode())
.setImpactQuantity(request.getImpactQuantity())
.setIncidentLocation(request.getIncidentLocation())
.setIncidentDescription(request.getIncidentDescription())
.setIncidentReason(request.getIncidentReason())
.setIncidentConsequence(request.getIncidentConsequence())
.setImageIds(request.getImages() == null
? ""
: StrUtil.join(",", request.getImages().stream().map(FileUploadVO::getId).toList())
@ -1059,7 +1052,7 @@ public class QmsIssueTicketControllerService {
}
/**
* 新增巡检工单并发布
* 新增巡检工单并设置负责人
* 1. 创建工单（来源类型固定为2-巡检）
* 2. 未分派处理人前保持待流转（status=0）
* 3. 设置负责人为审批人
@ -1070,13 +1063,12 @@ public class QmsIssueTicketControllerService {
String userName = UserUtil.getUserName();
LocalDateTime now = LocalDateTime.now();
// 校验 ticketTitle + projectNo 不能重复
// 校验工单标题不能重复
boolean exists = issueTicketService.lambdaQuery()
.eq(QmsIssueTicket::getTicketTitle, request.getTicketTitle())
.eq(QmsIssueTicket::getProjectNo, request.getProjectNo())
.exists();
if (exists) {
throw new NflgException(STATE.BusinessError, "已存在相同标题和工程编号的工单，请勿重复创建");
throw new NflgException(STATE.BusinessError, "工单已存在");
}
// 1. 校验负责人存在

36
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java
View File

@ -2,13 +2,12 @@ package com.nflg.wms.common.pojo.qo;
import com.nflg.wms.common.pojo.vo.FileUploadVO;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
/**
* 质量问题工单 新增参数
* 巡检工单新增参数
*/
@Data
public class QmsIssueTicketAddQO {
@ -22,44 +21,15 @@ public class QmsIssueTicketAddQO {
/**
* 工程编号
*/
@NotBlank(message = "工程编号不能为空")
private String projectNo;
/**
* 事故类型：0=一般，1=较严重，2=严重
*/
@NotNull(message = "事故类型不能为空")
private Short incidentType;
/**
* 异常代码
*/
private String exceptionCode;
/**
* 影响数量
*/
private String impactQuantity;
/**
* 事件地点
*/
@NotBlank(message = "事件地点不能为空")
private String incidentLocation;
/**
* 事件描述
*/
private String incidentDescription;
/**
* 事件原因
*/
private String incidentReason;
/**
* 事件后果
*/
private String incidentConsequence;
/**
* 图片列表
*/