diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 99d9bdd..50a5461 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -51,6 +51,26 @@ public class WmsEnumUtil { } return null; } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descriptionOfValue(String desc) { + int tmp = DISABLE.value; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -1978,7 +1998,7 @@ public class WmsEnumUtil { * 成功标志枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RC_OK_VALUE { + public enum AM_OK_VALUE { IS_TRUE(10, true, "成功"), IS_FALSE(20, false, "失败"); @@ -1987,7 +2007,7 @@ public class WmsEnumUtil { private boolean codeValue; private String description; - RC_OK_VALUE(int value, boolean codeValue, String description) { + AM_OK_VALUE(int value, boolean codeValue, String description) { this.value = value; this.codeValue = codeValue; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java new file mode 100644 index 0000000..4d3f2fd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 作业流程导入Model + * @Reference + * @Author dragon + * @CreateDate 2019/12/10 11:26 + * @Modify + */ +@Data +@Api("作业流程导入Model") +public class WmsAgImportModel implements Serializable { + private static final long serialVersionUID = 5322363872992177667L; + @ApiParam("流程集合") + public List agList; + @ApiParam("流程明细集合") + List agdList; + @ApiParam("步骤调用参数集合") + List ascpList; + @ApiParam("作业步骤集合") + List asList; + @ApiParam("作业步骤调用集合") + List ascList; + @ApiParam("作业组件集合") + List amList; + @ApiParam("作业组件参数集合") + List ampList; + @ApiParam("作业步骤参数类型集合") + List astList; + @ApiParam("工厂代码") + public String organizeCode; + @ApiParam("是否覆盖") + public Integer isConvert; + @ApiParam("用户名") + public String userName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 336e497..9d502de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -29,45 +30,49 @@ import javax.persistence.*; public class WmsActionGroup extends BaseBean { private static final long serialVersionUID = -4169996695337717755L; - @Column(name = "AG_NAME_E") + @Column(name = "AG_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程名称") private String agNameE; - @Column(name = "AG_DESC_E") + @Column(name = "AG_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam("英文流程描述") private String agDescE; - @Column(name = "AG_NAME_C") + @Column(name = "AG_NAME_C", nullable = false) @ApiParam("中文流程名称") + @AnnoOutputColumn private String agNameC; - @Column(name = "AG_DESC_C") + @Column(name = "AG_DESC_C", nullable = false) @ApiParam("中文流程描述") + @AnnoOutputColumn private String agDescC; - @Column(name = "INIT_AM_ID") + @Column(name = "INIT_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "初始化组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Column(name = "DETAILS_AM_ID") + @Column(name = "DETAILS_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Column(name = "END_AM_ID") + @Column(name = "END_AM_ID", columnDefinition = "bigint(20) default 0") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; // 1=true, 2 = false - @Column(name = "AUTO_INIT") + @Column(name = "AUTO_INIT", nullable = false) @ApiParam(value = "任务自动初始化", example = "0") + @AnnoOutputColumn private Integer autoInit; // 1=true, 2 = false - @Column(name = "IS_COMMIT_REF_MOVE", columnDefinition = "int default 2", nullable = false) + @Column(name = "IS_COMMIT_REF_MOVE", nullable = false) @ApiParam(value = "是否连带提交创建状态移动单", example = "2") + @AnnoOutputColumn private Integer isCommitRefMove; @Lob diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index fc0f62b..5878561 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,98 +33,107 @@ import javax.persistence.Transient; public class WmsActionGroupDetails extends BaseBean { private static final long serialVersionUID = 544189352378073377L; - @Column(name = "AG_ID") + @Column(name = "AG_ID", nullable = false) @ApiParam(value = "作业流程ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agId; - @Column(name = "SEQ") + @Column(name = "SEQ", nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn private Integer seq; - @Column(name = "OK_SEQ") + @Column(name = "OK_SEQ", nullable = false) @ApiParam(value = "成功跳转步骤", example = "0") + @AnnoOutputColumn private Integer okSeq; - @Column(name = "NG_SEQ") + @Column(name = "NG_SEQ",nullable = false) @ApiParam(value = "失败跳转步骤", example = "0") + @AnnoOutputColumn private Integer ngSeq; - @Column(name = "VALUE_TYPE") + @Column(name = "VALUE_TYPE", nullable = false) @ApiParam(value = "动作类型", example = "10") + @AnnoOutputColumn private Integer valueType; - @Column(name = "TO_UPPER") + @Column(name = "TO_UPPER", nullable = false) @ApiParam(value = "是否转为大写", example = "2") + @AnnoOutputColumn private Integer toUpper; - @Column(name = "LEN_CHECK") + @Column(name = "LEN_CHECK", columnDefinition = "int default 0") @ApiParam(value = "长度检查", example = "0") private Integer lenCheck; - @Column(name = "REGULAR_CHECK") + @Column(name = "REGULAR_CHECK", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验") private String regularCheck; - @Column(name = "REGULAR_CHECK_FAIL_MSG") + @Column(name = "REGULAR_CHECK_FAIL_MSG", columnDefinition = "varchar(1000) default ''") @ApiParam(value = "正则校验失败提示") private String regularCheckFailMsg; - @Column(name = "AS_ID") - @ApiParam(value = "作业步骤", example = "0") + @Column(name = "AS_ID", nullable = false) + @ApiParam(value = "作业步骤") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long asId; - @Column(name = "AT_ID") - @ApiParam(value = "步骤类型编号", example = "0") + @Column(name = "AT_ID", nullable = false) + @ApiParam(value = "步骤类型编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; - @Transient - @ApiParam(value = "作业步骤名称") - private String asName; - - @Transient - @ApiParam(value = "步骤类型名称") - private String atName; - - @Transient - @ApiParam(value = "流程名称") - private String agName; - - @Column(name = "GOTO_BTN_CODE") + @Column(name = "GOTO_BTN_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮代码") private String goToBtnCode; - @Column(name = "GOTO_BTN_NAME") + @Column(name = "GOTO_BTN_NAME", columnDefinition = "varchar(225) default ''") @ApiParam(value = "跳转按钮名称") private String goToBtnName; - @Column(name = "PRE_SHOW") - @ApiParam(value = "是否预显示", example = "1") + @Column(name = "PRE_SHOW", columnDefinition = "int default 0") + @ApiParam(value = "是否预显示") private Integer preShow; - @Column(name = "SHOW_AM_ID") - @ApiParam(value = "回显组件方法ID", example = "1") + @Column(name = "SHOW_AM_ID", columnDefinition = "bigint(20) default 0") + @ApiParam(value = "回显组件方法ID") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; - @Column(name = "IS_COMMIT_ABLE") - @ApiParam(value = "是否可提交", example = "2") + @Column(name = "IS_COMMIT_ABLE", nullable = false) + @ApiParam(value = "是否可提交") + @AnnoOutputColumn private Integer isCommitAble; - @Column(name = "IS_AUTO_OPEN_WINDOW") - @ApiParam(value = "是否自动开窗", example = "2") + @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) + @ApiParam(value = "是否自动开窗") private Integer isAutoOpenWindow; - @Column(name = "SEARCH_KEY") + @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "搜索KEY") private String searchKey; - @Column(name = "GROUP_KEY") + @Column(name = "GROUP_KEY", columnDefinition = "varchar(225) default ''") @ApiParam(value = "分组KEY") private String groupKey; + @Transient + @ApiParam(value = "作业步骤名称") + private String asName; + + @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient + @ApiParam(value = "流程名称") + private String agName; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index a41ef59..d43b2d8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -29,31 +30,36 @@ import javax.persistence.Table; public class WmsActionModule extends BaseBean { private static final long serialVersionUID = 9117362998863937579L; - @Column(name = "AM_NAME") + @Column(name = "AM_NAME",nullable = false) @ApiParam("组件名称") + @AnnoOutputColumn public String amName; - @Column(name = "AM_DESC") + @Column(name = "AM_DESC", nullable = false) @ApiParam("组件描述") + @AnnoOutputColumn public String amDesc; - @Column(name = "CALL_CLASS") + @Column(name = "CALL_CLASS",nullable = false) @ApiParam("实现类") + @AnnoOutputColumn public String callClass; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE", nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "作业类型") public String opTypeCode; - @Column(name = "IS_SHOW_INFO") - @ApiParam(value = "是否实现回显", example = "0") + @Column(name = "IS_SHOW_INFO", nullable = false) + @ApiParam(value = "是否实现回显") + @AnnoOutputColumn public Integer isShowInfo; - @ApiParam(value = "作业类型名称", example = "0") + @ApiParam(value = "作业类型名称") public String opTypeName; public WmsActionModule() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index a87c559..1923bb0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,34 @@ import javax.persistence.Table; public class WmsActionModuleParam extends BaseBean { private static final long serialVersionUID = 8099621042858629818L; - @Column(name = "AM_ID") - @ApiParam(value = "组件ID", example = "0") + @Column(name = "AM_ID", nullable = false) + @ApiParam(value = "组件ID") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; - @Column(name = "METHOD_NAME") + @Column(name = "METHOD_NAME", columnDefinition = "varchar(255) default ''") @ApiParam("组件执行方法名称") + @AnnoOutputColumn public String methodName; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE", nullable = false) @ApiParam("参数编码") + @AnnoOutputColumn public String paramCode; - @Column(name = "PARAM_NAME") + @Column(name = "PARAM_NAME", nullable = false) @ApiParam("参数名称") + @AnnoOutputColumn public String paramName; - @Column(name = "PARAM_VALUE_LIST") + @Column(name = "PARAM_VALUE_LIST", columnDefinition = "varchar(225) default ''") @ApiParam("参数可选值列表") public String paramValueList; - @Column(name = "PARAM_TYPE") + @Column(name = "PARAM_TYPE",nullable = false) @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") + @AnnoOutputColumn public Integer paramType; public int getParamTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 265272b..8144c65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -31,29 +32,33 @@ import javax.persistence.Table; public class WmsActionStep extends BaseBean { private static final long serialVersionUID = 6460096995982059959L; - @Column(name = "AS_NAME_E") + @Column(name = "AS_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String asNameE; - @Column(name = "AS_DESC_E") + @Column(name = "AS_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String asDescE; - @Column(name = "AS_NAME_C") + @Column(name = "AS_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String asNameC; - @Column(name = "AS_DESC_C") + @Column(name = "AS_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String asDescC; - @Column(name = "AT_NAME_C_RDD") + @Column(name = "AT_NAME_C_RDD", nullable = false) @ApiParam(value = "步骤类型名称") + @AnnoOutputColumn private String atNameCRdd; - @Column(name = "AT_ID") + @Column(name = "AT_ID", nullable = false) @ApiParam(value = "步骤类型编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long atId; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 4b8388f..c354a66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -33,18 +34,21 @@ import javax.persistence.*; public class WmsActionStepCall extends BaseBean { private static final long serialVersionUID = -6013283534745803464L; - @Column(name = "AS_ID") + @Column(name = "AS_ID",nullable = false) @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long asId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号", example = "0") + @AnnoOutputColumn public Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn public Long amId; @Transient @@ -55,12 +59,14 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public String amDesc; - @Column(name = "AM_TYPE") - @ApiParam(value = "组件类型", example = "0") + @Column(name = "AM_TYPE",nullable = false) + @ApiParam(value = "组件类型") + @AnnoOutputColumn public Integer amType; - @Column(name = "OK_VALUE") - @ApiParam(value = "成功标志", example = "10") + @Column(name = "OK_VALUE", nullable = false) + @ApiParam(value = "成功标志") + @AnnoOutputColumn public Integer okValue; public int getAmTypeVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ee0b539..41ceb88 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -32,25 +33,29 @@ import javax.persistence.Transient; public class WmsActionStepCallParam extends BaseBean { private static final long serialVersionUID = -2813779192436803301L; - @Column(name = "AGD_ID") + @Column(name = "AGD_ID", nullable = false) @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long agdId; - @Column(name = "SEQ") + @Column(name = "SEQ",nullable = false) @ApiParam(value = "序号") + @AnnoOutputColumn private Integer seq; - @Column(name = "AM_ID") + @Column(name = "AM_ID", nullable = false) @ApiParam(value = "处理组件编号") @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn private Long amId; - @Column(name = "PARAM_CODE") + @Column(name = "PARAM_CODE",nullable = false) @ApiParam(value = "参数编码") + @AnnoOutputColumn private String paramCode; - @Column(name = "PARAM_VALUE") + @Column(name = "PARAM_VALUE", columnDefinition = "varchar(225) default ''") @ApiParam(value = "参数值") private String paramValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index 926e108..4f8536b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -21,31 +22,34 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_ACTION_TYPE") +@Table(name = "WMS_ACTION_TYPE") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +@Api(value = "作业步骤类型信息", description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { private static final long serialVersionUID = -8019644718382990603L; - @Column(name = "AT_NAME_E") + @Column(name = "AT_NAME_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型名称") private String atNameE; - @Column(name = "AT_DESC_E") + @Column(name = "AT_DESC_E", columnDefinition = "varchar(225) default ''") @ApiParam(value = "英文类型描述") private String atDescE; - @Column(name = "AT_NAME_C") + @Column(name = "AT_NAME_C", nullable = false) @ApiParam(value = "中文类型名称") + @AnnoOutputColumn private String atNameC; - @Column(name = "AT_DESC_C") + @Column(name = "AT_DESC_C", nullable = false) @ApiParam(value = "中文类型描述") + @AnnoOutputColumn private String atDescC; - @Column(name = "FUN_CALL_NAME") + @Column(name = "FUN_CALL_NAME", nullable = false) @ApiParam(value = "方法调用名称") + @AnnoOutputColumn private String funCallName; }