diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index cf31941..7df2552 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -687,7 +687,7 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MESSAGE_CONTENT_TYPE{ + public enum MESSAGE_TYPE_CONTENT { HTML(1,"HTML","text/plain;charset=UTF-8"), TEXT(2,"TEXT","text/plain;charset=UTF-8"); @@ -696,10 +696,10 @@ public class ImppEnumUtil { private String name; private String description; - MESSAGE_CONTENT_TYPE() { + MESSAGE_TYPE_CONTENT() { } - MESSAGE_CONTENT_TYPE(int value, String name, String description) { + MESSAGE_TYPE_CONTENT(int value, String name, String description) { this.value = value; this.name = name; this.description = description; 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 097f901..cea18b8 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 @@ -1194,7 +1194,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MOVE_ORDER_STATUS { - CREATE(0, "创建"),BE_HANDLE(5, "待处理"),FINISH(10, "已处理"); + CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index bbd57cd..3b7d26b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -72,8 +72,8 @@ public class SysFile extends BaseBean { @ApiParam(value ="文件大小(KB)" , example ="0") private Integer fileSize; - @Column(name="DOWNLOADS") + @Column(name="DOWNLOAD_NUM") @ApiParam(value ="下载次数" , example ="0") - private Integer downloads; + private Integer downloadNum; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index e805f03..a3d87b2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -38,8 +38,8 @@ public class SysMessage extends BaseBean { @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; - @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") + @Column(name="MESSAGE_TYPE_CONTENT") + @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 4049c53..9ab72fc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -92,9 +92,6 @@ public class SysUser extends BaseBean { @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") private Integer userType; - @ApiParam(value ="用户信息") - private transient SysUserInfo userInfo; - @ApiParam(value ="用户所有角色信息") private transient List roleList; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index def0ca7..24e1dde 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -30,7 +30,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="SYS_USER_INFO") @Api(value="用户详细",description = "用户详细") -public class SysUserInfo extends BaseBean { +public class SysUserInfo extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") @@ -115,6 +115,9 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="用户所有部门信息") private transient List departmentList; + @ApiParam("用户的部门ID信息") + private transient List departmentIdList; + @ApiParam(value ="用户所有岗位信息") private transient List positionList; 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 new file mode 100644 index 0000000..5fec85c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : amy + * @CreateDate : 2018-11-23 13:13 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_GROUP") +@Api("作业流程") +public class WmsActionGroup extends BaseBean { + + @Column(name="AG_NAME_E") + @ApiParam("英文流程名称") + private String agNameE; + + @Column(name="AG_DESC_E") + @ApiParam("英文流程描述") + private String agDescE; + + @Column(name="AG_NAME_C") + @ApiParam("中文流程名称") + private String agNameC; + + @Column(name="AG_DESC_C") + @ApiParam("中文流程描述") + private String agDescC; + +} 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 new file mode 100644 index 0000000..3444120 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : amy + * @CreateDate : 2018-11-23 13:23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_GROUP_DETAILS") +@Api("作业流程明细") +public class WmsActionGroupDetails extends BaseBean { + + @Column(name = "AG_ID") + @ApiParam(value = "作业流程ID", example = "0") + private Long agId; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name = "OK_SEQ") + @ApiParam(value = "成功跳转步骤", example = "0") + private Integer okSeq; + + @Column(name = "NG_SEQ") + @ApiParam(value = "失败跳转步骤", example = "0") + private Integer ngSeq; + + @Column(name = "VALUE_TYPE") + @ApiParam(value = "动作类型", example = "10") + private Integer valueType; + + @Column(name = "TO_UPPER") + @ApiParam(value = "是否转为大写", example = "2") + private Integer toUpper; + + @Column(name = "LEN_CHECK") + @ApiParam(value = "长度检查", example = "0") + private Integer lenCheck; + + @Column(name = "AS_ID") + @ApiParam(value = "作业步骤", example = "0") + private Long asId; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java new file mode 100644 index 0000000..905459f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -0,0 +1,121 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +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 : 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; + + @ApiParam(value = "交易类型名称") + public transient 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") + @ApiParam(value = "开始作业时间") + public String startTime; + + @Column(name="END_TIME") + @ApiParam(value = "结束作业时间") + public String endTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") + public transient String startTimeStart; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") + public transient String startTimeEnd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") + public transient String endTimeStart; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") + public transient 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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java new file mode 100644 index 0000000..0328db7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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 = "记录明细编号") + 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") + @ApiParam(value = "输入参数") + private String inParams; + + @Column(name = "OUT_PARAMS") + @ApiParam(value = "输出参数") + private String outParams; + + @Column(name = "OUT_RESULT") + @ApiParam(value = "执行结果") + private String outResult; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java new file mode 100644 index 0000000..ea3f4ae --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -0,0 +1,99 @@ +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; +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 : 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; + + //get单独处理 + public Long getAlId() { + if(alId != null) { + return alId.longValue(); + }else{ + return alId; + } + } + + @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; + + //get单独处理 + public Long getAsId() { + if(asId != null) { + return asId.longValue(); + }else{ + return 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; + +} 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 new file mode 100644 index 0000000..a59768a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE") +@Api("作业步骤处理组") +public class WmsActionModule extends BaseBean { + + @Column(name="AM_NAME") + @ApiParam("组件名称") + public String amName; + + @Column(name="AM_DESC") + @ApiParam("组件描述") + public String amDesc; + + @Column(name="CALL_CLASS") + @ApiParam("实现类") + public String callClass; + + @Column(name="CALL_FUN") + @ApiParam("调用方法") + public String callFun; + + @Column(name="AM_TYPE") + @ApiParam(value = "组件类型", example = "0") + public Integer amType; +} 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 new file mode 100644 index 0000000..8910354 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE_PARAM") +@Api("作业步骤处理组参数") +public class WmsActionModuleParam extends BaseBean { + + @Column(name="AM_ID") + @ApiParam("组件ID") + public Long amID; + + @Column(name="PARAM_CODE") + @ApiParam("参数编码") + public String paramCode; + + @Column(name="PARAM_NAME") + @ApiParam("参数名称") + public String paramName; + + @Column(name="PARAM_VALUE_LIST") + @ApiParam("参数可选值列表") + public String paramValueList; + + @Column(name="PARAM_TYPE") + @ApiParam(value = "参数类型", example = "0") + public Integer paramType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java new file mode 100644 index 0000000..9972172 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("返回前端数据实体") +public class WmsActionResponseBean { + + @ApiParam("进度") + public Double percent; + + @ApiParam("当前步骤") + public Integer currentStep; + + @ApiParam("总步数") + public int totalStep; + + @ApiParam("提示信息") + public String message; + + @ApiParam("列表信息") + public List informations; + + @ApiParam("可选项") + public List options; + + @ApiParam("选中的明细数据") + public String details; + + +} 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 new file mode 100644 index 0000000..4198ff5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_STEP") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤信息",description = "作业步骤信息") +public class WmsActionStep extends BaseBean { + + @Column(name = "AS_NAME_E") + @ApiParam(value = "英文类型名称") + private String asNameE; + + @Column(name = "AS_DESC_E") + @ApiParam(value = "英文类型描述") + private String asDescE; + + @Column(name = "AS_NAME_C") + @ApiParam(value = "中文类型名称") + private String asNameC; + + @Column(name = "AS_DESC_C") + @ApiParam(value = "中文类型描述") + private String asDescC; + + @Column(name = "AT_NAME_C_RDD") + @ApiParam(value = "步骤类型名称") + private String atNameCRdd; + + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号", example = "0") + private Long atId; + + //get单独处理 + public Long getAtId() { + if(atId != null) { + return atId.longValue(); + }else{ + return atId; + } + } +} 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 new file mode 100644 index 0000000..942e6a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -0,0 +1,53 @@ +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.ApiOperation; +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 : jimmy.zeng + * @CreateDate : 2018-11-22 14:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_STEP_CALL") +@Api("作业步骤调用信息") +public class WmsActionStepCall extends BaseBean { + + @Column(name="AS_ID") + @ApiParam(value = "作业步骤ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long asId; + + @Column(name="SEQ") + @ApiParam(value = "序号",example = "0") + public Integer seq; + + @Column(name="AM_ID") + @ApiParam(value = "处理组件ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long amId; + + @ApiParam(value = "组件名称") + public transient String amName; + + @ApiParam(value = "组件描述") + public transient String amDesc; +} 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 new file mode 100644 index 0000000..e2542a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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 14:52 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_STEP_CALL_PARAM") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤调用参数表",description = "作业步骤调用参数表") +public class WmsActionStepCallParam extends BaseBean { + + @Column(name = "AGD_ID") + @ApiParam(value = "流程明细编号") + private Long agdId; + + @Column(name = "SEQ") + @ApiParam(value = "序号") + private Integer seq; + + @Column(name = "AM_ID") + @ApiParam(value = "处理组件编号") + private Long amId; + + @Column(name = "PARAM_CODE") + @ApiParam(value = "参数编码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @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 new file mode 100644 index 0000000..cb08f18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +public class WmsActionStepType extends BaseBean { + + @Column(name = "AT_NAME_E") + @ApiParam(value = "英文类型名称") + private String atNameE; + + @Column(name = "AT_DESC_E") + @ApiParam(value = "英文类型描述") + private String atDescE; + + @Column(name = "AT_NAME_C") + @ApiParam(value = "中文类型名称") + private String atNameC; + + @Column(name = "AT_DESC_C") + @ApiParam(value = "中文类型描述") + private String atDescC; + + @Column(name = "FUN_CALL_NAME") + @ApiParam(value = "方法调用名称") + private String funCallName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index fa5715b..d6aad6f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import io.swagger.models.auth.In; @@ -38,10 +39,12 @@ public class WmsIbCheckPlan extends BaseBean{ private String partNameRdd; @Column(name="START_DATE") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="开始日期") private String startDate; @Column(name="END_DATE") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value ="结束日期") private String endDate; @@ -57,4 +60,20 @@ public class WmsIbCheckPlan extends BaseBean{ @ApiParam(value ="已抽点件数", example = "-1") private Integer checkCounter; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value="开始日期，查询开始日期") + public transient String startDateStart; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value="开始日期，查询开始日期") + public transient String startDateEnd; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value="结束日期，查询结束日期") + public transient String endDateStart; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value = "结束日期，查询结束日期") + public transient String endDateEnd; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java new file mode 100644 index 0000000..eeb7643 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("接受前端数据实体") +public class WmsOperationBean { + + @ApiParam("扫描内容") + public String barCode; + + @ApiParam("可选项的值") + public List options; + + /** + * 触发源:10=扫描枪, + * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) + * 60=明细（清空） + */ + @ApiParam("触发源") + public int sourceOwner; + + @ApiParam("选中的明细数据") + public String details; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.java new file mode 100644 index 0000000..5eeb877 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-23 13:32 + * @Modify: + **/ +@Repository +public interface WmsActionGroupDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.java new file mode 100644 index 0000000..abd4c88 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-23 13:34 + * @Modify: + **/ +@Repository +public interface WmsActionGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java new file mode 100644 index 0000000..8875b03 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:49 + * @Modify: + **/ +@Repository +public interface WmsActionLogDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java new file mode 100644 index 0000000..280d727 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业记录明细 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-23 14:03 + * @Modify: + **/ +@Repository +public interface WmsActionLogDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java new file mode 100644 index 0000000..2c2da0b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业记录表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-23 14:02 + * @Modify: + **/ +@Repository +public interface WmsActionLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java new file mode 100644 index 0000000..3aa2b6c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; +import org.springframework.stereotype.Repository; + +/** +* @Description : 作业步骤处理组件参数 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java new file mode 100644 index 0000000..5fde9b3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import org.springframework.stereotype.Repository; +/** +* @Description : 作业步骤处理组件 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java new file mode 100644 index 0000000..b7c78a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2018-11-23 15:00 + * @Modify: + **/ +@Repository +public interface WmsActionStepCallParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java new file mode 100644 index 0000000..d1f658c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; + +import java.util.List; + +/** + * @Description : 作业步骤调用信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-22 14:41 + * @Modify: + **/ +public interface WmsActionStepCallRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java new file mode 100644 index 0000000..91e4ff9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java new file mode 100644 index 0000000..793ad96 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤类型操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 9f306ed..0a5730d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -181,8 +181,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true); - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); getStringBuilderPack(wmsIbCheckPlan, result); @@ -449,7 +449,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); - HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result); + HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); @@ -470,7 +470,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //发运单号 - HqlPack.getStringEqualPack(wmsShopping.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //物料编码 @@ -823,7 +823,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result); - + HqlPack.getNumEqualPack(wmsMoveMaster.getOrderType(),"orderType",result); getStringBuilderPack(wmsMoveMaster, result); return result.toString(); @@ -987,4 +987,173 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤 查询 + * + * @param wmsActionStepCall + * @return + */ + public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + + getStringBuilderPack(wmsActionStepCall, result); + + return result.toString(); + } + + /** + * 作业步骤类型表信息查询 + * + * @param wmsActionStepType + * @return + */ + public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + + getStringBuilderPack(wmsActionStepType, result); + + return result.toString(); + } + + /** + * 作业步骤信息查询 + * + * @param wmsActionStep + * @return + */ + public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + + getStringBuilderPack(wmsActionStep, result); + + return result.toString(); + } + + /** + * 作业步骤处理组件查询条件封装 + * + * @param wmsActionModuleParam + * @return + */ + public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + getStringBuilderPack(wmsActionModuleParam, result); + + return result.toString(); + } + + /** + * 作业步骤处理组件参数查询条件封装 + * + * @param wmsActionModule + * @return + */ + public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + getStringBuilderPack(wmsActionModule, result); + + return result.toString(); + } + + /** + * 作业流程分页查询 + * @return + */ + public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){ + StringBuffer result = new StringBuffer(); + + //查询参数封装 agDescC;agNameC + HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); + HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); + getStringBuilderPack(wmsActionGroup, result); + + return result.toString(); + } + + /** + * 作业记录参数信息 查询条件封装 + * + * @param wmsActionLogData + * @return + */ + public static String packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { + StringBuffer result = new StringBuffer(); + + HqlPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); + getStringBuilderPack(wmsActionLogData, result); + + return result.toString(); + } + + /** + * 作业步骤调用参数信息 查询条件封装 + * + * @param wmsActionStepCallParam + * @return + */ + public static String packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { + StringBuffer result = new StringBuffer(); + + HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + getStringBuilderPack(wmsActionStepCallParam, result); + + return result.toString(); + } + + /** + * 作业记录 查询条件封装 + * @param wmsActionLog + * @return + */ + public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { + StringBuffer result = new StringBuffer(); + + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), + "startTime", result, true); + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), + "endTime", result, true); + // 作业流程编号 + HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); + // 作业流程名称 + HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); + // 单据编号 + HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + getStringBuilderPack(wmsActionLog, result); + + return result.toString(); + } + + /** + * 作业记录明细 查询条件封装 + * @param wmsActionLogDetails + * @return + */ + public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){ + StringBuffer result = new StringBuffer(); + + //作业流程id（对应作业记录明细里自增的id） + HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); + getStringBuilderPack(wmsActionLogDetails, result); + + return result.toString(); + } + + }