From b0f65ad31f41c062126896ee07164a9661b38059 Mon Sep 17 00:00:00 2001 From: ludj Date: Tue, 16 May 2023 18:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/doc/wms.xls | Bin 301056 -> 302080 bytes .../wms/pdm/service/dao/PdmBdWorkorder.java | 3 +- .../pdm/service/dto/PdmBdWorkorderDto.java | 2 - .../sch/region/service/dao/SchBaseRegion.java | 11 ++- .../region/service/dto/SchBaseRegionDto.java | 17 +++-- .../impl/SchBaseRegionServiceImpl.java | 3 +- .../controller/SchBaseTaskController.java | 15 ++++ .../wms/sch/task/core/task/TaskListType.java | 1 - .../wms/sch/task/core/task/core/BaseTask.java | 1 - .../sch/task/core/task/core/TaskApplyDto.java | 1 - .../task/core/task/core/TaskInterface.java | 1 - .../task/core/task/core/TaskOperateType.java | 1 - .../sch/task/core/task/core/TaskStatus.java | 1 - .../sch/task/core/task/tasks/HNMLTask.java | 1 - .../sch/task/service/ISchBaseTaskService.java | 59 ++++++++++----- .../wms/sch/task/service/dao/SchBaseTask.java | 9 --- .../task/service/dao/SchBaseTaskconfig.java | 4 +- .../sch/task/service/dto/SchBaseTaskDto.java | 10 --- .../service/dto/SchBaseTaskconfigDto.java | 4 +- .../service/impl/SchBaseTaskServiceImpl.java | 70 +++++++++++++----- .../org/nl/wms/sch/task_manage/BaseTask.java | 48 ++++++++++++ .../wms/sch/task_manage/task/TaskFactory.java | 23 ++++++ .../sch/task_manage/task/TaskListType.java | 1 + .../task/TaskServiceImpl.java | 2 +- .../sch/task_manage/task/core/BaseTask.java | 1 + .../task/core/BaseTaskDto.java | 2 +- .../task_manage/task/core/TaskApplyDto.java | 1 + .../task/core/TaskApplyType.java | 2 +- .../task/core/TaskDto.java | 2 +- .../task_manage/task/core/TaskInterface.java | 1 + .../task/core/TaskOperateType.java | 1 + .../sch/task_manage/task/core/TaskStatus.java | 1 + .../sch/task_manage/task/tasks/HNMLTask.java | 12 +++ .../src/views/wms/pdm/workerorder/index.vue | 5 -- nladmin-ui/src/views/wms/sch/region/index.vue | 27 ++++--- nladmin-ui/src/views/wms/sch/task/index.vue | 65 ++++++++-------- 36 files changed, 268 insertions(+), 140 deletions(-) delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java delete mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/BaseTask.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskFactory.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/{task/core => task_manage}/task/TaskServiceImpl.java (94%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/{task/core => task_manage}/task/core/BaseTaskDto.java (72%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/{task/core => task_manage}/task/core/TaskApplyType.java (93%) rename nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/{task/core => task_manage}/task/core/TaskDto.java (75%) create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java create mode 100644 nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java diff --git a/nladmin-system/doc/wms.xls b/nladmin-system/doc/wms.xls index e3b6c797f04df40b8f2993a72a36cc0858266b26..b01cdb9246ed8c3b39db9f937bdd65af3bb6d7ca 100644 GIT binary patch delta 35268 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 delta 33740 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 la.like(SchBaseRegion::getRegion_name, blurry)); + .or(ObjectUtil.isNotEmpty(blurry), la -> la.like(SchBaseRegion::getRegion_name, blurry)) + .orderByAsc(SchBaseRegion::getOrder_seq); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); schBaseRegionMapper.selectPage(pages, lam); return pages; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java index f70796d..15daca5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java @@ -1,5 +1,8 @@ package org.nl.wms.sch.task.controller; +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -13,6 +16,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import sun.security.krb5.internal.PAData; import java.util.Map; import java.util.Set; @@ -63,4 +67,15 @@ public class SchBaseTaskController { schBaseTaskService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @PostMapping("/apply") + @Log("新增任务管理") + @ApiOperation("新增任务管理") + //@SaCheckPermission("@el.check('schBaseTask:add')") + @SaIgnore + public ResponseEntity apply(@RequestBody Map param){ + schBaseTaskService.apply(JSONObject.parseObject(JSON.toJSONString(param))); + return new ResponseEntity<>(HttpStatus.CREATED); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java deleted file mode 100644 index ddb160b..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java deleted file mode 100644 index b2fc7e8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java deleted file mode 100644 index b2fc7e8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java deleted file mode 100644 index b2fc7e8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java deleted file mode 100644 index b2fc7e8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java deleted file mode 100644 index b2fc7e8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task.core; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java deleted file mode 100644 index 192e479..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java +++ /dev/null @@ -1 +0,0 @@ -package org.nl.wms.sch.task.core.task.tasks; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index b5132e0..8400639 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -1,43 +1,66 @@ package org.nl.wms.sch.task.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.sch.task.service.dao.SchBaseTask; +import java.util.List; import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-15 + **/ public interface ISchBaseTaskService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); + /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(SchBaseTask entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(SchBaseTask entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); + + + /** + * 根据任务配置查询为完成的任务数 + * + * @param config_code 任务配置编码 + * @return 未完成任务列表 + */ + List findUnFishedTasksByTaskConfig(String config_code); + + /** + * 任务申请 + * + * @param param / + */ + void apply(JSONObject param); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java index 3678118..ac2e680 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java @@ -26,8 +26,6 @@ public class SchBaseTask implements Serializable { @ApiModelProperty(value = "任务编码") private String task_code; - @ApiModelProperty(value = "任务分类") - private String task_class_id; @ApiModelProperty(value = "任务状态") private String task_status; @@ -56,11 +54,6 @@ public class SchBaseTask implements Serializable { @ApiModelProperty(value = "载具编码") private String vehicle_code; - @ApiModelProperty(value = "优先级") - private String priority; - - @ApiModelProperty(value = "处理类") - private String handle_class; @ApiModelProperty(value = "处理状态") private String handle_status; @@ -68,8 +61,6 @@ public class SchBaseTask implements Serializable { @ApiModelProperty(value = "车号") private String car_no; - @ApiModelProperty(value = "是否自动下发") - private Boolean is_auto_issue; @ApiModelProperty(value = "任务组标识") private Long task_group_id; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java index b385fed..9df3b23 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java @@ -45,10 +45,10 @@ public class SchBaseTaskconfig implements Serializable { private String priority; @ApiModelProperty(value = "允许最大任务生成数") - private BigDecimal task_create_num; + private Integer task_create_max_num; @ApiModelProperty(value = "允许最大任务下发数") - private BigDecimal task_issue_num; + private Integer task_issue_max_num; @ApiModelProperty(value = "是否自动下发") private Boolean is_auto_issue; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java index 042a5a1..a7cfed2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java @@ -15,8 +15,6 @@ public class SchBaseTaskDto implements Serializable { /** 任务编码 */ private String task_code; - /** 任务分类 */ - private String task_class_id; /** 任务状态 */ private String task_status; @@ -45,20 +43,12 @@ public class SchBaseTaskDto implements Serializable { /** 载具编码 */ private String vehicle_code; - /** 优先级 */ - private String priority; - - /** 处理类 */ - private String handle_class; - /** 处理状态 */ private String handle_status; /** 车号 */ private String car_no; - /** 是否自动下发 */ - private Boolean is_auto_issue; /** 任务组标识 */ private Long task_group_id; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskconfigDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskconfigDto.java index 96e9478..d146744 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskconfigDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskconfigDto.java @@ -34,10 +34,10 @@ public class SchBaseTaskconfigDto implements Serializable { private String priority; /** 允许最大任务生成数 */ - private BigDecimal task_create_num; + private Integer task_create_max_num; /** 允许最大任务下发数 */ - private BigDecimal task_issue_num; + private Integer task_issue_max_num; /** 是否自动下发 */ private Boolean is_auto_issue; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java index a60014e..c7986d2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -1,12 +1,14 @@ 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.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -14,17 +16,20 @@ import org.nl.common.utils.SecurityUtils; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper; import org.nl.wms.sch.task.service.dao.SchBaseTask; +import org.nl.wms.sch.task_manage.BaseTask; +import org.nl.wms.sch.task_manage.task.TaskFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-15 + **/ @Slf4j @Service public class SchBaseTaskServiceImpl extends ServiceImpl implements ISchBaseTaskService { @@ -33,28 +38,14 @@ public class SchBaseTaskServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); schBaseTaskMapper.selectPage(pages, lam); return pages; } - @Override - public void create(SchBaseTask entity) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr()); - entity.setCreate_id(currentUserId); - entity.setCreate_name(nickName); - entity.setCreate_time(now); - entity.setUpdate_id(currentUserId); - entity.setUpdate_name(nickName); - entity.setUpdate_time(now); - schBaseTaskMapper.insert(entity); - } @Override public void update(SchBaseTask entity) { @@ -77,4 +68,43 @@ public class SchBaseTaskServiceImpl extends ServiceImpl findUnFishedTasksByTaskConfig(String config_code) { + return null; + } + + @Override + public void create(SchBaseTask entity) { + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); +// if (ObjectUtil.isEmpty(entity.getTask_status())) throw new BadRequestException("任务状态不能为空!"); + Assert.notNull(entity.getTask_status(),"任务状态不能为空!"); + + entity.setTask_code(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setCreate_id(currentUserId); + entity.setCreate_name(nickName); + entity.setCreate_time(now); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + schBaseTaskMapper.insert(entity); + + } + + @Override + public void apply(JSONObject param) { + String device_code = "123"; + String type = "123"; + String vehicle_code = "123"; + + //1、如果是送料，检测载具状态 + //2、送空载具 + //3、叫料 + //4、叫空载具 + TaskFactory taskFactory = new TaskFactory(); + BaseTask task = taskFactory.getTask("HNMLTask"); + task.apply(param); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/BaseTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/BaseTask.java new file mode 100644 index 0000000..82e7555 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/BaseTask.java @@ -0,0 +1,48 @@ +package org.nl.wms.sch.task_manage; + +import com.alibaba.fastjson.JSONObject; +import org.nl.config.SpringContextHolder; +import org.nl.wms.sch.task.service.ISchBaseTaskService; +import org.nl.wms.sch.task.service.dao.SchBaseTask; +import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; +import org.nl.wms.sch.task.service.impl.SchBaseTaskServiceImpl; +import org.nl.wms.sch.task.service.impl.SchBaseTaskconfigServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月16日 16:42 + * @desc desc + */ + +public abstract class BaseTask { + @Autowired + private ISchBaseTaskService taskService; + + public void apply(JSONObject param) { + //1、校验数据 + SchBaseTaskconfig taskConfig = SpringContextHolder.getBean(SchBaseTaskconfigServiceImpl.class).getById(null); + Integer tcmn = taskConfig.getTask_create_max_num(); + + SpringContextHolder.getBean(SchBaseTaskServiceImpl.class); + + + SchBaseTask task = new SchBaseTask(); + task.setAcs_trace_id(""); + task.setConfig_code(""); + task.setCreate_id(""); + task.setCreate_mode(""); + task.setPoint_code1(""); + task.setVehicle_code(""); +// task.setTask_status("01"); + SpringContextHolder.getBean(SchBaseTaskServiceImpl.class).create(task); + //1、如果是送料，检测载具状态 + //2、送空载具 + //3、叫料 + //4、叫空载具 + + //校验 + + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskFactory.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskFactory.java new file mode 100644 index 0000000..1172324 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskFactory.java @@ -0,0 +1,23 @@ +package org.nl.wms.sch.task_manage.task; + +import org.nl.wms.sch.task_manage.BaseTask; +import org.nl.wms.sch.task_manage.task.tasks.HNMLTask; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月16日 16:42 + * @desc desc + */ +public class TaskFactory { + //使用 getShape 方法获取形状类型的对象 + public BaseTask getTask(String taskType) { + if (taskType == null) { + return null; + } + if (taskType.equalsIgnoreCase("HNMLTask")) { + return new HNMLTask(); + } + return null; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java new file mode 100644 index 0000000..88856c7 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskListType.java @@ -0,0 +1 @@ +package org.nl.wms.sch.task_manage.task; \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java index 9f2c900..6cb1295 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/TaskServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.task.core.task; +package org.nl.wms.sch.task_manage.task; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSONObject; 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 new file mode 100644 index 0000000..ee9e476 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTask.java @@ -0,0 +1 @@ +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/core/task/core/BaseTaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java similarity index 72% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java index 3d0242a..e574fbf 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/BaseTaskDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.task.core.task.core; +package org.nl.wms.sch.task_manage.task.core; /** * @author ldjun diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java new file mode 100644 index 0000000..ee9e476 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyDto.java @@ -0,0 +1 @@ +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/core/task/core/TaskApplyType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java index b74b402..82a4a9e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskApplyType.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.task.core.task.core; +package org.nl.wms.sch.task_manage.task.core; /** * @author ldjun diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java similarity index 75% rename from nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java index 7986223..d9683df 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskDto.java @@ -1,4 +1,4 @@ -package org.nl.wms.sch.task.core.task.core; +package org.nl.wms.sch.task_manage.task.core; /** * @author ldjun 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 new file mode 100644 index 0000000..ee9e476 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskInterface.java @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..ee9e476 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskOperateType.java @@ -0,0 +1 @@ +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/TaskStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java new file mode 100644 index 0000000..ee9e476 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/core/TaskStatus.java @@ -0,0 +1 @@ +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/tasks/HNMLTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java new file mode 100644 index 0000000..edd00f1 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/HNMLTask.java @@ -0,0 +1,12 @@ +package org.nl.wms.sch.task_manage.task.tasks; + +import org.nl.wms.sch.task_manage.BaseTask; + +/** + * @author ldjun + * @version 1.0 + * @date 2023年05月16日 16:44 + * @desc desc + */ +public class HNMLTask extends BaseTask { +} diff --git a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index fcbb41c..d988d0b 100644 --- a/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -18,9 +18,6 @@ - - - @@ -79,7 +76,6 @@ - @@ -128,7 +124,6 @@ import pagination from '@crud/Pagination' const defaultForm = { workorder_id: null, workorder_code: null, - produce_date: null, plan_qty: null, real_qty: null, material_id: null, diff --git a/nladmin-ui/src/views/wms/sch/region/index.vue b/nladmin-ui/src/views/wms/sch/region/index.vue index e43ed81..5d394f0 100644 --- a/nladmin-ui/src/views/wms/sch/region/index.vue +++ b/nladmin-ui/src/views/wms/sch/region/index.vue @@ -35,14 +35,6 @@ @keyup.enter.native="crud.toQuery" /> - - - @@ -75,6 +67,18 @@ + + + + + @@ -118,6 +122,7 @@ + @@ -154,6 +159,7 @@ const defaultForm = { point_status_explain: null, is_has_workder: 'true', workshop_code: null, + order_seq: 0, remark: null } export default { @@ -167,10 +173,7 @@ export default { url: 'api/schBaseRegion', idField: 'region_code', sort: 'region_code,desc', - crudMethod: { ...crudSchBaseRegion }, - query: { - is_has_workder: true - } + crudMethod: { ...crudSchBaseRegion } }) }, created() { diff --git a/nladmin-ui/src/views/wms/sch/task/index.vue b/nladmin-ui/src/views/wms/sch/task/index.vue index 4122434..7c27485 100644 --- a/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/nladmin-ui/src/views/wms/sch/task/index.vue @@ -5,85 +5,82 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - - + - + - + - + - + - + - - + + - + - + - + - +
@@ -106,10 +103,9 @@ - + - @@ -163,7 +159,6 @@ const defaultForm = { handle_class: null, handle_status: null, car_no: null, - is_auto_issue: null, task_group_id: null, task_group_seq: null, finished_type: null,