Compare commits
2 Commits
9c80f8e459
...
b4c3aa60e7
| Author | SHA1 | Date |
|---|---|---|
|
|
b4c3aa60e7 | |
|
|
1f72408a27 |
|
|
@ -439,6 +439,7 @@ public class QmsIssueTicketControllerService {
|
||||||
.setIncidentType(request.getIncidentType())
|
.setIncidentType(request.getIncidentType())
|
||||||
.setExceptionCode(request.getExceptionCode())
|
.setExceptionCode(request.getExceptionCode())
|
||||||
.setUnqualifiedQty(request.getUnqualifiedQty())
|
.setUnqualifiedQty(request.getUnqualifiedQty())
|
||||||
|
.setImpactQuantity(request.getImpactQuantity())
|
||||||
.setIncidentLocation(request.getIncidentLocation())
|
.setIncidentLocation(request.getIncidentLocation())
|
||||||
.setIncidentDescription(request.getIncidentDescription())
|
.setIncidentDescription(request.getIncidentDescription())
|
||||||
.setIncidentReason(request.getIncidentReason())
|
.setIncidentReason(request.getIncidentReason())
|
||||||
|
|
@ -758,6 +759,7 @@ public class QmsIssueTicketControllerService {
|
||||||
vo.setCreator(ticket.getCreateUserName());
|
vo.setCreator(ticket.getCreateUserName());
|
||||||
vo.setCreateTime(ticket.getCreateTime());
|
vo.setCreateTime(ticket.getCreateTime());
|
||||||
vo.setStatus(ticket.getStatus());
|
vo.setStatus(ticket.getStatus());
|
||||||
|
vo.setCompleteTime(ticket.getCompleteTime()); // 设置完成时间
|
||||||
|
|
||||||
// 查询工单类型:PDI-新机检测 或 PDI-库存检测
|
// 查询工单类型:PDI-新机检测 或 PDI-库存检测
|
||||||
if (ticket.getSourceId() != null) {
|
if (ticket.getSourceId() != null) {
|
||||||
|
|
@ -1013,6 +1015,7 @@ public class QmsIssueTicketControllerService {
|
||||||
vo.setCreator(ticket.getCreateUserName());
|
vo.setCreator(ticket.getCreateUserName());
|
||||||
vo.setCreateTime(ticket.getCreateTime());
|
vo.setCreateTime(ticket.getCreateTime());
|
||||||
vo.setStatus(ticket.getStatus());
|
vo.setStatus(ticket.getStatus());
|
||||||
|
vo.setCompleteTime(ticket.getCompleteTime()); // 设置完成时间
|
||||||
vo.setImages(parseImageList(ticket.getImageIds()));
|
vo.setImages(parseImageList(ticket.getImageIds()));
|
||||||
|
|
||||||
// 生成主题:机型编号+订单编号+出厂检测/库存检测+检测版本号
|
// 生成主题:机型编号+订单编号+出厂检测/库存检测+检测版本号
|
||||||
|
|
|
||||||
|
|
@ -256,6 +256,7 @@ public class QmsIssueTicketProcessControllerService {
|
||||||
issueTicketService.lambdaUpdate()
|
issueTicketService.lambdaUpdate()
|
||||||
.eq(QmsIssueTicket::getId, issueTicketId)
|
.eq(QmsIssueTicket::getId, issueTicketId)
|
||||||
.set(QmsIssueTicket::getStatus, (short) 2)
|
.set(QmsIssueTicket::getStatus, (short) 2)
|
||||||
|
.set(QmsIssueTicket::getCompleteTime, now) // 设置完成时间
|
||||||
.update();
|
.update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,11 @@ public class QmsIssueTicketAddQO {
|
||||||
*/
|
*/
|
||||||
private Integer unqualifiedQty;
|
private Integer unqualifiedQty;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 影响数量
|
||||||
|
*/
|
||||||
|
private String impactQuantity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 事件地点
|
* 事件地点
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,11 @@ public class QmsIssueTicketDetailVO {
|
||||||
*/
|
*/
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 完成时间
|
||||||
|
*/
|
||||||
|
private LocalDateTime completeTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 来料检测任务详情
|
* 来料检测任务详情
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -96,4 +96,9 @@ public class QmsIssueTicketVO {
|
||||||
* 更新时间
|
* 更新时间
|
||||||
*/
|
*/
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 完成时间
|
||||||
|
*/
|
||||||
|
private LocalDateTime completeTime;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,11 @@ public class QmsPdiTicketDetailVO {
|
||||||
*/
|
*/
|
||||||
private Short status;
|
private Short status;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 完成时间
|
||||||
|
*/
|
||||||
|
private LocalDateTime completeTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工单类型(PDI-新机检测 或 PDI-库存检测)
|
* 工单类型(PDI-新机检测 或 PDI-库存检测)
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -92,6 +92,11 @@ public class QmsPdiTicketMyDetailVO {
|
||||||
*/
|
*/
|
||||||
private Short status;
|
private Short status;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 完成时间
|
||||||
|
*/
|
||||||
|
private LocalDateTime completeTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,11 @@ public class QmsIssueTicket implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Integer unqualifiedQty;
|
private Integer unqualifiedQty;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 影响数量
|
||||||
|
*/
|
||||||
|
private String impactQuantity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 事件地点
|
* 事件地点
|
||||||
*/
|
*/
|
||||||
|
|
@ -159,6 +164,11 @@ public class QmsIssueTicket implements Serializable {
|
||||||
*/
|
*/
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 完成时间
|
||||||
|
*/
|
||||||
|
private LocalDateTime completeTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 逻辑删除:0=未删除,1=已删除
|
* 逻辑删除:0=未删除,1=已删除
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue