|
|
|
|
@ -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;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|