refactor: 优化字典字段

-  统一代码格式和注释风格
-  完善文档和注释内容
main
zch 2 months ago
parent 65eb7bc211
commit b58dae8dbe

@ -23,15 +23,7 @@ import org.dromara.wcs.domain.vo.BaseConfiginfoVo;
import org.dromara.wcs.service.IBaseConfiginfoService;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.BaseMaterialinfoVo;
import org.dromara.wcs.domain.bo.BaseMaterialinfoBo;
import org.dromara.wcs.service.IBaseMaterialinfoService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.BaseMaterialinfoBo;
import org.dromara.wcs.domain.vo.BaseMaterialinfoVo;
import org.dromara.wcs.service.IBaseMaterialinfoService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.BaseSubtaskTemplateVo;
import org.dromara.wcs.domain.bo.BaseSubtaskTemplateBo;
import org.dromara.wcs.service.IBaseSubtaskTemplateService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.BaseSubtaskTemplateBo;
import org.dromara.wcs.domain.vo.BaseSubtaskTemplateVo;
import org.dromara.wcs.service.IBaseSubtaskTemplateService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.BaseTasktypeVo;
import org.dromara.wcs.domain.bo.BaseTasktypeBo;
import org.dromara.wcs.service.IBaseTasktypeService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.BaseTasktypeBo;
import org.dromara.wcs.domain.vo.BaseTasktypeVo;
import org.dromara.wcs.service.IBaseTasktypeService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.BaseWarehouseVo;
import org.dromara.wcs.domain.bo.BaseWarehouseBo;
import org.dromara.wcs.service.IBaseWarehouseService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.BaseWarehouseBo;
import org.dromara.wcs.domain.vo.BaseWarehouseVo;
import org.dromara.wcs.service.IBaseWarehouseService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.WcsAgvCodeMapVo;
import org.dromara.wcs.domain.bo.WcsAgvCodeMapBo;
import org.dromara.wcs.service.IWcsAgvCodeMapService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.WcsAgvCodeMapBo;
import org.dromara.wcs.domain.vo.WcsAgvCodeMapVo;
import org.dromara.wcs.service.IWcsAgvCodeMapService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* agv

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.WcsAgvStatusVo;
import org.dromara.wcs.domain.bo.WcsAgvStatusBo;
import org.dromara.wcs.service.IWcsAgvStatusService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.WcsAgvStatusBo;
import org.dromara.wcs.domain.vo.WcsAgvStatusVo;
import org.dromara.wcs.service.IWcsAgvStatusService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* AGV

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.WcsBaseDictionaryVo;
import org.dromara.wcs.domain.bo.WcsBaseDictionaryBo;
import org.dromara.wcs.service.IWcsBaseDictionaryService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.WcsBaseDictionaryBo;
import org.dromara.wcs.domain.vo.WcsBaseDictionaryVo;
import org.dromara.wcs.service.IWcsBaseDictionaryService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.WcsPlcAddressVo;
import org.dromara.wcs.domain.bo.WcsPlcAddressBo;
import org.dromara.wcs.service.IWcsPlcAddressService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.WcsPlcAddressBo;
import org.dromara.wcs.domain.vo.WcsPlcAddressVo;
import org.dromara.wcs.service.IWcsPlcAddressService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* PLC

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo;
import org.dromara.wcs.domain.bo.WcsSubtaskInstanceBo;
import org.dromara.wcs.service.IWcsSubtaskInstanceService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.WcsSubtaskInstanceBo;
import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo;
import org.dromara.wcs.service.IWcsSubtaskInstanceService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* agv

@ -1,26 +1,27 @@
package org.dromara.wcs.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wcs.domain.vo.WcsTaskInstanceVo;
import org.dromara.wcs.domain.bo.WcsTaskInstanceBo;
import org.dromara.wcs.service.IWcsTaskInstanceService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.wcs.domain.bo.WcsTaskInstanceBo;
import org.dromara.wcs.domain.vo.WcsTaskInstanceVo;
import org.dromara.wcs.service.IWcsTaskInstanceService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*

@ -1,10 +1,6 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -1,10 +1,6 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -1,10 +1,6 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -1,10 +1,6 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -1,10 +1,6 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_materialinfo

@ -1,10 +1,6 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_subtask_template

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_tasktype

@ -1,13 +1,15 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* agv wcs_agv_code_map

@ -1,13 +1,15 @@
package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* AGV wcs_agv_status

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* wcs_base_dictionary

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* PLC wcs_plc_address

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* agv wcs_subtask_instance

@ -3,11 +3,10 @@ package org.dromara.wcs.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* wcs_task_instance
@ -86,7 +85,7 @@ public class WcsTaskInstance implements Serializable {
private String taskParams;
/**
*
*
*/
private Integer currentsubtaskNo;

@ -1,14 +1,15 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.BaseMaterialinfo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.BaseMaterialinfo;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -25,45 +26,45 @@ public class BaseMaterialinfoBo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
*
*
*/
@NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialCode;
/**
*
*
*/
@NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
private String materialName;
/**
*
*
*/
private String materialType;
/**
*
*
*/
private String materialCategory;
/**
*
*
*/
private Integer status;
/**
*
*
*/
private Integer isDeleted;
/**
*
*
*/
private String remark;

@ -1,14 +1,15 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

@ -1,14 +1,13 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.BaseTasktype;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.wcs.domain.BaseTasktype;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -70,4 +69,4 @@ public class BaseTasktypeBo implements Serializable {
*/
private Map<String, Object> params = new HashMap<>();
}
}

