fix(qms): 修改审批状态2的含义为退货
- 将审批状态注释中2的描述由“重检”改为“退货” - 更新相关代码中审批状态2的文本显示为“退货” - 统一修改多个类和方法中的审批状态注释和逻辑描述 - 保证审批状态定义和转换逻辑的一致性
This commit is contained in:
parent
c2f59ac68e
commit
8ee02f1e84
|
|
@ -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 状态文本
|
* @return 状态文本
|
||||||
*/
|
*/
|
||||||
private String convertApprovalStatus(Short status) {
|
private String convertApprovalStatus(Short status) {
|
||||||
|
|
@ -1882,7 +1882,7 @@ public class QmsIssueTicketControllerService {
|
||||||
case 1:
|
case 1:
|
||||||
return "驳回";
|
return "驳回";
|
||||||
case 2:
|
case 2:
|
||||||
return "重检";
|
return "退货";
|
||||||
case 3:
|
case 3:
|
||||||
return "报废";
|
return "报废";
|
||||||
case 4:
|
case 4:
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ public class QmsIncomingInspectionIssueTicketAuditQO {
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
* 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用
|
||||||
*/
|
*/
|
||||||
@NotNull(message = "审批状态不能为空")
|
@NotNull(message = "审批状态不能为空")
|
||||||
private Short approvalStatus;
|
private Short approvalStatus;
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ public class QmsIssueTicketDetailVO {
|
||||||
private Short status;
|
private Short status;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
* 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用
|
||||||
*/
|
*/
|
||||||
private Short approvalStatus;
|
private Short approvalStatus;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ public class QmsIssueTicketVO {
|
||||||
private Short status;
|
private Short status;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
* 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用
|
||||||
*/
|
*/
|
||||||
private Short approvalStatus;
|
private Short approvalStatus;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ public class QmsPdiTicketMyDetailVO {
|
||||||
private LocalDateTime completeTime;
|
private LocalDateTime completeTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
* 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用
|
||||||
*/
|
*/
|
||||||
private Short approvalStatus;
|
private Short approvalStatus;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ public class QmsIssueTicket implements Serializable {
|
||||||
private Short status;
|
private Short status;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审批状态:0=通过,1=驳回,2=重检,3=报废,4=维修,5=挑选使用,6=让渡使用
|
* 审批状态:0=通过,1=驳回,2=退货,3=报废,4=维修,5=挑选使用,6=让渡使用
|
||||||
*/
|
*/
|
||||||
private Short approvalStatus;
|
private Short approvalStatus;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue