diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java index 90565e8..77bf68f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.sch.task.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -65,12 +66,21 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl findPoints(); + + public void apply(JSONObject param) { String point_code = ""; - String config_code = "d"; + String config_code = "HNMLTask"; //1、校验数据 SchBaseTaskconfig taskConfig = SpringContextHolder.getBean(SchBaseTaskconfigServiceImpl.class).getById(config_code); Integer tcmn = taskConfig.getTask_create_max_num(); - SchBaseTaskServiceImpl taskService = SpringContextHolder.getBean(SchBaseTaskServiceImpl.class); List unFinishTasksByTaskConfig = taskService.findUnFinishTasksByTaskConfig(taskConfig.getConfig_code()); @@ -54,4 +78,5 @@ public abstract class BaseTask { //校验 } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java deleted file mode 100644 index ee9e476..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task_manage.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java deleted file mode 100644 index e574fbf..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.nl.wms.sch.task_manage.task.core; - -/** - * @author ldjun - * @version 1.0 - * @date 2023年05月08日 13:35 - * @desc desc - */ -public class BaseTaskDto { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java deleted file mode 100644 index ee9e476..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task_manage.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java index ee9e476..ba2f756 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java @@ -1 +1,23 @@ -package org.nl.wms.sch.task_manage.task.core; \ No newline at end of file +package org.nl.wms.sch.task_manage.task.core; + +/** + * 任务操作终端类型 + */ +public enum TaskOperateType { + ACS("1", "ACS", "ACS"), + PC("2", "PC", "创建完成"), + MOBILE("3", "手持", "手持"), + QUARTZ("4", "定时任务", "定时任务"), + OTHER("5", "其它", "其它"); + + + TaskOperateType(String code, String name, String desc) { + this.code = code; + this.name = name; + this.desc = desc; + } + + private String code; + private String name; + private String desc; +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java index edd00f1..b34777a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java @@ -1,12 +1,40 @@ package org.nl.wms.sch.task_manage.task.tasks; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.sch.task_manage.BaseTask; +import java.util.List; + /** - * @author ldjun + * @author ldjun 混碾满料任务 * @version 1.0 * @date 2023年05月16日 16:44 * @desc desc */ public class HNMLTask extends BaseTask { + @Override + protected void updateStatus() { + + } + + @Override + protected void create(JSONObject param) { + + } + + @Override + protected void issue() { + + } + + @Override + protected void schedule() { + + } + + + @Override + protected List findPoints() { + return null; + } }