@ -1,11 +1,10 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.BaseWarehouse;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.wcs.domain.BaseWarehouse;
import java.io.Serializable;
import java.util.HashMap;
@ -40,7 +39,7 @@ public class BaseWarehouseBo implements Serializable {
private Integer workshopId;
/**
*
*
*/
private Integer workshopLevel;

@ -1,13 +1,11 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@ -55,4 +53,4 @@ public class WcsAgvCodeMapBo implements Serializable {
*/
private Map<String, Object> params = new HashMap<>();
}
}

@ -1,14 +1,14 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.WcsAgvStatus;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsAgvStatus;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -126,4 +126,4 @@ public class WcsAgvStatusBo implements Serializable {
*/
private Map<String, Object> params = new HashMap<>();
}
}

@ -1,14 +1,13 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.WcsBaseDictionary;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.wcs.domain.WcsBaseDictionary;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -70,4 +69,4 @@ public class WcsBaseDictionaryBo implements Serializable {
*/
private Map<String, Object> params = new HashMap<>();
}
}

@ -1,13 +1,13 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.WcsPlcAddress;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsPlcAddress;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@ -53,4 +53,4 @@ public class WcsPlcAddressBo implements Serializable {
*/
private Map<String, Object> params = new HashMap<>();
}
}

@ -1,14 +1,15 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.WcsSubtaskInstance;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsSubtaskInstance;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -132,4 +133,4 @@ public class WcsSubtaskInstanceBo implements Serializable {
*/
private Map<String, Object> params = new HashMap<>();
}
}

