From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProTaskStatusEnum.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProTaskStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProTaskStatusEnum.java
index ccfaae5..2d64ed5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProTaskStatusEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProTaskStatusEnum.java
@@ -11,7 +11,7 @@
/**
* MES 鐢熶骇浠诲姟鐘舵�佹灇涓�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Getter
@AllArgsConstructor
@@ -46,7 +46,11 @@
*
* 瀵瑰簲 MesProTaskService#cancelTaskByOrderId 鏂规硶
*/
- CANCELED(MesOrderStatusConstants.CANCELLED, "宸插彇娑�");
+ CANCELED(MesOrderStatusConstants.CANCELLED, "宸插彇娑�"),
+ /**
+ * 宸插仠宸�
+ */
+ PAUSED(9, "宸插仠宸�");
public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProTaskStatusEnum::getStatus).toArray(Integer[]::new);
@@ -75,13 +79,13 @@
}
/**
- * 鍒ゆ柇鏄惁鍙互鎶ュ伐锛堥潪缁堟�侊級
+ * 鍒ゆ柇鏄惁鍙互鎶ュ伐锛堥潪缁堟�佷笖闈炲仠宸ワ級
*
* @param status 鐘舵�佸��
* @return 鏄惁鍙互鎶ュ伐
*/
public static boolean canFeedback(Integer status) {
- return !isEndStatus(status);
+ return !isEndStatus(status) && !ObjectUtils.equalsAny(status, PAUSED.status);
}
}
--
Gitblit v1.9.3