diff --git a/nladmin-system/doc/wms.xls b/nladmin-system/doc/wms.xls index e3b6c79..b01cdb9 100644 Binary files a/nladmin-system/doc/wms.xls and b/nladmin-system/doc/wms.xls differ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java index 39040a2..6838bb5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorder.java @@ -29,8 +29,7 @@ public class PdmBdWorkorder implements Serializable { @ApiModelProperty(value = "工单编号") private String workorder_code; - @ApiModelProperty(value = "生产日期") - private String produce_date; + @ApiModelProperty(value = "计划数量") private BigDecimal plan_qty; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java index d1789d4..440a270 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dto/PdmBdWorkorderDto.java @@ -18,8 +18,6 @@ public class PdmBdWorkorderDto implements Serializable { /** 工单编号 */ private String workorder_code; - /** 生产日期 */ - private String produce_date; /** 计划数量 */ private BigDecimal plan_qty; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java index 20fbfed..0a6f49f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java @@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-15 -**/ + * @description / + * @author lyd + * @date 2023-05-16 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("sch_base_region") @@ -61,4 +61,7 @@ public class SchBaseRegion implements Serializable { @ApiModelProperty(value = "修改时间") private String update_time; + @ApiModelProperty(value = "顺和号") + private Integer order_seq; + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java index bb88456..2f704a5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java @@ -4,10 +4,10 @@ import lombok.Data; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-15 -**/ + * @description / + * @author lyd + * @date 2023-05-16 + **/ @Data public class SchBaseRegionDto implements Serializable { @@ -24,7 +24,7 @@ public class SchBaseRegionDto implements Serializable { private String point_status_explain; /** 是否创建工单 */ - private String is_has_workder; + private Boolean is_has_workder; /** 车间编码 */ private String workshop_code; @@ -33,7 +33,7 @@ public class SchBaseRegionDto implements Serializable { private String remark; /** 创建人 */ - private Long create_id; + private String create_id; /** 创建人 */ private String create_name; @@ -42,11 +42,14 @@ public class SchBaseRegionDto implements Serializable { private String create_time; /** 修改人 */ - private Long update_id; + private String update_id; /** 修改人 */ private String update_name; /** 修改时间 */ private String update_time; + + /** 顺和号 */ + private Integer order_seq; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java index bb80cde..290bd7e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java @@ -46,7 +46,8 @@ public class SchBaseRegionServiceImpl extends ServiceImpl 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 4e74589..45caffb 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 @@ -47,10 +47,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,