From f2fb04ef57e6b29eed57a1ca5c9a7eb1037abd74 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 二月 2026 12:59:42 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 241 +++++++++++++++++++++++------
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/MissionTransferStationController.java | 26 +++
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstanceNode.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java | 47 ++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java | 85 +++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java | 27 +++
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepTemplate.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java | 10 +
10 files changed, 366 insertions(+), 81 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/MissionTransferStationController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/MissionTransferStationController.java
new file mode 100644
index 0000000..ffb17c2
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/MissionTransferStationController.java
@@ -0,0 +1,26 @@
+package com.vincent.rsf.openApi.controller;
+
+import com.vincent.rsf.openApi.entity.dto.CommonResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api("浠诲姟涓浆绔�")
+@Slf4j
+@RequestMapping("/mission")
+public class MissionTransferStationController {
+
+ @ApiOperation("浠诲姟鎬绘帶")
+ @PostMapping("/task/master/control")
+ public CommonResponse missionMasterControl(@RequestBody Object objParams) {
+ //鍒ゆ柇闇�瑕佷笅鍙戠郴缁�
+ //鍒ゆ柇涓嬪彂鏂瑰紡
+ //杩斿洖缁撴灉
+ return CommonResponse.ok();
+ }
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
index 0a4afb4..9b71729 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
@@ -13,4 +13,7 @@
//鐩樼偣搴撳瓨淇敼
public static String CHECK_LOCITEM_UPDATE = "/rsf-open-api/erp/check/locitem/update";
+
+ //寰呬笅鍙戜换鍔″彂閫佽嚦涓浆绔�
+ public static String MISSION_TRANSFER_STATION = "/rsf-open-api/mission/task/master/control";
}
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
new file mode 100644
index 0000000..f8dd91f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/MissionStepType.java
@@ -0,0 +1,27 @@
+package com.vincent.rsf.server.manager.enums;
+
+/**
+ * @author Ryan
+ * @version 1.0
+ * @title TaskType
+ * @description
+ * @create 2025/3/29 17:02
+ */
+public enum MissionStepType {
+ MISSION_STEP_TYPE_RESPONSE("RESPONSE", "鍝嶅簲"),
+ MISSION_STEP_TYPE_RECEIVE("RECEIVE", "鎺ユ敹"),
+ MISSION_STEP_TYPE_REQUEST("REQUEST", "璇锋眰"),
+ MISSION_STEP_TYPE_VALIDATE("VALIDATE", "鏍￠獙"),
+ MISSION_STEP_TYPE_TRANSFORM("TRANSFORM", "杞崲"),
+ MISSION_STEP_TYPE_OBTAIN("OBTAIN", "鑾峰彇"),
+ MISSION_STEP_TYPE_NO_EXECUTE("NO_EXECUTE", "瓒婅繃"),
+ ;
+ public String type;
+ public String desc;
+
+ MissionStepType(String type, String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+
+}
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 db2ad73..d83b95a 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
@@ -19,34 +19,53 @@
// WCS_PUTAWAY_SUSPEND(13L, "鍏ュ簱浠诲姟鎸傝捣"),
COMPLETE_IN("98", "鍏ュ簱瀹屾垚"),
-
REPORT_IN("99", "涓婃姤瀹屾垚"),
-
UPDATED_IN("100", "搴撳瓨鏇存柊瀹屾垚"),
-
GENERATE_OUT("101", "鍒涘缓鍑哄簱浠诲姟"),
-
WCS_EXECUTE_OUT("102", "WCS銆丷CS鍑哄簱浠诲姟宸蹭笅鍙�"),
-
WCS_EXECUTE_OUT_TOTE_LOAD("103", "WCS銆丷CS鍙栫瀹屾垚"),
-
WCS_EXECUTE_OUT_TOTE_UNLOAD("104", "WCS銆丷CS鏀剧瀹屾垚"),
-
WCS_EXECUTE_OUT_TASK_DONE("105", "WCS銆丷CS浠诲姟瀹屾垚"),
-
WCS_EXECUTE_OUT_ARRIVED("106", "WCS銆丷CS瀹瑰櫒宸插埌杈�"),
-
WCS_EXECUTE_OUT_CONVEYOR("107", "WCS銆丷CS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"),
-
AWAIT("196","绛夊緟纭"),
-
GENERATE_WAVE_SEED("197", "绛夊緟瀹瑰櫒鍒拌揪"),
-
COMPLETE_OUT("198", "鍑哄簱瀹屾垚"),
-
WAVE_SEED("199", "鎾涓�/鐩樼偣涓�/寰呯‘璁�"),
-
UPDATED_OUT("200", "搴撳瓨鏇存柊瀹屾垚"),
+
+
+
+ MISSION_TEMPLATE_EXECUTE_WCS_ONE1("1001", "1001.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_ONE2("1002", "1002.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE1("1003", "1003.RCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE2("1004", "1004.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_TWO1("1005", "1005.RCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_TWO2("1006", "1006.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_TWO1("1007", "1007.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_TWO2("1008", "1008.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_THREE1("1009", "1009.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_THREE2("1010", "1010.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_FOUR1("1011", "1011.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_FOUR2("1012", "1012.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_FIVE1("1013", "1013.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_FIVE2("1014", "1014.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_THREE1("1015", "1015.RCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_THREE2("1016", "1016.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_SIX1("1017", "1017.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_SIX2("1018", "1018.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_SEVEN1("1019", "1019.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_SEVEN2("1020", "1020.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_FOUR1("1021", "1021.RCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_FOUR2("1022", "1022.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_FIVE1("1023", "1023.RCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_HK_RCS_FIVE2("1024", "1024.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_EIGHT1("1025", "1025.WCS璇锋眰涓嬪彂涓�"),
+ MISSION_TEMPLATE_EXECUTE_WCS_EIGHT2("1026", "1026.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+ MISSION_TEMPLATE_NO_EXECUTE1("1027", "1027.涓嶆墽琛屼换鍔�"),
+ MISSION_TEMPLATE_WEIGHING_ONE2("1028", "1028.绉伴噸浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+
+ MISSION_TRANSFER("9999", "9999.浠诲姟瀹屾垚涓�"),
;
public Integer id;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
index 7e246dd..ad8549b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
@@ -19,6 +19,7 @@
TASK_TYPE_PICK_AGAIN_OUT("103", "鎷ｆ枡鍑哄簱"),
TASK_TYPE_MERGE_OUT("104", "骞舵澘鍑哄簱"),
TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"),
+ TASK_TYPE_CROSS_DOCKING_OUT("109", "瓒婂簱"),
TASK_TYPE_EMPTY_OUT("110", "绌烘澘鍑哄簱"),
;
public Integer type;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
index fb76e08..d33430a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
@@ -70,7 +70,7 @@
* @description: 鍒濆浠诲姟瑙勫垝璺緞
* @version 1.0
*/
- @Scheduled(cron = "0/2 * * * * ?")
+ @Scheduled(cron = "0/1 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void missionTemplate() throws Exception {
Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.AUTO_TEMPLATE_PLANNING_STEP_FLOW));
@@ -93,7 +93,6 @@
sou = task.getOrgSite();
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
end = loc.getAreaId().toString();
- task.setTaskStatus(TaskStsType.GENERATE_IN.id);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
@@ -102,7 +101,6 @@
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
sou = loc.getAreaId().toString();
end = task.getTargSite();
- task.setTaskStatus(TaskStsType.GENERATE_OUT.id);
}
List<TaskPathTemplateMerge> taskPathTemplateMergeList = taskPathTemplateMergeService.list(new LambdaQueryWrapper<TaskPathTemplateMerge>().eq(TaskPathTemplateMerge::getSourceType, sou).eq(TaskPathTemplateMerge::getTargetType, end));
if (Objects.isNull(taskPathTemplateMergeList) || taskPathTemplateMergeList.isEmpty()) {
@@ -128,7 +126,7 @@
taskPathTemplateMerge.setStepSize(longList.size());
taskPathTemplateMergeService.save(taskPathTemplateMerge);
}
- System.out.println("浠诲姟锛�"+task.getTaskCode()+"鏌ヨ姝ュ簭涓猴細"+longs);
+// System.out.println("浠诲姟锛�"+task.getTaskCode()+"鏌ヨ姝ュ簭涓猴細"+longs);
}
} else {
//鐢熸垚瀹為檯璺緞
@@ -147,17 +145,53 @@
Integer i = 0;//it椤哄簭
Integer j = 0;//suT椤哄簭
- TaskInstance taskInstance = new TaskInstance(taskPathTemplateMerge,task);
- boolean save = taskInstanceService.save(taskInstance);
- if (!save) {
- return false;
- }
+ // 鐢ㄤ簬瀛樺偍鎵�鏈塅lowStepTemplate
+ List<FlowStepTemplate> allFlowStepTemplates = new ArrayList<>();
+
+ // 绗竴閬嶉亶鍘嗭細鏀堕泦鎵�鏈夌殑FlowStepTemplate
for (Integer id : conditionExpression) {
TaskPathTemplate taskPathTemplate = taskPathTemplateService.getById(id);
if (taskPathTemplate == null) {
return false;
}
- List<TaskPathTemplateNode> taskPathTemplateNodeList = taskPathTemplateNodeService.list(new LambdaQueryWrapper<TaskPathTemplateNode>().eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()));
+ List<TaskPathTemplateNode> taskPathTemplateNodeList = taskPathTemplateNodeService.list(
+ new LambdaQueryWrapper<TaskPathTemplateNode>()
+ .eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()));
+
+ for (TaskPathTemplateNode taskPathTemplateNode : taskPathTemplateNodeList) {
+ List<SubsystemFlowTemplate> subsystemFlowTemplateList = subsystemFlowTemplateService.list(
+ new LambdaQueryWrapper<SubsystemFlowTemplate>()
+ .eq(SubsystemFlowTemplate::getFlowCode, taskPathTemplateNode.getNodeCode())
+ .eq(SubsystemFlowTemplate::getSystemCode, taskPathTemplateNode.getSystemCode()));
+
+ for (SubsystemFlowTemplate subsystemFlowTemplate : subsystemFlowTemplateList) {
+ List<FlowStepTemplate> flowStepTemplateList = flowStepTemplateService.list(
+ new LambdaQueryWrapper<FlowStepTemplate>()
+ .eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()));
+
+ allFlowStepTemplates.addAll(flowStepTemplateList);
+ }
+ }
+ }
+
+ TaskInstance taskInstance = new TaskInstance(taskPathTemplateMerge,task);
+ boolean save = taskInstanceService.save(taskInstance);
+ if (!save) {
+ return false;
+ }
+
+ // 褰撳墠澶勭悊鐨凢lowStepTemplate鍦ㄥ叏灞�鍒楄〃涓殑绱㈠紩
+ int globalIndex = 0;
+
+ for (Integer id : conditionExpression) {
+ TaskPathTemplate taskPathTemplate = taskPathTemplateService.getById(id);
+ if (taskPathTemplate == null) {
+ return false;
+ }
+ List<TaskPathTemplateNode> taskPathTemplateNodeList = taskPathTemplateNodeService.list(
+ new LambdaQueryWrapper<TaskPathTemplateNode>()
+ .eq(TaskPathTemplateNode::getTemplateId, taskPathTemplate.getId()));
+
for (TaskPathTemplateNode taskPathTemplateNode : taskPathTemplateNodeList) {
TaskInstanceNode taskInstanceNode = new TaskInstanceNode(taskPathTemplateNode);
taskInstanceNode.setTaskId(taskInstance.getId());
@@ -166,8 +200,12 @@
taskInstanceNode.setNodeOrder(i);
taskInstanceNode.setNodeCode(String.valueOf(snowflakeIdWorker.nextId()));
taskInstanceNodeService.save(taskInstanceNode);
- List<SubsystemFlowTemplate> subsystemFlowTemplateList = subsystemFlowTemplateService.list(new LambdaQueryWrapper<SubsystemFlowTemplate>().eq(SubsystemFlowTemplate::getFlowCode, taskPathTemplateNode.getNodeCode())
- .eq(SubsystemFlowTemplate::getSystemCode, taskPathTemplateNode.getSystemCode()));
+
+ List<SubsystemFlowTemplate> subsystemFlowTemplateList = subsystemFlowTemplateService.list(
+ new LambdaQueryWrapper<SubsystemFlowTemplate>()
+ .eq(SubsystemFlowTemplate::getFlowCode, taskPathTemplateNode.getNodeCode())
+ .eq(SubsystemFlowTemplate::getSystemCode, taskPathTemplateNode.getSystemCode()));
+
for (SubsystemFlowTemplate subsystemFlowTemplate : subsystemFlowTemplateList) {
FlowInstance flowInstance = new FlowInstance(subsystemFlowTemplate);
flowInstance.setFlowInstanceNo(String.valueOf(snowflakeIdWorker.nextId()));
@@ -176,7 +214,11 @@
flowInstance.setNodeInstanceId(taskInstanceNode.getId());
flowInstance.setNodeCode(String.valueOf(snowflakeIdWorker.nextId()));
flowInstanceService.save(flowInstance);
- List<FlowStepTemplate> flowStepTemplateList = flowStepTemplateService.list(new LambdaQueryWrapper<FlowStepTemplate>().eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()));
+
+ List<FlowStepTemplate> flowStepTemplateList = flowStepTemplateService.list(
+ new LambdaQueryWrapper<FlowStepTemplate>()
+ .eq(FlowStepTemplate::getFlowId, subsystemFlowTemplate.getId()));
+
for (FlowStepTemplate flowStepTemplate : flowStepTemplateList) {
j++;
FlowStepInstance flowStepInstance = new FlowStepInstance(flowStepTemplate);
@@ -184,7 +226,24 @@
flowStepInstance.setFlowInstanceNo(flowInstance.getFlowInstanceNo());
flowStepInstance.setStepOrder(j);
flowStepInstance.setStepCode(String.valueOf(snowflakeIdWorker.nextId()));
+ flowStepInstance.setWmsNowTaskStatus(flowStepTemplate.getWmsNowTaskStatus());
+
+ // 鍒ゆ柇鏄惁鏄渶鍚庝竴涓�
+ if (globalIndex < allFlowStepTemplates.size() - 1) {
+ // 涓嶆槸鏈�鍚庝竴涓紝鍙栦笅涓�涓殑WmsNowTaskStatus
+ FlowStepTemplate nextFlowStep = allFlowStepTemplates.get(globalIndex + 1);
+ flowStepInstance.setWmsNextTaskStatus(nextFlowStep.getWmsNowTaskStatus());
+ if (globalIndex == 0){
+ task.setTaskStatus(flowStepTemplate.getWmsNowTaskStatus());
+ flowStepInstance.setStatus((short)1);
+ }
+ } else {
+ // 鏄渶鍚庝竴涓紝璁剧疆涓�9999
+ flowStepInstance.setWmsNextTaskStatus(9999);
+ }
+
flowStepInstanceService.save(flowStepInstance);
+ globalIndex++; // 鏇存柊鍏ㄥ眬绱㈠紩
}
}
}
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 8b7e4f9..8b123b5 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
@@ -26,8 +26,12 @@
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.entity.Config;
+import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.service.ConfigService;
+import com.vincent.rsf.server.system.service.impl.FlowInstanceServiceImpl;
+import com.vincent.rsf.server.system.service.impl.FlowStepInstanceServiceImpl;
+import com.vincent.rsf.server.system.service.impl.TaskInstanceNodeServiceImpl;
+import com.vincent.rsf.server.system.service.impl.TaskInstanceServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import lombok.extern.slf4j.Slf4j;
@@ -93,42 +97,170 @@
private RemotesInfoProperties.RcsApi rcsApi;
@Autowired
private BasStationService basStationService;
+ @Autowired
+ private FlowStepInstanceServiceImpl flowStepInstanceService;
+ @Autowired
+ private FlowInstanceServiceImpl flowInstanceService;
+ @Autowired
+ private TaskInstanceNodeServiceImpl taskInstanceNodeService;
+ @Autowired
+ private TaskInstanceServiceImpl taskInstanceService;
+ /**
+ * 浠诲姟涓嬪彂锛氳姹�
+ */
+ @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<FlowStepInstance> flowStepInstanceList = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
+ .eq(FlowStepInstance::getStatus, 1).in(FlowStepInstance::getStepType,typeList));
+ for (FlowStepInstance flowStepInstance : flowStepInstanceList) {
+ FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
+ if (Cools.isEmpty(flowInstance)) { continue;}
+ TaskInstanceNode taskInstanceNode = taskInstanceNodeService.getById(flowInstance.getNodeInstanceId());
+ if (Cools.isEmpty(taskInstanceNode)) { continue;}
+ TaskInstance taskInstance = taskInstanceService.getById(flowInstance.getTaskId());
+ if (Cools.isEmpty(taskInstance)) { continue;}
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, taskInstance.getTaskNo()));
+ if (Cools.isEmpty(task)) { continue;}
+ if (!task.getTaskStatus().equals(flowStepInstance.getWmsNowTaskStatus())) {
+ log.error("浠诲姟鍙凤細"+task.getTaskCode()+"鐨勪换鍔＄姸鎬佷笌鎵ц妗ｆ浠诲姟鐘舵�侊細"+flowStepInstance.getWmsNowTaskStatus()+"涓嶄竴鑷达紒锛侊紒");
+ continue;
+ }
-// /**
-// * 浠诲姟涓嬪彂
-// */
-// @Scheduled(cron = "0/5 * * * * ? ")
-// @Transactional(rollbackFor = Exception.class)
-// public void pubTaskToWcs() {
-// Long loginUserId = SystemAuthUtils.getLoginUserId();
-// List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPTY_IN.type
-// , TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPTY_OUT.type, TaskType.TASK_TYPE_PICK_IN.type,
-// TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
-// List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
-// List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
-// .in(Task::getTaskType, list)
-// .in(Task::getTaskStatus, integers).last("limit 1")
-// .orderByDesc(Task::getSort));
-// for (Task task : tasks) {
-// /**绉诲簱涓嶅仛绔欑偣鎿嶄綔*/
-// if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
-// BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
-// .eq(BasStation::getStationName,
-// task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
-// if (Cools.isEmpty(station)){
-// log.info("闈炲厜鐢电珯鐐逛换鍔′笅鍙戯細绔欑偣淇℃伅寮傚父锛屼换鍔′俊鎭細"+ JSON.toJSONString(task));
-// continue;
-// }
-// if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
-// continue;
-// }
-// }
-// /**涓嬪彂鏅�氱珯鐐逛换鍔★紝鎶ラ敊鍥炴粴锛屼笉鍐嶅線涓嬫墽琛�*/
-// pubTaskToWcs(task);
-// }
-// }
+ if (flowStepInstance.getStepType().equals(MissionStepType.MISSION_STEP_TYPE_NO_EXECUTE.type)) {
+ /**鍩虹閰嶇疆閾炬帴*/
+ log.info("浠诲姟瓒婅繃锛� 璇锋眰鍙傛暟锛� {}", JSONObject.toJSONString(flowStepInstance));
+ try {
+ task.setTaskStatus(flowStepInstance.getWmsNextTaskStatus());
+ flowStepInstance.setStatus((short)3);
+
+ flowStepInstanceService.updateById(flowStepInstance);
+ taskService.updateById(task);
+
+ if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
+ FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
+ .eq(FlowStepInstance::getFlowInstanceId, flowStepInstance.getFlowInstanceId())
+ .eq(FlowStepInstance::getFlowInstanceNo, flowStepInstance.getFlowInstanceNo())
+ .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
+ .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
+ nextFlowStepInstance.setStatus((short)1);
+
+ flowStepInstanceService.updateById(nextFlowStepInstance);
+ }
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ } else {
+ /**浠诲姟涓嬪彂鎺ュ彛*/
+ String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.MISSION_TRANSFER_STATION;
+
+ /**鍩虹閰嶇疆閾炬帴*/
+ log.info("浠诲姟涓嬪彂锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", pubTakUrl, JSONObject.toJSONString(""));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ HttpEntity httpEntity = new HttpEntity(flowStepInstance, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("浠诲姟涓嬪彂鍚庯紝鍝嶅簲缁撴灉锛� {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒锛岃繑鍥炲弬鏁颁负绌猴紒锛侊紒");
+ } else {
+ try {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults()
+ .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ if (result.getCode() == 200) {
+ task.setTaskStatus(flowStepInstance.getWmsNextTaskStatus());
+ flowStepInstance.setStatus((short)3);
+
+ if (flowStepInstance.getStepType().equals(MissionStepType.MISSION_STEP_TYPE_OBTAIN.type)) {
+ //鑾峰彇鏁版嵁瑙ｆ瀽
+ //褰曞叆
+ }
+
+ flowStepInstanceService.updateById(flowStepInstance);
+ taskService.updateById(task);
+
+ if (flowStepInstance.getWmsNextTaskStatus() != 9999) {
+ FlowStepInstance nextFlowStepInstance = flowStepInstanceService.getOne(new LambdaQueryWrapper<FlowStepInstance>()
+ .eq(FlowStepInstance::getFlowInstanceId, flowStepInstance.getFlowInstanceId())
+ .eq(FlowStepInstance::getFlowInstanceNo, flowStepInstance.getFlowInstanceNo())
+ .eq(FlowStepInstance::getStepOrder, flowStepInstance.getStepOrder() + 1)
+ .eq(FlowStepInstance::getWmsNowTaskStatus, flowStepInstance.getWmsNextTaskStatus()));
+ nextFlowStepInstance.setStatus((short)1);
+
+ flowStepInstanceService.updateById(nextFlowStepInstance);
+ }
+ } else {
+ flowStepInstance.setRetryTimes(flowStepInstance.getRetryTimes() + 1);
+ if (flowStepInstance.getRetryTimes()>5){
+ flowStepInstance.setStatus((short)4);
+ flowStepInstanceService.updateById(flowStepInstance);
+ log.error("浠诲姟涓嬪彂澶辫触锛岄噸璇曟鏁板ぇ浜庣瓑浜庝簲娆★紝鏍囪涓哄け璐ワ紒锛侊紒");
+ } else {
+ flowStepInstanceService.updateById(flowStepInstance);
+ log.error("浠诲姟涓嬪彂澶辫触锛岀瓑寰呴噸璇�....");
+ }
+ }
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 瀹屾垚鍏ュ簱锛屾洿鏂颁负瀵瑰簲鐘舵��
+ * @time 2026/02/02 12:45
+ */
+ @Scheduled(cron = "0/3 * * * * ?")
+ public void completeStock() throws Exception {
+ completeInStock();
+ complateOutStock();
+ completeStock9999();
+ }
+
+
+ public void completeStock9999() throws Exception {
+ try{
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.MISSION_TRANSFER.id).select(Task::getId));
+ if (tasks.isEmpty()) {
+ return;
+ }
+ for (Task task : tasks) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ task.setTaskStatus(TaskStsType.COMPLETE_IN.id);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) {
+ task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
+ }
+ taskService.updateById(task);
+ }
+// List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+// List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+// taskService.complateInTask(vaildTasks);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+ }
/**
@@ -138,15 +270,19 @@
* @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
* @time 2025/4/2 12:37
*/
- @Scheduled(cron = "0/3 * * * * ?")
+// @Scheduled(cron = "0/3 * * * * ?")
public void completeInStock() throws Exception {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id).select(Task::getId));
- if (tasks.isEmpty()) {
- return;
+ try{
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id).select(Task::getId));
+ if (tasks.isEmpty()) {
+ return;
+ }
+ List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+ List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+ taskService.complateInTask(vaildTasks);
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
- List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
- List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
- taskService.complateInTask(vaildTasks);
}
/**
@@ -155,18 +291,22 @@
* @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱瀛�
* @version 1.0
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void complateOutStock() throws Exception {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id)
- .select(Task::getId));
- if (tasks.isEmpty()) {
- return;
+ try{
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id)
+ .select(Task::getId));
+ if (tasks.isEmpty()) {
+ return;
+ }
+ List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+ List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+ taskService.completeTask(vaildTasks);
+ } catch (Exception e) {
+ log.error(e.getMessage());
}
- List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
- List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
- taskService.completeTask(vaildTasks);
// List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
// .eq(TaskItem::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)
@@ -230,6 +370,7 @@
}
});
+
// Set<Long> taskIds = taskItems.stream().map(TaskItem::getTaskId).collect(Collectors.toSet());
// List<Task> tasks = taskService.listByIds(taskIds);
// if (!tasks.isEmpty()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java
index 31cb912..7167dc9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepInstance.java
@@ -77,9 +77,9 @@
private Long stepTemplateId;
/**
- * 鐘舵�侊細0-寰呮墽琛� 1-鎵ц涓� 2-鎴愬姛 3-澶辫触 4-璺宠繃 5-瓒呮椂
+ * 鐘舵�侊細0-鎺掗槦涓� 1-寰呮墽琛� 2-鎵ц涓� 3-鎵ц鎴愬姛 4-鎵ц澶辫触 5-宸茶烦杩� 6-宸插彇娑�
*/
- @ApiModelProperty(value= "鐘舵�侊細0-寰呮墽琛� 1-鎵ц涓� 2-鎴愬姛 3-澶辫触 4-璺宠繃 5-瓒呮椂")
+ @ApiModelProperty(value= "鐘舵�侊細0-鎺掗槦涓� 1-寰呮墽琛� 2-鎵ц涓� 3-鎵ц鎴愬姛 4-鎵ц澶辫触 5-宸茶烦杩� 6-宸插彇娑�")
private Short status;
/**
@@ -146,6 +146,12 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty(value= "wms涓嬩竴姝ヤ换鍔＄被鍨婭D")
+ private Integer wmsNextTaskStatus;
+
+ @ApiModelProperty(value= "wms褰撳墠浠诲姟绫诲瀷ID")
+ private Integer wmsNowTaskStatus;
+
public FlowStepInstance() {}
public FlowStepInstance(FlowStepTemplate flowStepTemplate) {
this.stepTemplateId = flowStepTemplate.getId();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepTemplate.java
index 85346e8..b32c200 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepTemplate.java
@@ -134,6 +134,9 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty(value= "wms涓嬩竴姝ヤ换鍔＄姸鎬両D")
+ private Integer wmsNowTaskStatus;
+
public FlowStepTemplate() {}
public FlowStepTemplate(Long flowId,String flowCode,Integer stepOrder,String stepCode,String stepName,String stepType,String actionType,String actionConfig,String inputMapping,String outputMapping,String conditionExpression,Short skipOnFail,Short retryEnabled,String retryConfig,Integer timeoutSeconds,Long createBy,Long updateBy,Date createTime,Date updateTime) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstanceNode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstanceNode.java
index 5b08a26..3c5be0e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstanceNode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/TaskInstanceNode.java
@@ -93,9 +93,9 @@
private String executeParams;
/**
- * 鐘舵�侊細0-寰呮墽琛� 1-鎵ц涓� 2-鎵ц鎴愬姛 3-鎵ц澶辫触 4-宸茶烦杩� 5-宸插彇娑�
+ * 鐘舵�侊細0-鎺掗槦涓� 1-寰呮墽琛� 2-鎵ц涓� 3-鎵ц鎴愬姛 4-鎵ц澶辫触 5-宸茶烦杩� 6-宸插彇娑�
*/
- @ApiModelProperty(value= "鐘舵�侊細0-寰呮墽琛� 1-鎵ц涓� 2-鎵ц鎴愬姛 3-鎵ц澶辫触 4-宸茶烦杩� 5-宸插彇娑�")
+ @ApiModelProperty(value= "鐘舵�侊細0-鎺掗槦涓� 1-寰呮墽琛� 2-鎵ц涓� 3-鎵ц鎴愬姛 4-鎵ц澶辫触 5-宸茶烦杩� 6-宸插彇娑�")
private Short status;
/**
--
Gitblit v1.9.1