diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java new file mode 100644 index 0000000..b498c26 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java @@ -0,0 +1,165 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 作业记录表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-23 11:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_LOG") +@Api(value="作业记录表",description = "作业记录表") +public class WmsActionLog extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value = "作业任务编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long taskId; + + //get单独处理 + public Long getTaskId() { + if(taskId != null) { + return taskId.longValue(); + }else{ + return taskId; + } + } + + @Column(name="TRANS_TYPE_CODE") + @ApiParam(value = "交易类型编号") + public String transTypeCode; + + @Transient + @ApiParam(value = "交易类型名称") + public String transTypeName; + + @Column(name="AG_ID") + @ApiParam(value = "作业流程编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long agId; + + //get单独处理 + public Long getAgId() { + if(agId != null) { + return agId.longValue(); + }else{ + return agId; + } + } + + @Column(name="AG_NAME_C") + @ApiParam(value = "作业流程名称") + public String agNameC; + + @Column(name="ACTION_USER_NAME") + @ApiParam(value = "作业人员") + public String actionUserName; + + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + + @Column(name="ORDER_NO") + @ApiParam(value = "单据编号") + public String orderNo; + + @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "开始作业时间") + public String startTime; + + @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "结束作业时间") + public String endTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始作业时间查询用,查询起始日期",example = "2018-01-01 01:00:00") + public String startTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始作业时间查询用,查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束作业时间查询用,查询起始日期",example = "2018-01-01 01:00:00") + public String endTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束作业时间查询用,查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + // 状态:1=创建,10=处理中,20=已完成 + @Column(name="ACTION_STATUS") + @ApiParam(value = "作业状态", example = "1") + public Integer actionStatus; + + @Column(name="TOTAL_STEP") + @ApiParam(value = "总步数", example = "1") + public Integer totalStep; + + @Column(name="CURRENT_STEP") + @ApiParam(value = "当前步骤", example = "1") + public Integer currentStep; + + @Column(name="INIT_AM_ID") + @ApiParam(value = "初始化组件编号", example = "0") + private Long initAmId; + + @Column(name="DETAILS_AM_ID") + @ApiParam(value = "明细处理组件编号", example = "0") + private Long detailsAmId; + + @Column(name="END_AM_ID") + @ApiParam(value = "结束组件编号", example = "0") + private Long endAmId; + + public Long getInitAmId() { + if (initAmId != null) { + return initAmId.longValue(); + } else { + return initAmId; + } + } + + public Long getDetailsAmId() { + if (detailsAmId != null) { + return detailsAmId.longValue(); + } else { + return detailsAmId; + } + } + + public Long getEndAmId() { + if (endAmId != null) { + return endAmId.longValue(); + } else { + return endAmId; + } + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java new file mode 100644 index 0000000..d162959 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :作业记录参数表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-23 13:14 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_LOG_DATA") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业记录参数表",description = "作业记录参数表") +public class WmsActionLogData extends BaseBean { + + @Column(name = "ALD_ID") + @ApiParam(value = "记录明细编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long aldId; + + @Column(name = "ALD_SEQ") + @ApiParam(value = "步骤序号") + private Integer aldSeq; + + @Column(name = "CALL_CLASS") + @ApiParam(value = "实现类") + private String callClass; + + @Column(name = "CALL_FUN") + @ApiParam(value = "调用方法") + private String callFun; + + @Column(name = "EXECUTE_STATUS") + @ApiParam(value = "执行状态") + private Integer executeStatus; + + @Column(name = "START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") + private String startTime; + + @Column(name = "END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") + private String endTime; + + @Column(name = "IN_PARAMS", columnDefinition = "TEXT") + @ApiParam(value = "输入参数") + private String inParams; + + @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") + @ApiParam(value = "输出参数") + private String outParams; + + @Column(name = "OUT_RESULT", columnDefinition = "TEXT") + @ApiParam(value = "执行结果") + private String outResult; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java new file mode 100644 index 0000000..f99297c --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java @@ -0,0 +1,122 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :作业记录明细表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-23 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_ACTION_LOG_DETAILS") +@Api(value = "作业记录明细表", description = "作业记录表") +public class WmsActionLogDetails extends BaseBean { + + @Column(name = "AL_ID") + @ApiParam(value = "作业流程ID", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long alId; + + @Transient + @ApiParam(value = "流程名称") + public String agNameC; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + public Integer seq; + + @Column(name = "OK_SEQ") + @ApiParam(value = "成功跳转步骤", example = "1") + public Integer okSeq; + + @Column(name = "NG_SEQ") + @ApiParam(value = "失败跳转步骤", example = "1") + public Integer ngSeq; + + /** + * 10=只输入一次,20=输入多次, + * 30=输入多次不允许重复,40=本流程结束 + */ + @Column(name = "VALUE_TYPE") + @ApiParam(value = "动作类型", example = "1") + public Integer valueType; + + /** + * 1=是,2=否 + */ + @Column(name = "TO_UPPER") + @ApiParam(value = "是否转为大写", example = "1") + public Integer toUpper; + + @Column(name = "LEN_CHECK") + @ApiParam(value = "长度检查", example = "1") + public Integer lenCheck; + + @Column(name = "AS_ID") + @ApiParam(value = "作业步骤", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public Long asId; + + @Column(name = "ALD_STATUS") + @ApiParam(value = "执行状态", example = "1") + public Integer aldStatus; + + @Column(name = "START_TIME") + @ApiParam(value = "开始执行时间") + public String startTime; + + @Column(name = "END_TIME") + @ApiParam(value = "结束执行时间") + public String endTime; + + @Column(name = "GOTO_BTN_CODE") + @ApiParam(value = "跳转按钮代码") + private String goToBtnCode; + + @Column(name = "GOTO_BTN_NAME") + @ApiParam(value = "跳转按钮名称") + private String goToBtnName; + + @Column(name = "PRE_SHOW") + @ApiParam(value = "是否预显示", example = "1") + private Integer preShow; + + @Column(name = "SHOW_AM_ID") + @ApiParam(value = "回显组件方法ID", example = "1") + private Long showAmId; + + public Long getAsId() { + if (asId != null) { + return asId.longValue(); + } else { + return asId; + } + } + + public Long getAlId() { + if (alId != null) { + return alId.longValue(); + } else { + return alId; + } + } +}