@ -1,14 +1,15 @@
package org.dromara.wcs.domain.bo;
import org.dromara.wcs.domain.WcsTaskInstance;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsTaskInstance;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@ -89,7 +90,7 @@ public class WcsTaskInstanceBo implements Serializable {
private String taskParams;
/**
*
*
*/
private Integer currentsubtaskNo;

@ -4,6 +4,8 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.bo.BaseConfiginfoBo;
import java.io.Serializable;
@ -21,21 +23,41 @@ public class BaseConfiginfoImportVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* Key
*/
@ExcelProperty(value = "配置Key")
private String configKey;
/**
* PLC
*/
@ExcelProperty(value = "配置值")
private String configValue;
@ExcelProperty(value = "启用状态")
/**
* 0- 1-
*/
@ExcelProperty(value = "启用状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "is_falg")
private Integer isFalg;
@ExcelProperty(value = "数据类型")
/**
*
*/
@ExcelProperty(value = "数据类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "plc_data_type")
private String type;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* PLC
*/
@ExcelProperty(value = "PLC配置分组")
private Integer plcConfigId;
}

@ -5,6 +5,8 @@ import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseConfiginfo;
import java.io.Serial;
@ -25,27 +27,53 @@ public class BaseConfiginfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
private Integer configId;
/**
* Key 3#线
*/
@ExcelProperty(value = "配置Key")
private String configKey;
/**
* PLC
*/
@ExcelProperty(value = "配置值")
private String configValue;
@ExcelProperty(value = "启用状态")
/**
* 0- 1-
*/
@ExcelProperty(value = "启用状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "is_falg")
private Integer isFalg;
/**
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ExcelProperty(value = "数据类型")
/**
* bool / int / short / long / string(N)
*/
@ExcelProperty(value = "数据类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "plc_data_type")
private String type;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* PLC
*/
@ExcelProperty(value = "PLC配置分组")
private Integer plcConfigId;
}

@ -2,12 +2,16 @@ package org.dromara.wcs.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseEquipParameter;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_equip_parameter
@ -23,32 +27,90 @@ public class BaseEquipParameterVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
private Long id;
/**
*
*/
@ExcelProperty(value = "设备编码")
private String equipCode;
/**
*
*/
@ExcelProperty(value = "设备名称")
private String equipName;
@ExcelProperty(value = "设备类型")
/**
* AGV//线//
*/
@ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "subtask_device_type")
private String equipType;
/**
*
*/
@ExcelProperty(value = "设备型号")
private String equipModel;
/**
* speedtimeoutcapacity
*/
@ExcelProperty(value = "参数键")
private String paramKey;
/**
*
*/
@ExcelProperty(value = "参数名称")
private String paramName;
/**
*
*/
@ExcelProperty(value = "参数值")
private String paramValue;
@ExcelProperty(value = "参数类型")
/**
* STRING / INT / DOUBLE / BOOLEAN / JSON
*/
@ExcelProperty(value = "参数类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "param_type")
private String paramType;
/**
* m/ssmmkg
*/
@ExcelProperty(value = "参数单位")
private String paramUnit;
/**
*
*/
@ExcelProperty(value = "创建人")
private String createuser;
/**
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createtime;
/**
*
*/
@ExcelProperty(value = "更新人")
private String updateuser;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatetime;
}

@ -5,6 +5,8 @@ import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseEquipinfo;
import java.io.Serial;
@ -26,53 +28,107 @@ public class BaseEquipinfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
private Integer id;
/**
* 2-2#3-3#
*/
@ExcelProperty(value = "车间编号")
private Integer workshopId;
/**
*
*/
@ExcelProperty(value = "层数")
private Integer workshopLevel;
/**
* ID
*/
@ExcelProperty(value = "仓库ID")
private Integer warehouseId;
/**
*
*/
@ExcelProperty(value = "仓库名称")
private String warehouseName;
/**
*
*/
@ExcelProperty(value = "设备编号")
private String equipNo;
/**
*
*/
@ExcelProperty(value = "设备名称")
private String equipName;
/**
* IP
*/
@ExcelProperty(value = "IP地址")
private String serverIp;
/**
*
*/
@ExcelProperty(value = "端口")
private Integer serverPort;
@ExcelProperty(value = "设备状态")
/**
* 0- 1- 2-
*/
@ExcelProperty(value = "设备状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "equip_status")
private Integer equipStatus;
@ExcelProperty(value = "可用标识")
/**
* 0- 1-
*/
@ExcelProperty(value = "可用标识", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "use_flag")
private Integer useFlag;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ExcelProperty(value = "设备类型")
/**
* 1-AGV 2-/ 3- 7-
*/
@ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "equip_type")
private Integer equipType;
/**
* /
*/
@ExcelProperty(value = "托盘编码")
private String containerCode;
/**
* AGV
*/
@ExcelProperty(value = "AGV点位编码")
private String agvPositionCode;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
*
*/
private List<BaseEquipParameterVo> parameterList;
}

@ -5,6 +5,8 @@ import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseInoutrecord;
import java.io.Serial;
@ -25,27 +27,52 @@ public class BaseInoutrecordVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
private Integer id;
@ExcelProperty(value = "出入库标志")
/**
* 1- 2-
*/
@ExcelProperty(value = "出入库方向", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "inout_flag")
private Integer inoutFlag;
/**
*
*/
@ExcelProperty(value = "物料类型")
private String materialType;
/**
*
*/
@ExcelProperty(value = "物料编号")
private String materialCode;
/**
*
*/
@ExcelProperty(value = "仓库编号")
private String warehouseId;
/**
*
*/
@ExcelProperty(value = "出入库人员")
private String createuser;
/**
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updateTime;

@ -5,6 +5,8 @@ import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseLocation;
import java.io.Serial;
@ -25,58 +27,114 @@ public class BaseLocationVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
private Integer locationId;
/**
*
*/
@ExcelProperty(value = "车间编号")
private Integer workshopId;
/**
*
*/
@ExcelProperty(value = "层数")
private Integer workshopLevel;
/**
* ID
*/
@ExcelProperty(value = "仓库ID")
private Integer warehouseId;
/**
*
*/
@ExcelProperty(value = "仓库名称")
private String warehouseName;
/**
*
*/
@ExcelProperty(value = "机台")
private Integer machineId;
/**
*
*/
@ExcelProperty(value = "库位编码")
private String locationCode;
/**
* AGV
*/
@ExcelProperty(value = "AGV点位编码")
private String agvPositionCode;
/**
*
*/
@ExcelProperty(value = "料箱编码")
private String containerCode;
/**
*
*/
@ExcelProperty(value = "数量")
private Integer locCount;
@ExcelProperty(value = "激活标记")
/**
* 0- 1-
*/
@ExcelProperty(value = "激活标记", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "active_flag")
private Integer activeFlag;
@ExcelProperty(value = "库位状态")
/**
* 0- 1-
*/
@ExcelProperty(value = "库位状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "location_status")
private Integer locationStatus;
/**
*
*/
@ExcelProperty(value = "创建者")
private String createBy;
/**
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createdTime;
/**
*
*/
@ExcelProperty(value = "更新人")
private String updatedBy;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* RFIDKey
*/
@ExcelProperty(value = "RFID设备Key")
private String equipKey;
}

@ -1,21 +1,18 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.BaseMaterialinfo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseMaterialinfo;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_materialinfo
*
@ -31,70 +28,80 @@ public class BaseMaterialinfoVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
* ID
*/
@ExcelProperty(value = "")
private Long id;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "物料编码")
private String materialCode;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "物料名称")
private String materialName;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "物料类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "material_type")
private String materialType;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "物料分类", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "material_category")
private String materialCategory;
/**
*
* 0- 1-
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "enable_status")
private Integer status;
/**
*
* 0- 1-
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "is_deleted")
private Integer isDeleted;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "备注")
private String remark;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createtime;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "创建人")
private String createuser;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatetime;
/**
*
*/
@ExcelProperty(value = "更新人")
private String updateuser;
}

