rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -204,7 +204,7 @@ DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>() .eq(DeviceSite::getSite, station.getStationName()) .eq(DeviceSite::getAreaIdEnd, warehouseArea.getId()) .eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPITY_IN.type).last("limit 1")); .eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_IN.type).last("limit 1")); if (Cools.isEmpty(deviceSite)) { errorBuilder.append("无可用路径"); continue; @@ -238,7 +238,7 @@ Task task = new Task(); task.setTaskCode(ruleCode) .setTaskStatus(TaskStsType.GENERATE_IN.id) .setTaskType(TaskType.TASK_TYPE_EMPITY_IN.type) .setTaskType(TaskType.TASK_TYPE_EMPTY_IN.type) .setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh待修改 .setTargLoc(targetLoc) .setOrgSite(station.getStationName()) rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -479,7 +479,7 @@ 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_EMPITY_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)) { /**修改出库站点状态*/ @@ -499,7 +499,7 @@ || 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_EMPITY_OUT.type)) { || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) { /**修改出库站点状态*/ @@ -522,7 +522,7 @@ 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_EMPITY_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)) { @@ -549,7 +549,7 @@ || 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_EMPITY_OUT.type)) { || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) { /**修改出库站点状态*/ @@ -575,7 +575,7 @@ 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_EMPITY_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)) { if (!taskService.update(new LambdaUpdateWrapper<Task>() rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
@@ -9,8 +9,9 @@ */ public enum TaskType { TASK_TYPE_INITIAL("0", "路径规划中"), TASK_TYPE_IN("1", "入库"), TASK_TYPE_EMPITY_IN("10", "空板入库"), TASK_TYPE_EMPTY_IN("10", "空板入库"), TASK_TYPE_LOC_MOVE("11", "库格移载"), TASK_TYPE_PICK_IN("53", "拣料再入库"), TASK_TYPE_MERGE_IN("54", "并板再入库"), @@ -19,7 +20,7 @@ TASK_TYPE_PICK_AGAIN_OUT("103", "拣料出库"), TASK_TYPE_MERGE_OUT("104", "并板出库"), TASK_TYPE_CHECK_OUT("107", "盘点出库"), TASK_TYPE_EMPITY_OUT("110", "空板出库"), TASK_TYPE_EMPTY_OUT("110", "空板出库"), ; public Integer type; public String desc; @@ -35,8 +36,8 @@ } if (TaskType.TASK_TYPE_IN.type.equals(type)) { return TaskType.TASK_TYPE_IN.desc; } else if (TaskType.TASK_TYPE_EMPITY_IN.type.equals(type)) { return TaskType.TASK_TYPE_EMPITY_IN.desc; } else if (TaskType.TASK_TYPE_EMPTY_IN.type.equals(type)) { return TaskType.TASK_TYPE_EMPTY_IN.desc; } else if (TaskType.TASK_TYPE_OUT.type.equals(type)) { return TaskType.TASK_TYPE_OUT.desc; } else if (TaskType.TASK_TYPE_PICK_IN.type.equals(type)) { rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
New file @@ -0,0 +1,70 @@ package com.vincent.rsf.server.manager.schedules; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.server.manager.controller.params.LocToTaskParams; import com.vincent.rsf.server.manager.entity.BasContainer; import com.vincent.rsf.server.manager.entity.Loc; import com.vincent.rsf.server.manager.entity.WarehouseAreas; import com.vincent.rsf.server.manager.enums.LocStsType; import com.vincent.rsf.server.manager.service.LocItemService; import com.vincent.rsf.server.manager.service.LocService; import com.vincent.rsf.server.manager.service.TaskService; import com.vincent.rsf.server.manager.service.impl.BasContainerServiceImpl; import com.vincent.rsf.server.manager.service.impl.WarehouseAreasServiceImpl; import com.vincent.rsf.server.system.constant.GlobalConfigCode; import com.vincent.rsf.server.system.entity.Config; import com.vincent.rsf.server.system.service.ConfigService; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; import java.util.Objects; /** * @author Munch D. Luffy * @date 2026/01/29 * 缓存区域任务自动触发 */ @Slf4j @Component public class TaskMissionSchedules { public static Logger logger = LoggerFactory.getLogger(TaskMissionSchedules.class); @Autowired private TaskService taskService; @Autowired private ConfigService configService; @Autowired private WarehouseAreasServiceImpl warehouseAreasService; @Autowired private LocService locService; @Autowired private LocItemService locItemService; @Autowired private BasContainerServiceImpl basContainerService; /** * @author Munch D. Luffy * @date 2026/01/15 * @description: 初始任务规划路径 * @version 1.0 */ @Scheduled(cron = "0/2 * * * * ?") @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)); if (!Boolean.parseBoolean(config.getVal())) { return; } } } rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -243,8 +243,8 @@ @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_EMPITY_IN.type , TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_IN.type, 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>() @@ -280,8 +280,8 @@ @Transactional(rollbackFor = Exception.class) public void taskToWCS() throws Exception { 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_EMPITY_IN.type , TaskType.TASK_TYPE_CHECK_IN.type, TaskType.TASK_TYPE_MERGE_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, 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_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>() @@ -383,7 +383,7 @@ /**判断是否起点系统类型 非标准程序*/ Loc locStart = null; if (task.getTaskType().equals(TaskType.TASK_TYPE_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_EMPITY_OUT.type)) { task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) { locStart = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc())); if (Objects.isNull(locStart)) { throw new CoolException("源库位不存在！！"); @@ -399,7 +399,7 @@ /**判断是否起点系统类型 非标准程序*/ if (locStart == null){ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) || if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) ) { @@ -451,7 +451,7 @@ itemParam.setOriLoc(task.getOrgLoc()).setDestLoc(task.getTargLoc()); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) { || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)) { /**全板入库参数*/ itemParam.setDestLoc(task.getTargLoc()) .setOriSta(task.getOrgSite()); @@ -461,7 +461,7 @@ .setOriSta(task.getTargSite()); } 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_EMPITY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)) { /**出库参数*/ @@ -514,7 +514,7 @@ 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_EMPITY_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)) { if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode()) @@ -534,7 +534,7 @@ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) { if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode()) .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_OUT.id))) { rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -106,11 +106,11 @@ //空容器出库 DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>() .eq(!Objects.isNull(loc.getChannel()), DeviceSite::getChannel, loc.getChannel()) .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPITY_OUT.type)); .eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_EMPTY_OUT.type)); if (Objects.isNull(deviceSite)) { throw new CoolException("站点不支持空容器出库！！"); } task.setTaskType(TaskType.TASK_TYPE_EMPITY_OUT.type).setWarehType(deviceSite.getDevice()); task.setTaskType(TaskType.TASK_TYPE_EMPTY_OUT.type).setWarehType(deviceSite.getDevice()); } else { throw new CoolException("空容器出库！！其他类型无效，进入类型："+map.getType()); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -758,7 +758,7 @@ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) { //移库 moveInStock(task, loginUserId); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) { } else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)) { //移库 complateInstockE(task, loginUserId); } @@ -830,7 +830,7 @@ */ private Task modiftyTaskSort(Task task, Long loginUserId) { String curLoc; if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) { if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)) { curLoc = task.getTargLoc(); } else { curLoc = task.getOrgLoc(); @@ -981,7 +981,7 @@ for (Task task : tasks) { //出库任务 try { if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) { if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) { //110.空板出库 complateOutStockEmpty(task, loginUserId); } else { @@ -1073,8 +1073,8 @@ public R removeTask(Long[] ids, Long loginUserId) { List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id); List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type); TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPTY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type, TaskType.TASK_TYPE_EMPTY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type); List<Task> tasks = this.list(new LambdaQueryWrapper<Task>() .in(Task::getTaskType, list) .in(Task::getId, ids) @@ -1148,7 +1148,7 @@ if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) { BasStation basStation = null; if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) { if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)) { basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, task.getOrgSite()) .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type)); @@ -1156,7 +1156,7 @@ || 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_EMPITY_OUT.type)) { || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) { basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, task.getTargLoc()) .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type)); @@ -1759,7 +1759,7 @@ itemParam.setOriLoc(task.getOrgLoc()).setDestLoc(task.getTargLoc()); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) { || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type)) { /**全板入库参数*/ itemParam.setDestLoc(task.getTargLoc()) .setOriSta(task.getOrgSite()); @@ -1769,7 +1769,7 @@ .setOriSta(task.getTargSite()); } 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_EMPITY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)) { /**出库参数*/ @@ -1821,7 +1821,7 @@ 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_EMPITY_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)) { @@ -1847,7 +1847,7 @@ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) { BasStation curSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite())); if (Objects.isNull(curSta)) { @@ -2088,7 +2088,7 @@ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) { stock.setLocCode(task.getTargLoc()); } else { rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
@@ -27,6 +27,9 @@ public final static String AUTO_RUN_MOVE_THEAD_MAX = "AUTO_RUN_MOVE_THEAD_MAX"; /*初始任务自动规划路径*/ public final static String AUTO_TEMPLATE_PLANNING_STEP_FLOW = "AUTO_TEMPLATE_PLANNING_STEP_FLOW"; } rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FlowStepLogController.java
@@ -55,10 +55,7 @@ @OperationLog("Create 步骤执行日志") @PostMapping("/flowStepLog/save") public R save(@RequestBody FlowStepLog flowStepLog) { flowStepLog.setCreateBy(getLoginUserId()); flowStepLog.setCreateTime(new Date()); flowStepLog.setUpdateBy(getLoginUserId()); flowStepLog.setUpdateTime(new Date()); if (!flowStepLogService.save(flowStepLog)) { return R.error("Save Fail"); } @@ -69,8 +66,6 @@ @OperationLog("Update 步骤执行日志") @PostMapping("/flowStepLog/update") public R update(@RequestBody FlowStepLog flowStepLog) { flowStepLog.setUpdateBy(getLoginUserId()); flowStepLog.setUpdateTime(new Date()); if (!flowStepLogService.updateById(flowStepLog)) { return R.error("Update Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FlowStepLog.java
@@ -108,18 +108,4 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); } public Boolean getStatusBool(){ if (null == this.status){ return null; } switch (this.status){ case 1: return true; case 0: return false; default: return null; } } }
