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

Merge remote-tracking branch '惠信/qms/develop' into qms/develop

This commit is contained in:
曹鹏飞 2026-05-09 15:12:51 +08:00
parent c4770a2c24 f8dfecf640
commit 5576c446ce
4 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ public class QmsIssueTicketControllerService {
.setProjectNo(taskRecord.getTaskNo()) .setProjectNo(taskRecord.getTaskNo())
.setIncidentType(request.getIncidentType()) .setIncidentType(request.getIncidentType())
.setIncidentDescription(incidentDescription) .setIncidentDescription(incidentDescription)
.setRemark(request.getRemark())
.setUnqualifiedQty((int) unqualifiedCount) .setUnqualifiedQty((int) unqualifiedCount)
.setApprovalStatus((short) 0) .setApprovalStatus((short) 0)
.setStatus((short) 0) .setStatus((short) 0)
@ -434,6 +435,7 @@ public class QmsIssueTicketControllerService {
.setProjectNo(taskRecord.getTaskNo()) .setProjectNo(taskRecord.getTaskNo())
.setIncidentType(request.getIncidentType()) .setIncidentType(request.getIncidentType())
.setIncidentDescription(incidentDescription) .setIncidentDescription(incidentDescription)
.setRemark(request.getRemark())
.setUnqualifiedQty((int) unqualifiedCount) .setUnqualifiedQty((int) unqualifiedCount)
.setApprovalStatus((short) 0) .setApprovalStatus((short) 0)
.setStatus((short) 0) .setStatus((short) 0)

6
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketPdiAddQO.java
View File

@ -25,6 +25,12 @@ public class QmsIssueTicketPdiAddQO {
@NotNull(message = "事故类型不能为空") @NotNull(message = "事故类型不能为空")
private Short incidentType; private Short incidentType;
/**
* 备注
*/
@NotNull(message = "备注不能为空")
private String remark;
/** /**
* 处理人列表 * 处理人列表
*/ */

29
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiCreateAndQueryTicketQO.java
View File

@ -1,12 +1,8 @@
package com.nflg.wms.common.pojo.qo; package com.nflg.wms.common.pojo.qo;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* PDI新建工单并查询不合格检测项 * PDI新建工单并查询不合格检测项
*/ */
@ -26,27 +22,8 @@ public class QmsPdiCreateAndQueryTicketQO {
private Short incidentType; private Short incidentType;
/** /**
* 处理人列表 * 备注
*/ */
@Valid @NotNull(message = "备注不能为空")
@NotEmpty(message = "处理人列表不能为空") private String remark;
private List<HandlerItem> handlers;
/**
* 处理人项
*/
@Data
public static class HandlerItem {
/**
* PDI检测结果ID（qms_pdi_inspection_results.ID）
*/
@NotNull(message = "检测结果ID不能为空")
private Long taskResultId;
/**
* 处理人用户ID
*/
@NotNull(message = "处理人用户ID不能为空")
private Long handlerUserId;
}
} }

15
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketServiceImpl.java
View File

@ -37,10 +37,17 @@ public class QmsIssueTicketServiceImpl
.eq(StrUtil.isNotBlank(request.getExceptionCode()), QmsIssueTicket::getExceptionCode, request.getExceptionCode()) .eq(StrUtil.isNotBlank(request.getExceptionCode()), QmsIssueTicket::getExceptionCode, request.getExceptionCode())
.eq(request.getTicketType() != null, QmsIssueTicket::getSourceType, request.getTicketType()) .eq(request.getTicketType() != null, QmsIssueTicket::getSourceType, request.getTicketType())
.eq(request.getStatus() != null, QmsIssueTicket::getStatus, request.getStatus()) .eq(request.getStatus() != null, QmsIssueTicket::getStatus, request.getStatus())
.eq(request.getIncidentType() != null, QmsIssueTicket::getIncidentType, request.getIncidentType()) .eq(request.getIncidentType() != null, QmsIssueTicket::getIncidentType, request.getIncidentType());
.ge(request.getCreateTimeStart() != null, QmsIssueTicket::getCreateTime, request.getCreateTimeStart().atStartOfDay())
.le(request.getCreateTimeEnd() != null, QmsIssueTicket::getCreateTime, request.getCreateTimeEnd().atTime(LocalTime.MAX)) // 处理创建时间范围查询
.orderByDesc(QmsIssueTicket::getCreateTime); if (request.getCreateTimeStart() != null) {
query.ge(QmsIssueTicket::getCreateTime, request.getCreateTimeStart().atStartOfDay());
}
if (request.getCreateTimeEnd() != null) {
query.le(QmsIssueTicket::getCreateTime, request.getCreateTimeEnd().atTime(LocalTime.MAX));
}
query.orderByDesc(QmsIssueTicket::getCreateTime);
IPage<QmsIssueTicket> result = query.page(page); IPage<QmsIssueTicket> result = query.page(page);