@ -5,6 +5,8 @@ import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseRfidinfo;
import java.io.Serial;
@ -25,33 +27,74 @@ public class BaseRfidinfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* ID
*/
private Integer configId;
/**
*
*/
@ExcelProperty(value = "设备名称")
private String equipName;
/**
*
*/
@ExcelProperty(value = "机台代码")
private String machineCode;
/**
* IP
*/
@ExcelProperty(value = "读写器IP")
private String equipIp;
/**
*
*/
@ExcelProperty(value = "读写器端口")
private Integer equipPort;
/**
* Key
*/
@ExcelProperty(value = "读写器Key")
private String equipKey;
@ExcelProperty(value = "启用状态")
/**
* 0- 1-
*/
@ExcelProperty(value = "启用状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "is_falg")
private Integer isFalg;
/**
* 线0-线 1-线
*/
@ExcelProperty(value = "在线状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "online_status")
private Integer isOnline;
/**
*
*/
@ExcelProperty(value = "备注")
private String remark;
/**
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ExcelProperty(value = "在线状态")
private Integer isOnline;
@ExcelProperty(value = "设备名称")
private String equipName;
@ExcelProperty(value = "机台代码")
private String machineCode;
// @ExcelProperty(value = "在线状态")
// private Integer isOnline;
//
// @ExcelProperty(value = "设备名称")
// private String equipName;
//
// @ExcelProperty(value = "机台代码")
// private String machineCode;
}

@ -1,21 +1,18 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_subtask_template
*
@ -39,8 +36,7 @@ public class BaseSubtaskTemplateVo implements Serializable {
/**
*
*/
@ExcelProperty(value = "子任务编码", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "唯=一标识")
@ExcelProperty(value = "子任务编码")
private String subtaskCode;
/**
@ -53,41 +49,40 @@ public class BaseSubtaskTemplateVo implements Serializable {
* AGV//线//
*/
@ExcelProperty(value = "子任务类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "A=GV搬运/提升机升降/线体输送/等待/装卸货等")
@ExcelDictFormat(dictType = "subtask_type")
private String subtaskType;
/**
* AGV//线/
*/
@ExcelProperty(value = "执行设备类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "A=GV/提升机/线体/缓存位等")
@ExcelDictFormat(dictType = "subtask_device_type")
private String deviceType;
/**
* /////
*/
@ExcelProperty(value = "设备动作", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "取=货/放货/上升/下降/前进/等待等")
@ExcelProperty(value = "设备动作")
private String deviceAction;
/**
* ////线
*/
@ExcelProperty(value = "源位置类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "仓=库/机台/提升机/缓存位/线体")
@ExcelDictFormat(dictType = "location_type")
private String sourceLocationType;
/**
* {warehouse_code}
*/
@ExcelProperty(value = "源位置编码模板", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "支=持变量,如{warehouse_code}")
@ExcelProperty(value = "源位置编码模板")
private String sourceLocationCode;
/**
*
*/
@ExcelProperty(value = "目标位置类型")
@ExcelProperty(value = "目标位置类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "location_type")
private String targetLocationType;
/**
@ -100,21 +95,21 @@ public class BaseSubtaskTemplateVo implements Serializable {
* ///
*/
@ExcelProperty(value = "物料操作", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "取=货/放货/等待/空车返回")
@ExcelDictFormat(dictType = "material_action")
private String materialAction;
/**
* ///
*/
@ExcelProperty(value = "容器类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "四=宫格料箱/小料箱/色粉/托盘")
@ExcelDictFormat(dictType = "container_type")
private String containerType;
/**
* 0- 1-
*/
@ExcelProperty(value = "是否携带物料", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=-否,1=-是")
@ExcelDictFormat(dictType = "carry_material")
private Integer isCarryMaterial;
/**
@ -127,13 +122,14 @@ public class BaseSubtaskTemplateVo implements Serializable {
* 0- 1-
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=-禁用,1=-启用")
@ExcelDictFormat(dictType = "enable_status")
private Integer status;
/**
*
* 0- 1-
*/
@ExcelProperty(value = "逻辑删除标志")
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "is_deleted")
private Integer isDeleted;
/**
@ -146,6 +142,7 @@ public class BaseSubtaskTemplateVo implements Serializable {
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createtime;
/**
@ -154,11 +151,17 @@ public class BaseSubtaskTemplateVo implements Serializable {
@ExcelProperty(value = "创建人")
private String createuser;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatetime;
/**
*
*/
@ExcelProperty(value = "更新人")
private String updateuser;
}

@ -1,23 +1,20 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.BaseTasktype;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseTasktype;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_tasktype
* base_tasktype
*
* @author zch
* @date 2026-04-30
@ -31,64 +28,75 @@ public class BaseTasktypeVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ;
*
*/
@ExcelProperty(value = "主键;主键")
@ExcelProperty(value = "主键")
private Integer id;
/**
* ;
*
*/
@ExcelProperty(value = "字典名;字典名")
@ExcelProperty(value = "任务类型名称")
private String tasktypeName;
/**
* ;
* Key
*/
@ExcelProperty(value = "对应名;对应名")
@ExcelProperty(value = "任务类型Key")
private String tasktypeKey;
/**
* ;
*
*/
@ExcelProperty(value = "模板;模板")
@ExcelProperty(value = "任务模板值", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "tasktype_value")
private String tasktypeValue;
/**
* 0: 1:; 0: 1:
* 0- 1-
*/
@ExcelProperty(value = "是否可用 0:不可用 1:可用;是否可用 0:不可用 1:可用")
@ExcelProperty(value = "是否可用", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "use_flag")
private Integer useFlag;
/**
* 00-00CTU05000500;00-00CTU05000500
* /00-00CTU05/000500
*/
@ExcelProperty(value = "小车拿放类型如果是叉车背负式一定是00-00如果是CTU可能050005代表库位00是设备;小车拿放类型如果是叉车背负式一定是00-00如果是CTU可能050005代表库位00是设备")
@ExcelProperty(value = "小车拿放类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "agv_type")
private String agvType;
/**
* ;
*
*/
@ExcelProperty(value = "小车执行类型;小车执行类型")
@ExcelProperty(value = "小车执行类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "agv_task_type")
private String agvTaskType;
/**
* ;
*
*/
@ExcelProperty(value = "创建人;创建人")
@ExcelProperty(value = "创建人")
private String createdBy;
/**
* ;
*
*/
@ExcelProperty(value = "创建时间;创建时间")
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createdTime;
/**
* ;
*
*/
@ExcelProperty(value = "更新人;更新人")
@ExcelProperty(value = "更新人")
private String updatedBy;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
}

@ -1,19 +1,18 @@
package org.dromara.wcs.domain.vo;
import org.dromara.wcs.domain.BaseWarehouse;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.BaseWarehouse;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* base_warehouse
*
@ -29,69 +28,73 @@ public class BaseWarehouseVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID;ID
* ID
*/
@ExcelProperty(value = "仓库ID;仓库ID")
@ExcelProperty(value = "仓库ID")
private Integer warehouseId;
/**
* (1, 23);(1, 2)
* 1- 2- 3-
*/
@ExcelProperty(value = "存放类型(1四宫格料箱, 2小料箱3色粉);存放类型(1四宫格料箱, 2小料箱)")
@ExcelProperty(value = "存放类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "warehouse_type")
private Integer warehouseType;
/**
* (2-2#,3-3#);(2-2#,3-3#)
* 2-2#3-3#
*/
@ExcelProperty(value = "所属车间编号(2-2#,3-3#);所属车间编号(2-2#,3-3#)")
@ExcelProperty(value = "车间编号")
private Integer workshopId;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "车间层数")
private Integer workshopLevel;
/**
* ;
*
*/
@ExcelProperty(value = "仓库编码;仓库编码")
@ExcelProperty(value = "仓库编码")
private String warehouseCode;
/**
* ;
*
*/
@ExcelProperty(value = "仓库名称;仓库名称")
@ExcelProperty(value = "仓库名称")
private String warehouseName;
/**
* 1 0; 1 0
* 0- 1-
*/
@ExcelProperty(value = "激活标记 1是 0否;激活标记 1是 0否")
@ExcelProperty(value = "激活标记", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "active_flag")
private Integer activeFlag;
/**
* ;
*
*/
@ExcelProperty(value = "创建者;创建者")
@ExcelProperty(value = "创建者")
private String createBy;
/**
* ;
*
*/
@ExcelProperty(value = "创建时间;创建时间")
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* ;
*
*/
@ExcelProperty(value = "更新者;更新者")
@ExcelProperty(value = "更新者")
private String updateBy;
/**
* ;
*
*/
@ExcelProperty(value = "更新时间;更新时间")
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,23 +1,18 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* agv wcs_agv_code_map
* AGV wcs_agv_code_map
*
* @author zch
* @date 2026-04-30
@ -31,7 +26,7 @@ public class WcsAgvCodeMapVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@ExcelProperty(value = "机器人状态码")
private Long agvCode;
@ -45,7 +40,7 @@ public class WcsAgvCodeMapVo implements Serializable {
/**
*
*/
@ExcelProperty(value = "机器人状态定义说明")
@ExcelProperty(value = "状态定义说明")
private String agvStatusDefinition;
/**
@ -70,6 +65,7 @@ public class WcsAgvCodeMapVo implements Serializable {
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createTime;
}

@ -1,21 +1,18 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsAgvStatus;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.WcsAgvStatus;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* AGV wcs_agv_status
*
@ -55,10 +52,10 @@ public class WcsAgvStatusVo implements Serializable {
private String battery;
/**
* 1- 0-
* 0- 1-
*/
@ExcelProperty(value = "是否已被排除,被排除后不接受新任务", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=-排除,,0=-正常")
@ExcelProperty(value = "排除状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "excl_type")
private String excltype;
/**
@ -68,9 +65,10 @@ public class WcsAgvStatusVo implements Serializable {
private String mapcode;
/**
* 线
* 线true-线 false-线
*/
@ExcelProperty(value = "是否在线")
@ExcelProperty(value = "是否在线", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "online_status")
private String online;
/**
@ -82,37 +80,37 @@ public class WcsAgvStatusVo implements Serializable {
/**
*
*/
@ExcelProperty(value = "背货架编号")
@ExcelProperty(value = "背货架编号")
private String podcode;
/**
*
*/
@ExcelProperty(value = "背货架方向")
@ExcelProperty(value = "背货架方向")
private String poddir;
/**
* X
* X
*/
@ExcelProperty(value = "X")
@ExcelProperty(value = "X坐标")
private String posx;
/**
* Y
* Y
*/
@ExcelProperty(value = "Y")
@ExcelProperty(value = "Y坐标")
private String posy;
/**
* ( -180~360)
* -180~360
*/
@ExcelProperty(value = "机器人方向 (范围 -180~360度)")
@ExcelProperty(value = "机器人方向)")
private String robotdir;
/**
* Ip
* IP
*/
@ExcelProperty(value = "机器人Ip")
@ExcelProperty(value = "机器人IP")
private String robotip;
/**
@ -122,28 +120,29 @@ public class WcsAgvStatusVo implements Serializable {
private String speed;
/**
*
* wcs_agv_code_map.agv_code
*/
@ExcelProperty(value = "机器人状态")
@ExcelProperty(value = "机器人状态")
private String status;
/**
* agv
* AGV
*/
@ExcelProperty(value = "详细状态信息关联agv状态码查询")
@ExcelProperty(value = "详细状态")
private String statusDetail;
/**
* 0- 1-
* 0- 1-
*/
@ExcelProperty(value = "是否暂停 0-否 1-是")
@ExcelProperty(value = "是否暂停", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "yes_no_int")
private String stop;
/**
*
*
*/
@ExcelProperty(value = "时间")
@ExcelProperty(value = "上报时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date timestamp;
}

@ -1,23 +1,20 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsBaseDictionary;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.WcsBaseDictionary;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* wcs_base_dictionary
* wcs_base_dictionary
*
* @author zch
* @date 2026-04-30
@ -31,64 +28,74 @@ public class WcsBaseDictionaryVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ;
*
*/
@ExcelProperty(value = "主键;主键")
@ExcelProperty(value = "主键")
private Integer id;
/**
* ;
*
*/
@ExcelProperty(value = "字典名;字典名")
@ExcelProperty(value = "字典名")
private String dicName;
/**
* ;
* Key
*/
@ExcelProperty(value = "对应名;对应名")
@ExcelProperty(value = "字典Key")
private String dicKey;
/**
* ;
* /
*/
@ExcelProperty(value = "模板;模板")
@ExcelProperty(value = "字典值")
private String dicValue;
/**
* 0: 1:; 0: 1:
* 0- 1-
*/
@ExcelProperty(value = "是否可用 0:不可用 1:可用;是否可用 0:不可用 1:可用")
@ExcelProperty(value = "是否可用", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "use_flag")
private Integer useFlag;
/**
* 00-00CTU05000500;00-00CTU05000500
* /00-00CTU05/000500
*/
@ExcelProperty(value = "小车拿放类型如果是叉车背负式一定是00-00如果是CTU可能050005代表库位00是设备;小车拿放类型如果是叉车背负式一定是00-00如果是CTU可能050005代表库位00是设备")
@ExcelProperty(value = "小车拿放类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "agv_type")
private String agvType;
/**
* ;
*
*/
@ExcelProperty(value = "小车执行类型;小车执行类型")
@ExcelProperty(value = "小车执行类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "agv_task_type")
private String agvTaskType;
/**
* ;
*
*/
@ExcelProperty(value = "创建人;创建人")
@ExcelProperty(value = "创建人")
private String createdBy;
/**
* ;
*
*/
@ExcelProperty(value = "创建时间;创建时间")
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createdTime;
/**
* ;
*
*/
@ExcelProperty(value = "更新人;更新人")
@ExcelProperty(value = "更新人")
private String updatedBy;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
}

@ -1,21 +1,16 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsPlcAddress;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.wcs.domain.WcsPlcAddress;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* PLC wcs_plc_address
*
@ -37,7 +32,7 @@ public class WcsPlcAddressVo implements Serializable {
private Integer id;
/**
*
* /
*/
@ExcelProperty(value = "楼编号")
private String workshopId;
@ -58,12 +53,14 @@ public class WcsPlcAddressVo implements Serializable {
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,23 +1,20 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsSubtaskInstance;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.WcsSubtaskInstance;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* agv wcs_subtask_instance
* AGV wcs_subtask_instance
*
* @author zch
* @date 2026-04-30
@ -42,6 +39,12 @@ public class WcsSubtaskInstanceVo implements Serializable {
@ExcelProperty(value = "主任务编号")
private String maintaskCode;
/**
*
*/
@ExcelProperty(value = "任务名称")
private String taskName;
/**
*
*/
@ -55,21 +58,22 @@ public class WcsSubtaskInstanceVo implements Serializable {
private String palletInfoCode;
/**
* ,
* base_tasktype
*/
@ExcelProperty(value = "任务类型,字典表")
@ExcelProperty(value = "任务类型")
private Integer taskType;
/**
* ,
* 0- 1- 2- 3- 4-
*/
@ExcelProperty(value = "任务状态,字典表")
@ExcelProperty(value = "任务状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "subtask_status")
private Integer taskStatus;
/**
* id;id
* ID
*/
@ExcelProperty(value = "起始点id;起始点id")
@ExcelProperty(value = "起始点ID")
private String startPointId;
/**
@ -79,9 +83,9 @@ public class WcsSubtaskInstanceVo implements Serializable {
private String startAgvpoint;
/**
* id
* ID
*/
@ExcelProperty(value = "当前点id")
@ExcelProperty(value = "当前点ID")
private String currPointId;
/**
@ -91,9 +95,9 @@ public class WcsSubtaskInstanceVo implements Serializable {
private String currAgvpoint;
/**
* id
* ID
*/
@ExcelProperty(value = "下一点id")
@ExcelProperty(value = "下一点ID")
private String nextPointId;
/**
@ -103,9 +107,9 @@ public class WcsSubtaskInstanceVo implements Serializable {
private String nextAgvpoint;
/**
* id
* ID
*/
@ExcelProperty(value = "终点id")
@ExcelProperty(value = "终点ID")
private String endPointId;
/**
@ -115,21 +119,29 @@ public class WcsSubtaskInstanceVo implements Serializable {
private String endAgvpoint;
/**
* 0: 1:
*
*/
@ExcelProperty(value = "是否可用 0:不可用 1:可用")
@ExcelProperty(value = "终点机台编号")
private String machineCode;
/**
* 0- 1-
*/
@ExcelProperty(value = "是否可用", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "use_flag")
private Integer useFlag;
/**
* Agvcode
* AGVcode
*/
@ExcelProperty(value = "Agv返回code")
@ExcelProperty(value = "AGV返回Code")
private String taskcode;
/**
* ;01agv2agv
* 0- 1-AGV 2-/AGV
*/
@ExcelProperty(value = "是否已删除;0未删除、1需要删除和取消agv任务、2需要删除、取消agv任务、创建去异常库位的任务")
@ExcelProperty(value = "删除状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "subtask_delete")
private Integer isDelete;
/**
@ -142,6 +154,7 @@ public class WcsSubtaskInstanceVo implements Serializable {
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createdTime;
/**
@ -151,16 +164,10 @@ public class WcsSubtaskInstanceVo implements Serializable {
private String updatedBy;
/**
*
*
*/
@ExcelProperty(value = "任务名称")
private String taskName;
/**
*
*/
@ExcelProperty(value = "终点机台编号")
private String machineCode;
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
}

@ -1,21 +1,18 @@
package org.dromara.wcs.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.wcs.domain.WcsTaskInstance;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import cn.idev.excel.annotation.format.DateTimeFormat;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.wcs.domain.WcsTaskInstance;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* wcs_task_instance
*
@ -39,8 +36,7 @@ public class WcsTaskInstanceVo implements Serializable {
/**
*
*/
@ExcelProperty(value = "任务编码", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "唯=一标识")
@ExcelProperty(value = "任务编码")
private String taskCode;
/**
@ -50,10 +46,9 @@ public class WcsTaskInstanceVo implements Serializable {
private String taskName;
/**
* Keybase_tasktypetasktype_key
* Key base_tasktype.tasktype_key
*/
@ExcelProperty(value = "任务类型Key", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联base_tasktype的tasktype_key")
@ExcelProperty(value = "任务类型Key")
private String taskTypeKey;
/**
@ -63,24 +58,23 @@ public class WcsTaskInstanceVo implements Serializable {
private String taskTypeName;
/**
* PENDING-/RUNNING-/PAUSED-/SUCCESS-/FAILED-/CANCELLED-
* PENDING- / RUNNING- / PAUSED- / SUCCESS- / FAILED- / CANCELLED-
*/
@ExcelProperty(value = "任务状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "P=ENDING-待执行/RUNNING-执行中/PAUSED-已暂停/SUCCESS-成功/FAILED-失败/CANCELLED-已取消")
@ExcelDictFormat(dictType = "task_status")
private String status;
/**
* 0- 1- 2- 3-
*/
@ExcelProperty(value = "优先级", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=-普通,1=-较高,2=-高,3=-最高")
@ExcelDictFormat(dictType = "task_priority")
private Integer priority;
/**
* //
* / /
*/
@ExcelProperty(value = "源位置", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "仓=库/库位/机台等")
@ExcelProperty(value = "源位置")
private String sourceLocation;
/**
@ -104,14 +98,13 @@ public class WcsTaskInstanceVo implements Serializable {
/**
* JSON
*/
@ExcelProperty(value = "任务参数", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "J=SON格式存储其他扩展参数")
@ExcelProperty(value = "任务参数")
private String taskParams;
/**
*
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "当前子任务序号")
private Integer currentsubtaskNo;
/**
@ -123,13 +116,13 @@ public class WcsTaskInstanceVo implements Serializable {
/**
*
*/
@ExcelProperty(value = "当前执行的子任务编码")
@ExcelProperty(value = "当前子任务编码")
private String currentSubtaskCode;
/**
*
*/
@ExcelProperty(value = "执行结果代码")
@ExcelProperty(value = "结果代码")
private Integer resultCode;
/**
@ -139,9 +132,10 @@ public class WcsTaskInstanceVo implements Serializable {
private String errorMessage;
/**
*
* 0- 1-
*/
@ExcelProperty(value = "逻辑删除标志")
@ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "is_deleted")
private Integer isDeleted;
/**
@ -154,6 +148,7 @@ public class WcsTaskInstanceVo implements Serializable {
*
*/
@ExcelProperty(value = "创建时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date createtime;
/**
@ -162,11 +157,17 @@ public class WcsTaskInstanceVo implements Serializable {
@ExcelProperty(value = "创建人")
private String createuser;
/**
*
*/
@ExcelProperty(value = "更新时间")
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
private Date updatetime;
/**
*
*/
@ExcelProperty(value = "更新人")
private String updateuser;
}

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.BaseMaterialinfo;
import org.dromara.wcs.domain.vo.BaseMaterialinfoVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import org.dromara.wcs.domain.vo.BaseSubtaskTemplateVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.BaseTasktype;
import org.dromara.wcs.domain.vo.BaseTasktypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.BaseWarehouse;
import org.dromara.wcs.domain.vo.BaseWarehouseVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import org.dromara.wcs.domain.vo.WcsAgvCodeMapVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.WcsAgvStatus;
import org.dromara.wcs.domain.vo.WcsAgvStatusVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.WcsBaseDictionary;
import org.dromara.wcs.domain.vo.WcsBaseDictionaryVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.WcsPlcAddress;
import org.dromara.wcs.domain.vo.WcsPlcAddressVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -2,11 +2,7 @@ package org.dromara.wcs.mapper;
import org.apache.ibatis.annotations.Param;
import org.dromara.wcs.domain.bo.WcsReportQuery;
import org.dromara.wcs.domain.vo.WcsErrorTaskVo;
import org.dromara.wcs.domain.vo.WcsLocationUtilizationVo;
import org.dromara.wcs.domain.vo.WcsTaskStatVo;
import org.dromara.wcs.domain.vo.WcsTaskTrendVo;
import org.dromara.wcs.domain.vo.WcsTaskTypeStatVo;
import org.dromara.wcs.domain.vo.*;
import java.util.List;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.WcsSubtaskInstance;
import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wcs.domain.WcsTaskInstance;
import org.dromara.wcs.domain.vo.WcsTaskInstanceVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.io.Serializable;
import java.util.Collection;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.BaseMaterialinfoVo;
import org.dromara.wcs.domain.bo.BaseMaterialinfoBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.BaseMaterialinfoBo;
import org.dromara.wcs.domain.vo.BaseMaterialinfoVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.BaseSubtaskTemplateVo;
import org.dromara.wcs.domain.bo.BaseSubtaskTemplateBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.BaseSubtaskTemplateBo;
import org.dromara.wcs.domain.vo.BaseSubtaskTemplateVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.BaseTasktypeVo;
import org.dromara.wcs.domain.bo.BaseTasktypeBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.BaseTasktypeBo;
import org.dromara.wcs.domain.vo.BaseTasktypeVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.BaseWarehouseVo;
import org.dromara.wcs.domain.bo.BaseWarehouseBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.BaseWarehouseBo;
import org.dromara.wcs.domain.vo.BaseWarehouseVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.WcsAgvCodeMapVo;
import org.dromara.wcs.domain.bo.WcsAgvCodeMapBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.WcsAgvCodeMapBo;
import org.dromara.wcs.domain.vo.WcsAgvCodeMapVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.WcsAgvStatusVo;
import org.dromara.wcs.domain.bo.WcsAgvStatusBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.WcsAgvStatusBo;
import org.dromara.wcs.domain.vo.WcsAgvStatusVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.WcsBaseDictionaryVo;
import org.dromara.wcs.domain.bo.WcsBaseDictionaryBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.WcsBaseDictionaryBo;
import org.dromara.wcs.domain.vo.WcsBaseDictionaryVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.WcsPlcAddressVo;
import org.dromara.wcs.domain.bo.WcsPlcAddressBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.WcsPlcAddressBo;
import org.dromara.wcs.domain.vo.WcsPlcAddressVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo;
import org.dromara.wcs.domain.bo.WcsSubtaskInstanceBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.WcsSubtaskInstanceBo;
import org.dromara.wcs.domain.vo.WcsSubtaskInstanceVo;
import java.util.Collection;
import java.util.List;

@ -1,9 +1,9 @@
package org.dromara.wcs.service;
import org.dromara.wcs.domain.vo.WcsTaskInstanceVo;
import org.dromara.wcs.domain.bo.WcsTaskInstanceBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.bo.WcsTaskInstanceBo;
import org.dromara.wcs.domain.vo.WcsTaskInstanceVo;
import java.util.Collection;
import java.util.List;

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.BaseMaterialinfo;
import org.dromara.wcs.domain.bo.BaseMaterialinfoBo;
import org.dromara.wcs.domain.vo.BaseMaterialinfoVo;
import org.dromara.wcs.domain.BaseMaterialinfo;
import org.dromara.wcs.mapper.BaseMaterialinfoMapper;
import org.dromara.wcs.service.IBaseMaterialinfoService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import org.dromara.wcs.domain.bo.BaseSubtaskTemplateBo;
import org.dromara.wcs.domain.vo.BaseSubtaskTemplateVo;
import org.dromara.wcs.domain.BaseSubtaskTemplate;
import org.dromara.wcs.mapper.BaseSubtaskTemplateMapper;
import org.dromara.wcs.service.IBaseSubtaskTemplateService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.BaseTasktype;
import org.dromara.wcs.domain.bo.BaseTasktypeBo;
import org.dromara.wcs.domain.vo.BaseTasktypeVo;
import org.dromara.wcs.domain.BaseTasktype;
import org.dromara.wcs.mapper.BaseTasktypeMapper;
import org.dromara.wcs.service.IBaseTasktypeService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.BaseWarehouse;
import org.dromara.wcs.domain.bo.BaseWarehouseBo;
import org.dromara.wcs.domain.vo.BaseWarehouseVo;
import org.dromara.wcs.domain.BaseWarehouse;
import org.dromara.wcs.mapper.BaseWarehouseMapper;
import org.dromara.wcs.service.IBaseWarehouseService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import org.dromara.wcs.domain.bo.WcsAgvCodeMapBo;
import org.dromara.wcs.domain.vo.WcsAgvCodeMapVo;
import org.dromara.wcs.domain.WcsAgvCodeMap;
import org.dromara.wcs.mapper.WcsAgvCodeMapMapper;
import org.dromara.wcs.service.IWcsAgvCodeMapService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* agvService

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.WcsAgvStatus;
import org.dromara.wcs.domain.bo.WcsAgvStatusBo;
import org.dromara.wcs.domain.vo.WcsAgvStatusVo;
import org.dromara.wcs.domain.WcsAgvStatus;
import org.dromara.wcs.mapper.WcsAgvStatusMapper;
import org.dromara.wcs.service.IWcsAgvStatusService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* AGVService

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.WcsBaseDictionary;
import org.dromara.wcs.domain.bo.WcsBaseDictionaryBo;
import org.dromara.wcs.domain.vo.WcsBaseDictionaryVo;
import org.dromara.wcs.domain.WcsBaseDictionary;
import org.dromara.wcs.mapper.WcsBaseDictionaryMapper;
import org.dromara.wcs.service.IWcsBaseDictionaryService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.WcsPlcAddress;
import org.dromara.wcs.domain.bo.WcsPlcAddressBo;
import org.dromara.wcs.domain.vo.WcsPlcAddressVo;
import org.dromara.wcs.domain.WcsPlcAddress;
import org.dromara.wcs.mapper.WcsPlcAddressMapper;
import org.dromara.wcs.service.IWcsPlcAddressService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* PLCService

@ -1,24 +1,24 @@
package org.dromara.wcs.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.wcs.domain.WcsTaskInstance;
import org.dromara.wcs.domain.bo.WcsTaskInstanceBo;
import org.dromara.wcs.domain.vo.WcsTaskInstanceVo;
import org.dromara.wcs.domain.WcsTaskInstance;
import org.dromara.wcs.mapper.WcsTaskInstanceMapper;
import org.dromara.wcs.service.IWcsTaskInstanceService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* Service

Loading…
Cancel
Save