From 1f72408a27c862484a080d90f43c4d0b667ae18a Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Mon, 11 May 2026 08:15:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A3=B0=E6=98=8E=E6=8F=90=E5=8D=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=AE=80=E6=B4=81=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将多个单独的导入合并为通配符导入 - 移除冗余的重复import语句 - 提高代码读取和维护效率 - 保持代码风格一致性 --- .../admin/service/QmsIssueTicketControllerService.java | 3 +++ .../QmsIssueTicketProcessControllerService.java | 1 + .../nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java | 5 +++++ .../wms/common/pojo/vo/QmsIssueTicketDetailVO.java | 5 +++++ .../com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java | 5 +++++ .../nflg/wms/common/pojo/vo/QmsPdiTicketDetailVO.java | 5 +++++ .../wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java | 5 +++++ .../com/nflg/wms/repository/entity/QmsIssueTicket.java | 10 ++++++++++ 8 files changed, 39 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java index d5d0708c..ff7f3b64 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java @@ -438,6 +438,7 @@ public class QmsIssueTicketControllerService { .setIncidentType(request.getIncidentType()) .setExceptionCode(request.getExceptionCode()) .setUnqualifiedQty(request.getUnqualifiedQty()) + .setImpactQuantity(request.getImpactQuantity()) .setIncidentLocation(request.getIncidentLocation()) .setIncidentDescription(request.getIncidentDescription()) .setIncidentReason(request.getIncidentReason()) @@ -757,6 +758,7 @@ public class QmsIssueTicketControllerService { vo.setCreator(ticket.getCreateUserName()); vo.setCreateTime(ticket.getCreateTime()); vo.setStatus(ticket.getStatus()); + vo.setCompleteTime(ticket.getCompleteTime()); // 设置完成时间 // 查询工单类型：PDI-新机检测 或 PDI-库存检测 if (ticket.getSourceId() != null) { @@ -1012,6 +1014,7 @@ public class QmsIssueTicketControllerService { vo.setCreator(ticket.getCreateUserName()); vo.setCreateTime(ticket.getCreateTime()); vo.setStatus(ticket.getStatus()); + vo.setCompleteTime(ticket.getCompleteTime()); // 设置完成时间 vo.setImages(parseImageList(ticket.getImageIds())); // 生成主题：机型编号+订单编号+出厂检测/库存检测+检测版本号 diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java index bc7eb299..4ccca85a 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketProcessControllerService.java @@ -256,6 +256,7 @@ public class QmsIssueTicketProcessControllerService { issueTicketService.lambdaUpdate() .eq(QmsIssueTicket::getId, issueTicketId) .set(QmsIssueTicket::getStatus, (short) 2) + .set(QmsIssueTicket::getCompleteTime, now) // 设置完成时间 .update(); } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java index 484dac31..b29b85c7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketAddQO.java @@ -40,6 +40,11 @@ public class QmsIssueTicketAddQO { */ private Integer unqualifiedQty; + /** + * 影响数量 + */ + private String impactQuantity; + /** * 事件地点 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java index 4f9297b4..2490c361 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java @@ -128,6 +128,11 @@ public class QmsIssueTicketDetailVO { */ private LocalDateTime updateTime; + /** + * 完成时间 + */ + private LocalDateTime completeTime; + /** * 来料检测任务详情 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java index 7dfab4df..75e4c84f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java @@ -96,4 +96,9 @@ public class QmsIssueTicketVO { * 更新时间 */ private LocalDateTime updateTime; + + /** + * 完成时间 + */ + private LocalDateTime completeTime; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketDetailVO.java index 5a23daf4..316296a0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketDetailVO.java @@ -58,6 +58,11 @@ public class QmsPdiTicketDetailVO { */ private Short status; + /** + * 完成时间 + */ + private LocalDateTime completeTime; + /** * 工单类型（PDI-新机检测 或 PDI-库存检测） */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java index bf557b21..0cc1045e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java @@ -92,6 +92,11 @@ public class QmsPdiTicketMyDetailVO { */ private Short status; + /** + * 完成时间 + */ + private LocalDateTime completeTime; + /** * 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java index 2748c54a..bd65e931 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIssueTicket.java @@ -69,6 +69,11 @@ public class QmsIssueTicket implements Serializable { */ private Integer unqualifiedQty; + /** + * 影响数量 + */ + private String impactQuantity; + /** * 事件地点 */ @@ -159,6 +164,11 @@ public class QmsIssueTicket implements Serializable { */ private LocalDateTime updateTime; + /** + * 完成时间 + */ + private LocalDateTime completeTime; + /** * 逻辑删除：0=未删除，1=已删除 */