From 8ee02f1e84fd014415223c59c116aecc272cf26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 13 May 2026 19:17:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(qms):=20=E4=BF=AE=E6=94=B9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E7=8A=B6=E6=80=812=E7=9A=84=E5=90=AB=E4=B9=89?= =?UTF-8?q?=E4=B8=BA=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将审批状态注释中2的描述由“重检”改为“退货” - 更新相关代码中审批状态2的文本显示为“退货” - 统一修改多个类和方法中的审批状态注释和逻辑描述 - 保证审批状态定义和转换逻辑的一致性 --- .../qms/admin/service/QmsIssueTicketControllerService.java | 4 ++-- .../pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java | 2 +- .../com/nflg/wms/common/pojo/vo/QmsIssueTicketDetailVO.java | 2 +- .../java/com/nflg/wms/common/pojo/vo/QmsIssueTicketVO.java | 2 +- .../com/nflg/wms/common/pojo/vo/QmsPdiTicketMyDetailVO.java | 2 +- .../java/com/nflg/wms/repository/entity/QmsIssueTicket.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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 b6259f79..52e4230a 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 @@ -1869,7 +1869,7 @@ public class QmsIssueTicketControllerService { /** * 转换审批状态为文本 - * @param status 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 + * @param status 审批状态：0=通过，1=驳回，2=退货，3=报废，4=维修，5=挑选使用，6=让渡使用 * @return 状态文本 */ private String convertApprovalStatus(Short status) { @@ -1882,7 +1882,7 @@ public class QmsIssueTicketControllerService { case 1: return "驳回"; case 2: - return "重检"; + return "退货"; case 3: return "报废"; case 4: diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java index aa4c8a01..a673d503 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionIssueTicketAuditQO.java @@ -20,7 +20,7 @@ public class QmsIncomingInspectionIssueTicketAuditQO { private Long id; /** - * 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 + * 审批状态：0=通过，1=驳回，2=退货，3=报废，4=维修，5=挑选使用，6=让渡使用 */ @NotNull(message = "审批状态不能为空") private Short approvalStatus; 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 9150c5cf..5c280513 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 @@ -89,7 +89,7 @@ public class QmsIssueTicketDetailVO { private Short status; /** - * 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 + * 审批状态：0=通过，1=驳回，2=退货，3=报废，4=维修，5=挑选使用，6=让渡使用 */ private Short approvalStatus; 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 5722721d..56e58fbd 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 @@ -84,7 +84,7 @@ public class QmsIssueTicketVO { private Short status; /** - * 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 + * 审批状态：0=通过，1=驳回，2=退货，3=报废，4=维修，5=挑选使用，6=让渡使用 */ private Short approvalStatus; 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 f1ae4bda..a921f1ec 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 @@ -113,7 +113,7 @@ public class QmsPdiTicketMyDetailVO { private LocalDateTime completeTime; /** - * 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 + * 审批状态：0=通过，1=驳回，2=退货，3=报废，4=维修，5=挑选使用，6=让渡使用 */ private Short approvalStatus; 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 a2b940e1..5e63dd03 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 @@ -110,7 +110,7 @@ public class QmsIssueTicket implements Serializable { private Short status; /** - * 审批状态：0=通过，1=驳回，2=重检，3=报废，4=维修，5=挑选使用，6=让渡使用 + * 审批状态：0=通过，1=驳回，2=退货，3=报废，4=维修，5=挑选使用，6=让渡使用 */ private Short approvalStatus;