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 59423a3..be4e962 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 @@ -745,6 +745,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 外部单据:移库单单据类型 */ @@ -912,6 +913,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 业务表:库存条码质检状态 */ @@ -1160,7 +1162,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_ITEM_STATUS { - CREATE(1, "创建"),FINISH(10, "已处理"); + CREATE(1, "创建"), FINISH(10, "已处理"); private int value; private String description; @@ -1194,7 +1196,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MOVE_ORDER_STATUS { - CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理"); + CREATE(1, "创建"), BE_HANDLE(10, "待处理"), FINISH(20, "已处理"); private int value; private String description; @@ -1401,7 +1403,7 @@ public class WmsEnumUtil { } /** - *作业流程动作类型 + * 作业流程动作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ACTION_GROUP_DETAILS_VALUE_TYPE { @@ -1472,4 +1474,42 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 作业步骤处理组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_MODULE_TYPE { + HANDLE(10, "流程处理组件"), + INIT(20, "流程初始化组件"), + END(30, "流程结束组件"), + DETAILS(40, "明细处理组件"), + SHOW(50, "回显示组件"); + + private int value; + private String description; + + ACTION_MODULE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index f04d28c..c56c29c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -21,27 +23,28 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_TRANS_TYPE") +@Table(name = "WMS_TRANS_TYPE") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="交易类型表",description = "交易类型表") -public class WmsTransType extends BaseBean{ +@Api(value = "交易类型表", description = "交易类型表") +public class WmsTransType extends BaseBean { - @Column(name="TRANS_TYPE_CODE") - @ApiParam(value ="类型编号") + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "类型编号") private String transTypeCode; - @Column(name="TRANS_TYPE_NAME") - @ApiParam(value ="类型名称") + @Column(name = "TRANS_TYPE_NAME") + @ApiParam(value = "类型名称") private String transTypeName; - @Column(name="SEQ") - @ApiParam(value ="序号", example = "-1") + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "-1") private Integer seq; - @Column(name="PROG_CODE") - @ApiParam(value ="处理程序") - private String progCode; + @Column(name = "PROG_CODE") + @ApiParam(value = "处理程序", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long progCode; }