From 6acfed532ac67786eb415221b75c6d93c71ca833 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 二月 2026 14:18:25 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 7 ++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java | 2 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 2 +-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 060734a..bf9a516 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -471,7 +471,7 @@
}
Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, params.getSeqNum()));
if (Objects.isNull(task)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦ㄥ彲宸茬粨鏉燂紒锛�");
+ throw new CoolException("浠诲姟涓嶅瓨鍦ㄥ彲浠ョ粨鏉燂紒锛�");
}
/**鏂欑鎼繍涓紝 淇敼绔欑偣鐘舵��*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java
index f8dd91f..a417a16 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java
@@ -11,6 +11,8 @@
MISSION_STEP_TYPE_RESPONSE("RESPONSE", "鍝嶅簲"),
MISSION_STEP_TYPE_RECEIVE("RECEIVE", "鎺ユ敹"),
MISSION_STEP_TYPE_REQUEST("REQUEST", "璇锋眰"),
+ MISSION_STEP_TYPE_BIND("BIND", "缁戝畾"),
+ MISSION_STEP_TYPE_UNBIND("UNBIND", "瑙ｇ粦"),
MISSION_STEP_TYPE_VALIDATE("VALIDATE", "鏍￠獙"),
MISSION_STEP_TYPE_TRANSFORM("TRANSFORM", "杞崲"),
MISSION_STEP_TYPE_OBTAIN("OBTAIN", "鑾峰彇"),
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
index d83b95a..416fec2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
@@ -65,6 +65,9 @@
MISSION_TEMPLATE_NO_EXECUTE1("1027", "1027.涓嶆墽琛屼换鍔�"),
MISSION_TEMPLATE_WEIGHING_ONE2("1028", "1028.绉伴噸浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE3("1029", "1029.RCS缁戝畾鏁版嵁"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE4("1030", "1030.RCS瑙ｇ粦鏁版嵁"),
+
MISSION_TRANSFER("9999", "9999.浠诲姟瀹屾垚涓�"),
;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index d65e968..bc90f6a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -113,7 +113,12 @@
@Scheduled(cron = "0/2 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void missionTaskEXECUTE() {
- List<String> typeList = Arrays.asList(MissionStepType.MISSION_STEP_TYPE_REQUEST.type, MissionStepType.MISSION_STEP_TYPE_OBTAIN.type,MissionStepType.MISSION_STEP_TYPE_NO_EXECUTE.type);
+ List<String> typeList = Arrays.asList(
+ MissionStepType.MISSION_STEP_TYPE_REQUEST.type,
+ MissionStepType.MISSION_STEP_TYPE_UNBIND.type,
+ MissionStepType.MISSION_STEP_TYPE_BIND.type,
+ MissionStepType.MISSION_STEP_TYPE_OBTAIN.type,
+ MissionStepType.MISSION_STEP_TYPE_NO_EXECUTE.type);
List<FlowStepInstance> flowStepInstanceList = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
.eq(FlowStepInstance::getStatus, 1).in(FlowStepInstance::getStepType,typeList));
for (FlowStepInstance flowStepInstance : flowStepInstanceList) {
--
Gitblit v1.9.1