Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-28 e98be9d02d12b0453c6267190b86fdbc11fee9fc

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java

@@ -141,7 +141,7 @@
        for (Task task : tasks) {
            if (StringUtils.isNotBlank(task.getParentId() + "")) {
                Task task1 = taskService.getById(task.getParentId());
                if (!Objects.isNull(task1)) {
                if (!Objects.isNull(task1) && task1.getTaskType().equals(TaskStsType.UPDATED_IN.id)) {
                    throw new CoolException("父任务：" + task1.getTaskCode() + "未执行完成！");
                }
            }