diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index c31090b..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-andon jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java new file mode 100644 index 0000000..cb8c0b6 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_动作 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:47 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ACTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_动作") +public class AndonAction extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam(value = "动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiParam(value = "动作名称") + private String actionName; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java new file mode 100644 index 0000000..5299981 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_呼叫原因 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:50 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_呼叫原因") +public class AndonAlarmCause extends BaseBean { + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "AC_NAME") + @ApiParam(value = "呼叫原因描述") + private String acName; + + @Column(name = "PARENT_AC_CODE") + @ApiParam(value = "父阶原因代码") + private String parentAcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java new file mode 100644 index 0000000..091ddec --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_呼叫通知配置 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:53 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_RESPONSE_CFG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_呼叫通知配置") +public class AndonAlarmResponseCfg extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "ANDON_STATUS") + @ApiParam(value = "安灯状态") + private String andonStatus; + + @Column(name = "RP_WHERE") + @ApiParam(value = "通知条件时长") + private String rpWhere; + + @Column(name = "RP_CODE") + @ApiParam(value = "通知方式代码") + private String rpCode; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "通知对象代码") + private String rpObjectCode; + + @Column(name = "RP_LEVEL") + @ApiParam(value = "通知级别") + private String rpLevel; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java new file mode 100644 index 0000000..821efb7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯类型") +public class AndonAlarmType extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "ALARM_NAME") + @ApiParam(value = "安灯类型名称") + private String alarmName; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonConfig.java new file mode 100644 index 0000000..0f39a62 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonConfig.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.andon.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 : siliter + * @CreateDate : 2019-03-07 09:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="ANDON_CONFIG") +@Api(value="系统配置") +public class AndonConfig extends BaseBean { + + @Column(name="NAME") + @ApiParam(value ="名称") + private String name; + + @Column(name="CONFIG_TYPE") + @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") + private Integer configType; + + @Column(name="CONFIG_CODE") + @ApiParam(value ="参数代码") + private String configCode; + + // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP + @Column(name="CONFIG_GROUP") + @ApiParam(value ="参数组") + private Integer configGroup; + + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name="CONFIG_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private String configValueType; + + @Column(name="CONFIG_VALUE") + @ApiParam(value ="参数值") + private String configValue; + + @Column(name="CONFIG_DESCRIPTION") + @ApiParam(value ="参数描述") + private String configDescription; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java new file mode 100644 index 0000000..c91b9b9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_事件原因 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:40 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件原因") +public class AndonEventCause extends BaseBean { + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + @Column(name = "EC_NAME") + @ApiParam(value = "事件原因描述") + private String ecName; + + @Column(name = "PARENT_EC_CODE") + @ApiParam(value = "父阶原因代码") + private String parentEcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java new file mode 100644 index 0000000..f214629 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_事件处理方法 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_METHOD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件处理方法") +public class AndonEventMethod extends BaseBean { + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME") + @ApiParam(value = "事件方法描述") + private String emName; + + @Column(name = "PARENT_EM_CODE") + @ApiParam(value = "父阶方法代码") + private String parentEmCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java new file mode 100644 index 0000000..962309b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_停机类型 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:45 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_HALT_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_停机类型") +public class AndonHaltType extends BaseBean { + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型代码") + private String haltCode; + + @Column(name = "HALT_NAME") + @ApiParam(value = "停机类型名称") + private String haltName; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java new file mode 100644 index 0000000..7928693 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -0,0 +1,219 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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; +import javax.persistence.Transient; + +/** + * @Description : 安灯队列 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MANAGE_QUEUE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯队列") +public class AndonManageQueue extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + private String andonOrderNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "ACTION_CODE") + @ApiParam(value = "安灯动作代码") + private String actionCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + private String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam(value = "设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME_RDD") + @ApiParam(value = "设备名称") + private String equipmentNameRdd; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME_RDD") + @ApiParam(value = "班次名称") + private String shiftNameRdd; + + @Column(name = "STATUS_CODE") + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Double seq; + + @Column(name = "PRIORITY_LEVEL") + @ApiParam(value = "优先级别", example = "1") + private Integer priorityLevel; + + @Column(name="CALL_TIME",updatable = false) + @ApiParam(value = "呼叫时间") + @AnnoOutputColumn(hidden = true) + public String callTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String callTimeStr; + + @Column(name="CONFIRM_TIME",updatable = false) + @ApiParam(value = "响应时间") + @AnnoOutputColumn(hidden = true) + public String confirmTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String confirmTimeStr; + + @Column(name="RESET_TIME",updatable = false) + @ApiParam(value = "解决时间") + @AnnoOutputColumn(hidden = true) + public String resetTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String resetTimeStr; + + @Column(name = "CALL_USER") + @ApiParam(value = "呼叫人") + private String callUser; + + @Column(name = "CONFIRM_USER") + @ApiParam(value = "响应人") + private String confirmUser; + + @Column(name = "RESET_USER") + @ApiParam(value = "解决人") + private String resetUser; + + @Column(name = "IS_SHIFT_CALL") + @ApiParam(value = "是否转呼", example = "1") + private Integer isShiftCall; + + @Column(name="SHIFT_CALL_TIME",updatable = false) + @ApiParam(value = "转呼时间") + @AnnoOutputColumn(hidden = true) + public String shiftCallTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String shiftCallTimeStr; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "转呼对象代码") + private String rpObjectCode; + + @Column(name = "SC_RESPONSE_CODE") + @ApiParam(value = "转呼响应方式") + private String scObjectCode; + + @Column(name = "SC_RP_LEVEL") + @ApiParam(value = "转呼通知等级") + private String scRpLevel; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + private String acNameRdd; + + @Column(name = "AC_DESC") + @ApiParam(value = "呼叫具体原因") + private String acDesc; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件原因描述") + private String ecNameRdd; + + @Column(name = "EC_DESC") + @ApiParam(value = "事件具体原因") + private String ecDesc; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String emNameRdd; + + @Column(name = "EM_DESC") + @ApiParam(value = "事件具体方法") + private String emDesc; + + @Column(name = "IS_HALT") + @ApiParam(value = "是否停机", example = "1") + private Integer isHalt; + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型") + private String haltCode; + + @Column(name = "HALT_DESC") + @ApiParam(value = "停机具体原因") + private String haltDesc; + + // 是否转呼 + public Integer getIsShiftCall() { + return this.isShiftCall == null ? 0 : this.isShiftCall; + } + + // 获取优先级别 + public Integer getPriorityLevel() { + return this.priorityLevel == null ? 0 : this.priorityLevel; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java new file mode 100644 index 0000000..bdc2403 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -0,0 +1,219 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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; +import javax.persistence.Transient; + +/** + * @Description : 安灯记录 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MANAGE_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯记录") +public class AndonManageRecord extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + private String andonOrderNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "ACTION_CODE") + @ApiParam(value = "安灯动作代码") + private String actionCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + private String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam(value = "设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME_RDD") + @ApiParam(value = "设备名称") + private String equipmentNameRdd; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME_RDD") + @ApiParam(value = "班次名称") + private String shiftNameRdd; + + @Column(name = "STATUS_CODE") + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Double seq; + + @Column(name = "PRIORITY_LEVEL") + @ApiParam(value = "优先级别", example = "1") + private Integer priorityLevel; + + @Column(name="CALL_TIME",updatable = false) + @ApiParam(value = "呼叫时间") + @AnnoOutputColumn(hidden = true) + public String callTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String callTimeStr; + + @Column(name="CONFIRM_TIME",updatable = false) + @ApiParam(value = "响应时间") + @AnnoOutputColumn(hidden = true) + public String confirmTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String confirmTimeStr; + + @Column(name="RESET_TIME",updatable = false) + @ApiParam(value = "解决时间") + @AnnoOutputColumn(hidden = true) + public String resetTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String resetTimeStr; + + @Column(name = "CALL_USER") + @ApiParam(value = "呼叫人") + private String callUser; + + @Column(name = "CONFIRM_USER") + @ApiParam(value = "响应人") + private String confirmUser; + + @Column(name = "RESET_USER") + @ApiParam(value = "解决人") + private String resetUser; + + @Column(name = "IS_SHIFT_CALL") + @ApiParam(value = "是否转呼", example = "1") + private Integer isShiftCall; + + @Column(name="SHIFT_CALL_TIME",updatable = false) + @ApiParam(value = "转呼时间") + @AnnoOutputColumn(hidden = true) + public String shiftCallTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String shiftCallTimeStr; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "转呼对象代码") + private String rpObjectCode; + + @Column(name = "SC_RESPONSE_CODE") + @ApiParam(value = "转呼响应方式") + private String scObjectCode; + + @Column(name = "SC_RP_LEVEL") + @ApiParam(value = "转呼通知等级") + private String scRpLevel; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + private String acNameRdd; + + @Column(name = "AC_DESC") + @ApiParam(value = "呼叫具体原因") + private String acDesc; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件原因描述") + private String ecNameRdd; + + @Column(name = "EC_DESC") + @ApiParam(value = "事件具体原因") + private String ecDesc; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String emNameRdd; + + @Column(name = "EM_DESC") + @ApiParam(value = "事件具体方法") + private String emDesc; + + @Column(name = "IS_HALT") + @ApiParam(value = "是否停机", example = "1") + private Integer isHalt; + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型") + private String haltCode; + + @Column(name = "HALT_DESC") + @ApiParam(value = "停机具体原因") + private String haltDesc; + + // 是否转呼 + public Integer getIsShiftCall() { + return this.isShiftCall == null ? 0 : this.isShiftCall; + } + + // 获取优先级别 + public Integer getPriorityLevel() { + return this.priorityLevel == null ? 0 : this.priorityLevel; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java new file mode 100644 index 0000000..8bccd4e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -0,0 +1,86 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_PLC控制 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLC extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "TAG_BUSINESS_TYPE") + @ApiParam(value = "标签业务类型") + private String tagBusinessType; + + @Column(name = "IS_ALARM_STATUS") + @ApiParam(value = "是否按灯状态", example = "1") + private Integer isAlarmStatus; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java new file mode 100644 index 0000000..4390a91 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_PLC监控记录 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:58 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC监控记录") +public class AndonPLCRecord extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; + + @Column(name = "TAG_VALUE") + @ApiParam(value = "标签数值") + private String tagValue; + + @Column(name = "TAG_POINT") + @ApiParam(value = "传递方向") + private String tagPoint; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java new file mode 100644 index 0000000..e3e23ba --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RESPONSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯通知方式") +public class AndonResponse extends BaseBean { + + @Column(name = "RESPONSE_CODE") + @ApiParam(value = "通知方式代码") + private String responseCode; + + @Column(name = "RESPONSE_NAME") + @ApiParam(value = "通知方式名称") + private String responseName; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java new file mode 100644 index 0000000..fda0737 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RESPONSE_OBJECT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯通知对象") +public class AndonResponseObject extends BaseBean { + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "对象代码") + private String rpObjectCode; + + @Column(name = "RP_OBJECT_NAME") + @ApiParam(value = "对象名称") + private String rpObjectName; + + @Column(name = "RP_OBJECT_VALUE") + @ApiParam(value = "对象值") + private String rpObjectValue; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java new file mode 100644 index 0000000..a5ee2db --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_STATUS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯状态") +public class AndonStatus extends BaseBean { + + @Column(name = "STATUS_CODE") + @ApiParam(value = "状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam(value = "状态名称") + private String statusName; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java new file mode 100644 index 0000000..2241c79 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.andon.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; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java new file mode 100644 index 0000000..7959144 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.andon.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; +import javax.persistence.Transient; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="STATUS") + @ApiParam("设备状态") + private String status; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java new file mode 100644 index 0000000..533c56a --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.andon.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 :mes系统业务动作 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_SHIFT") +@Api("班次信息") +public class MesShift extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name="SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name="START_TIME") + @ApiParam("开班时间") + private String startTime; + + @Column(name="WORK_TIMES") + @ApiParam("作业时长") + private String workTimes; + + public MesShift() { + } + + public MesShift(String workCenterCode,String organizeCode) { + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java new file mode 100644 index 0000000..112dc97 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.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; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java new file mode 100644 index 0000000..2fc7aec --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.andon.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; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + + public MesWorkCenter(String organizeCode) { + this.organizeCode = organizeCode; + } + + public MesWorkCenter() { + } +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java new file mode 100644 index 0000000..008a3ca --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAction; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_动作） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:05 + * @Modify: + **/ +@Repository +public interface IAndonActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java new file mode 100644 index 0000000..840cb42 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_呼叫原因） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonAlarmCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java new file mode 100644 index 0000000..65109cf --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_呼叫通知配置） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:09 + * @Modify: + **/ +@Repository +public interface IAndonAlarmResponseCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..31afb4f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯类型信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonConfigRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonConfigRepository.java new file mode 100644 index 0000000..ab8dad8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonConfigRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonConfig; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON系统配置文件） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:05 + * @Modify: + **/ +@Repository +public interface IAndonConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java new file mode 100644 index 0000000..53817cb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_事件原因） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:10 + * @Modify: + **/ +@Repository +public interface IAndonEventCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java new file mode 100644 index 0000000..78273af --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_事件处理方法） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-14 11:34 + * @Modify: + **/ +@Repository +public interface IAndonEventMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java new file mode 100644 index 0000000..81a68b8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_停机类型） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:12 + * @Modify: + **/ +@Repository +public interface IAndonHaltTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java new file mode 100644 index 0000000..4300b50 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯队列信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonManageQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java new file mode 100644 index 0000000..42bb09c --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯记录信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonManageRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java new file mode 100644 index 0000000..f9838e3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonPLCRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（安灯PLC监控记录） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:15 + * @Modify: + **/ +@Repository +public interface IAndonPLCRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java new file mode 100644 index 0000000..3358aa0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（安灯PLC控制） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:13 + * @Modify: + **/ +@Repository +public interface IAndonPLCRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java new file mode 100644 index 0000000..76723f9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯通知对象信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonResponseObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java new file mode 100644 index 0000000..3c2dc3d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯通知方式信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonResponseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java new file mode 100644 index 0000000..e33d81f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonStatus; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯状态信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java new file mode 100644 index 0000000..f4e8bb7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..caba161 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java new file mode 100644 index 0000000..9ddbf9e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesShift; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-13:53 + * @Modify: + **/ +@Repository +public interface MesShiftRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..320270f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..63f1233 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java new file mode 100644 index 0000000..e3d6734 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -0,0 +1,202 @@ +package cn.estsh.i3plus.pojo.andon.sqlpack; + +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + +import cn.estsh.i3plus.pojo.andon.bean.*; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + +/** + * @Description : 安灯对象查询封装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 10:45 + * @Modify: + **/ +public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按灯PLC查询条件 + * + * @param andonPLC plc实体 + * @return + */ + public static DdlPackBean packHqlAndonPLCInfo(AndonPLC andonPLC) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result); + + getStringBuilderPack(andonPLC, result); + return result; + } + + /** + * 按条件查询工作中心 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(mesWorkCenter, result); + + return result; + } + + /** + * 按条件查询工作单元（工位） + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesWorkCell, result); + + return result; + } + + /** + * 按条件查询设备 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(mesEquipment, result); + + return result; + } + + /** + * 按条件查询班次 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlMesShift(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesShift, result); + + return result; + } + + /** + * 按条件查询ANDON呼叫原因 + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonAlarmCause, result); + + return result; + } + + /** + * 按条件查询ANDON事件处理方法 + * @param andonEventMethod + * @return + */ + public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventMethod, result); + + return result; + } + + /** + * 按条件查询ANDON事件原因 + * @param andonEventCause + * @return + */ + public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventCause, result); + + return result; + } + + /** + * 按条件查询按灯队列信息 + * @param andonManageQueue + * @return + */ + public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + + getStringBuilderPack(andonManageQueue, result); + + return result; + } + + /** + * 按条件查询按灯系统配置信息 + * @param andonConfig + * @return + */ + public static DdlPackBean packHqlAndonConfig(AndonConfig andonConfig){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonConfig.getConfigCode(), "configCode", result); + + getStringBuilderPack(andonConfig, result); + + return result; + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java new file mode 100644 index 0000000..a80a65a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -0,0 +1,217 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : silliter + * @CreateDate : 2019-05-13 15:53 + * @Modify: + **/ +public class AndonEnumUtil { + /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_ALARM_STATUS{ + + YES(10,"需要按灯"), + ON(20,"不需要按灯"); + + private int value; + private String description; + + IS_ALARM_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * 按灯业务状态 + * 安灯状态=10，工号 =20 ，读取状态=30 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_BUSI_FLAG{ + + ALARM_FLAG("10","按灯状态"), + USER_CODE("20","工号"), + READ_FLAG("30", "读取状态"); + + private String value; + private String description; + + ALARM_BUSI_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 按灯标识 + * 1-呼叫，2-签到，3-解决 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_FLAG{ + + CALL(1,"10","呼叫"), + SIGN(2,"20","签到"), + RESOLVE(3,"30","解决"), + CANCEL(4,"40", "撤销"); + + private int value; + private String code; + private String description; + + ALARM_FLAG(int value,String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode(){ return code; } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * 按灯动作标志 + * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_ACTION_FLAG{ + + CALL_ACTION("10","呼叫动作"), + SIGN_ACTION("20","签到动作"), + CANCEL_ACTION("30", "撤销动作"), + RESOLVE_ACTION("40", "解决动作"), + SHIFG_CALL_ACTION("50", "转呼动作"); + + private String value; + private String description; + + ANDON_ACTION_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 优先级别 + * 10 - 一级，20 - 二级，30 - 三级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_PRIORITY{ + + FIRST(10,"一级"), + SECOND(20,"二级"), + THIRD(30,"三级"); + + private int value; + private String description; + + ALARM_PRIORITY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** + * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_CODE{ + + PART("MM","物料"), + QUALITY("QM","质量"), + EQUIP("EQ","设备"), + PROCESS("GY","工艺"), + CHECK("JC","检测"); + + private String value; + private String description; + + ALARM_CODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index bc9b23c..437d602 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -571,4 +571,42 @@ public class MesEnumUtil { } } + /** + * 组织模型树形菜单level + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_ORG_LEVEL{ + + LEVEL_ONE(1,"一级目录"), + LEVEL_TWO(2,"二级目录"), + LEVEL_THREE(3,"三级目录"), + LEVEL_FOUR(4,"四级目录"); + + private int value; + private String description; + + PROD_ORG_LEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + } 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 a7949c1..e8a6b83 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 @@ -139,17 +139,17 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "CREATE","新建"), - RECEIPT(20, "RECEIPT","处理中"), - RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"), - CLOSED(40, "CLOSED","已关闭"), - CANCELLED(50, "CANCELLED","已取消"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CLOSED(40, "CLOSED", "已关闭"), + CANCELLED(50, "CANCELLED", "已取消"); private int value; private String code; private String description; - MASTER_ORDER_STATUS(int value,String code, String description) { + MASTER_ORDER_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -670,6 +670,40 @@ public class WmsEnumUtil { } } + /** + * 作业组件参数：组件执行方法名称 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MODULE_METHOD_NAME { + EXECUTE("execute", "执行方法"), + GETOPTIONS("getOptions", "流程初始化方法"), + PROMPT("prompt", "初始化方法"), + GETLIST("getList", "获取列表数据"), + DOCOMPLETE("doComplete", "执行完成方法"), + SHOWINFORMATION("showInformation", "回显方法"), + INSTALL("install", "安装组件"), + UNINSTALL("unInstall", "卸载组件"); + private String value; + private String description; + + MODULE_METHOD_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getCode() { + return value; + } + + public String getDescription() { + return description; + } + + public String getValue() { + return value; + } + } + /** * 作业任务状态、移库单条码操作状态 @@ -1456,6 +1490,16 @@ public class WmsEnumUtil { } return tmp; } + + public static COMPONENT_TYPE switchGetValue(int val) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -2109,11 +2153,11 @@ public class WmsEnumUtil { * 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 */ public enum SCRIPT_TYPE { - MODUAL(10,"Modual","组件脚本"), - FORM(20,"Form","表单脚本"), - REPORT(30,"Report","报表脚本"), - JOB(40,"Job","JOB脚本"), - OTHER(50,"Other","其他脚本"); + MODUAL(10, "Modual", "组件脚本"), + FORM(20, "Form", "表单脚本"), + REPORT(30, "Report", "报表脚本"), + JOB(40, "Job", "JOB脚本"), + OTHER(50, "Other", "其他脚本"); private String description; private int value; @@ -2147,9 +2191,9 @@ public class WmsEnumUtil { * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby */ public enum LANGUAGE_TYPE { - GROOVY(1,"Groovy", 10), - PYTHON(2,"Python", 20), - JS(3,"JavaScript", 30); + GROOVY(1, "Groovy", 10), + PYTHON(2, "Python", 20), + JS(3, "JavaScript", 30); // 下面这2种语言没人会写，暂不支持 //SCALA(40,"scala"), //JRUBY(50,"jruby"); @@ -2194,9 +2238,9 @@ public class WmsEnumUtil { * 2.BUSI：业务参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WMS_CONFIG_TYPE{ + public enum WMS_CONFIG_TYPE { - SYSTEM(10,"系统参数","系统参数"), + SYSTEM(10, "系统参数", "系统参数"), BUSI(20, "业务参数", "业务参数"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 5a28202..ae2aecf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; +import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1399,7 +1400,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) { StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb, paramName, paramValue); - sb.append(" group by model." + groupByName); + if(!StringUtils.isEmpty(groupByName)){ + sb.append(" group by model." + groupByName); + } Query query = entityManager.createQuery(sb.toString()); setParameter(query,paramName,paramValue); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 0f56525..e5c6ecc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -314,7 +314,7 @@ public class DdlPreparedPack { */ public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data); + packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data); } } @@ -326,7 +326,7 @@ public class DdlPreparedPack { */ public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) { if (data != null && !StringUtils.isEmpty(String.valueOf(data))) { - packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data); + packBean.addColumnQuery("s_"+columnName," and model." + columnName + " <= :m_s_" + columnName, data); } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index 32e27cb..26675f7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -33,7 +33,7 @@ public class MesQueueOrder extends BaseBean { @Column(name="VIN_CODE") @ApiParam("Vin") - private Integer vinCode; + private String vinCode; @Column(name="CUST_FLAG_NO") @ApiParam("客户标识号") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 5b4c453..91149c5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -28,12 +28,16 @@ import javax.persistence.Table; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name="ORDER_NO") - @ApiParam("工单号") + @ApiParam("主队列编号") private String orderNo; @Column(name="PART_NO") @ApiParam("物料号") - private Integer partNo; + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; @Column(name="SERIAL_NUMBER") @ApiParam("产品条码") @@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private String workType; + private String workOrderType; @Column(name="PRODUCE_CATEGORY") @ApiParam("产品类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index 411b45c..1592590 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.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; @@ -12,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :生产区域 @@ -35,4 +39,19 @@ public class MesArea extends BaseBean { @Column(name="AREA_NAME") @ApiParam("区域名称") private String areaName; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java new file mode 100644 index 0000000..ee94479 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.mes.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; +import javax.persistence.Transient; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="STATUS") + @ApiParam("设备状态") + private String status; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index f8f1238..4bb5af7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +13,9 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * @Description: @@ -79,4 +83,5 @@ public class MesQueueOrder extends BaseBean { public double getSeq() { return this.seq == null ? 0.0d : this.seq; } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index f6d1fe1..14bb9bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -28,7 +28,7 @@ import javax.persistence.Table; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name="ORDER_NO") - @ApiParam("工单号") + @ApiParam("主队列编号") private String orderNo; @Column(name="PART_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 9a42ad8..9969c7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.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; @@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :工作单元 @@ -42,4 +46,18 @@ public class MesWorkCell extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index e293fe0..6e21747 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.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; @@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :工作中心 @@ -46,4 +50,18 @@ public class MesWorkCenter extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java new file mode 100644 index 0000000..56d40ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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.Entity; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-18-14:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("生产区域") +public class ProdOrgModel extends BaseBean { + + @ApiParam("区域名称") + private String areaName; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @ApiParam("工作版本") + private String workVer; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private String status; + + @ApiParam("当前级") + private Integer level; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java new file mode 100644 index 0000000..91b5e18 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; + +import java.util.List; + +/** + * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-29-11:58 + * @Modify: + **/ +public class RequestModel { + + private List workOrderList; // 工单数据集 + + private List partList; // 物料数据集 + + private List planOrderList; // 生产计划数据集 + + private List queueOrderList; // 生产队列数据集 + + private Double currentSeq; // 生产队列中的当前序列号 + + private Double nextSeq; // 生产队列中的下一个序列号 + + private Integer srcStatus; // 源状态 + + private Integer destStatus; // 目的状态 + + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { + this.queueOrderList = queueOrderList; + this.currentSeq = currentSeq; + this.nextSeq = nextSeq; + } + + public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { + this.queueOrderList = queueOrderList; + this.srcStatus = srcStatus; + this.destStatus = destStatus; + } + + public RequestModel(List workOrderList, List partList) { + this.workOrderList = workOrderList; + this.partList = partList; + } + + public List getWorkOrderList() { + return workOrderList; + } + + public RequestModel() { + } + + public void setWorkOrderList(List workOrderList) { + this.workOrderList = workOrderList; + } + + public List getPartList() { + return partList; + } + + public void setPartList(List partList) { + this.partList = partList; + } + + public List getPlanOrderList() { + return planOrderList; + } + + public void setPlanOrderList(List planOrderList) { + this.planOrderList = planOrderList; + } + + public List getQueueOrderList() { + return queueOrderList; + } + + public void setQueueOrderList(List queueOrderList) { + this.queueOrderList = queueOrderList; + } + + public Double getCurrentSeq() { + return currentSeq == null ? 0.0d : currentSeq; + } + + public void setCurrentSeq(Double currentSeq) { + this.currentSeq = currentSeq; + } + + public Double getNextSeq() { + return nextSeq == null ? 0.0d : nextSeq; + } + + public void setNextSeq(Double nextSeq) { + this.nextSeq = nextSeq; + } + + public Integer getSrcStatus() { + return srcStatus == null ? 0 : srcStatus; + } + + public void setSrcStatus(Integer srcStatus) { + this.srcStatus = srcStatus; + } + + public Integer getDestStatus() { + return destStatus == null ? 0 : destStatus; + } + + public void setDestStatus(Integer destStatus) { + this.destStatus = destStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..b5a0329 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 63e0908..a9f0602 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -5,10 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -45,10 +42,10 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); @@ -172,15 +169,104 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); } + + if (StringUtils.isNotEmpty(mesQueueOrder.getOrderNo() + "")) { + DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean); + } + + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); + // 时间段查询 DdlPreparedPack.timeBuilder( mesQueueOrder.getCreateDateTimeStart(), mesQueueOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); - DdlPreparedPack.getOrderDefault(mesQueueOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean); + // DdlPreparedPack.getOrderDefault(mesQueueOrder); + // 按照队列序列号倒序 + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean); + return packBean; + } + + /** + * 通用查询条件 + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES区域信息查询条件封装 + * @param mesArea + * @return + */ + public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); + if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * @param mesWorkCell + * @return + */ + public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + } + + return packBean; + } + + /** + * MES设备信息查询条件封装 + * @param mesEquipment + * @return + */ + public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); + if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 642c9a6..7250b00 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -42,6 +42,10 @@ i3plus.pojo i3plus-pojo-form + + i3plus.pojo + i3plus-pojo-mes + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java new file mode 100644 index 0000000..94ef1a2 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonOpcModel { + + /** + * 通常为localhost + */ + @ApiParam("opcserver地址-ip") + private String host; + + /** + * opcserver的名称 + */ + @ApiParam("opcserver名称") + private String serverProgId; + + /** + * 一般为channel + */ + @ApiParam("第一层路径") + private String accessPath; + + /** + * 一般为device.tag + */ + @ApiParam("剩余路径名称") + private String itemName; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java new file mode 100644 index 0000000..984c8a4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonResultBean { + + @ApiParam("是否成功") + private boolean success; + + @ApiParam("处理信息") + private String msg; + + @ApiParam("处理结果") + private String result; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java new file mode 100644 index 0000000..6880ac3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel extends SysOrganize{ + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java index 048379c..c9abef2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java @@ -7,22 +7,26 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.io.Serializable; import java.util.List; /** -* @Description : 作业流程Model -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2019-04-29 15:39 -* @Modify: -**/ + * @Description : 作业流程Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-04-29 15:39 + * @Modify: + **/ @Data @Api("作业流程Model") public class WmsActionGroupModel implements Serializable { @ApiParam("流程") - public WmsActionGroup wmsActionGroup; - + public String agId; + @ApiParam("工厂代码") + public String organizeCode; + @ApiParam("GOJS位置") + public String position; @ApiParam("流程明细Model集合") public List wmsActionGroupDetailsModelList; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index d54f472..d075fdf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -131,7 +131,10 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; - @Column(name = "EXPECTED_TIME") + /** + * 不冗余主表数据 + */ + @Transient @ApiParam(value = "预计到货日期") public String expectedTime; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 4dc38bb..895d0e0 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam("单据明细编号") private String orderNo; + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + @Column(name = "PART_NO") @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 3594480..1c9cb27 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "用户ID") private Long id; + @ApiParam(value = "用户code（供应商编号）") + private String code; + @ApiParam(value = "用户名") private String userName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index fc22889..4f50d7f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean { @ApiParam(value = "订单类型", example = "1") public Integer orderType; + @ApiParam(value = "订单状态", example = "10") + public Integer orderStatus; + @ApiParam(value = "预计到货日期开始日期") public String expectedTimeStart; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java new file mode 100644 index 0000000..31ee5c5 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 待发布订单列表发布输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-05-13 13:13 + * @Modify: + **/ +@Data +public class SwebPOUpdatePublishForPublishModel extends BaseBean { + + @ApiParam(value = "拆分请求时间数量列表", example = "1") + private List reqTimeList; + + @ApiParam(value = "列表项", example = "1") + private SwebPOForPubListResultItemModel item; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 2996182..47cea81 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -115,7 +115,6 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); return buildHql(details, result); } @@ -125,7 +124,19 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); - DdlPreparedPack.getStringEqualPack(details.getExpectedTime(), "expectedTime", result); + return buildHql(details, result); + } + + /** + * 将该供应商下该单号状态全部改为已发布状态 where sql + * @param details + * @return + */ + public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } } 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 310e5fa..28139af 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,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; @@ -47,41 +49,28 @@ public class WmsActionGroup extends BaseBean { @Column(name = "INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; - @Transient - @ApiParam(value = "初始化组件名称") - private String initAmName; - @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; - @Transient - @ApiParam(value = "明细处理组件名称") - private String detailsAmName; - - @Column(name = "SUBMIT_AM_ID") - @ApiParam(value = "提交组件编号", example = "0") - private Long submitAmId; - - @Transient - @ApiParam(value = "提交组件名称") - private String submitAmName; - @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; - @Transient - @ApiParam(value = "结束组件名称") - private String endAmName; - // 1=true, 2 = false @Column(name = "AUTO_INIT") @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Column(name = "POSITION") + @ApiParam(value = "GOJS位置") + private String position; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); @@ -108,20 +97,4 @@ public class WmsActionGroup extends BaseBean { public WmsActionGroup() { } - - public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { - this.agNameE = agNameE; - this.agDescE = agDescE; - this.agNameC = agNameC; - this.agDescC = agDescC; - this.autoInit = autoInit; - this.initAmId = initAmId; - this.initAmName = initAmName; - this.detailsAmId = detailsAmId; - this.detailsAmName = detailsAmName; - this.submitAmId = submitAmId; - this.submitAmName = submitAmName; - this.endAmId = endAmId; - this.endAmName = endAmName; - } } 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 d448205..beb6129 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 @@ -27,7 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_GROUP_DETAILS") +@Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean { @@ -87,5 +87,6 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "SHOW_AM_ID") @ApiParam(value = "回显组件方法ID", example = "1") + @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; } 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 4198ff5..48c4aa2 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,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; @@ -50,6 +52,7 @@ public class WmsActionStep extends BaseBean { @Column(name = "AT_ID") @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long atId; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index adbb369..2108003 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -170,6 +170,18 @@ public class WmsDocMovementDetails extends BaseBean { @Transient public Double inputMoveQty; + @Transient + @ApiParam(value ="标准包装",example = "1") + private Double snp; + + @Transient + @ApiParam(value ="条码总数量",example = "1") + private Double detailsSnCount; + + @Transient + @ApiParam(value ="余数",example = "1") + private Double restQty; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } 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 f53fe7d..0f3f1e6 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 @@ -25,13 +25,6 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { - public static String packInParams(String colnumName, String[] params) { - StringBuffer sb = new StringBuffer(); - HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb); - return sb.toString(); - } - /** * 封装公用查询参数 * @@ -54,27 +47,6 @@ public class WmsHqlPack { } /** - * 封装公用查询参数 - * - * @param bean 实体对象 - * @param hqlStr 查询语句 - * @return 封装完成的查询语句 - */ - public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { - - // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); - } - - // 封装有效状态和删除状态 - HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - - return hqlStr.toString(); - } - - /** * PO订单明细表 分页查询 * * @param wmsPOMasterDetails @@ -202,14 +174,14 @@ public class WmsHqlPack { * @param routingCode * @return */ - public static String packHqlWmsRoutingChildren(String routingCode) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(routingCode, "routingCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } @@ -219,14 +191,14 @@ public class WmsHqlPack { * @param wmsRoutingMaster * @return */ - public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); + public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); getStringBuilderPack(wmsRoutingMaster, result); - return result.toString(); + return result; } /** @@ -235,18 +207,18 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static String packHqlWmsPart(WmsPart wmsPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); - HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); - return result.toString(); + return result; } /** @@ -293,26 +265,6 @@ public class WmsHqlPack { } /** - * 库存交易记录信息 分页查询 - * - * @param wmsTrans - * @return - */ - public static String packHqlWmsTrans(WmsTrans wmsTrans) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); - HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); - HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - - getStringBuilderPack(wmsTrans, result); - - return result.toString(); - } - - - /** * 供应商分页查询 * * @param basVendor @@ -467,25 +419,6 @@ public class WmsHqlPack { return result; } - /** - * 供应商唯一性校验查询条件【用于添加和修改】 - * - * @param basVendor - * @return - */ - public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); - - getStringBuilderPack(basVendor, result); - - return result; - } - public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { DdlPackBean result = new DdlPackBean(); @@ -498,38 +431,6 @@ public class WmsHqlPack { } /** - * 查询满足处理周期的作业类型 查询条件封装 - * - * @param wmsOpType - * @return - */ - public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) { - StringBuffer result = new StringBuffer(); - - getStringBuilderPack(wmsOpType, result); - result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins"); - return result.toString(); - } - - /** - * 作业任务数据来源 查询条件封装 - * - * @param wmsTaskSrc - * @return - */ - public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { - StringBuffer result = new StringBuffer(); - - //作业类型代码 - HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); - - getStringBuilderPack(wmsTaskSrc, result); - - return result.toString(); - } - - - /** * 客户信息 查询条件封装 * * @param basCustomer @@ -805,25 +706,25 @@ public class WmsHqlPack { * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ - public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { + DdlPackBean result = new DdlPackBean(); // 仓库代码 - HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); // 供应商编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); // 物料编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); // 负责人 - HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); // 是否预分配 - HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); + DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); getStringBuilderPack(wmsAreaOwner, result); - return result.toString(); + return result; } /** @@ -1087,7 +988,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() , + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue(), WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 @@ -1238,7 +1139,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result); getStringBuilderPack(wmsActionStepType, result); @@ -1291,7 +1193,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); - DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); getStringBuilderPack(wmsActionModule, result); @@ -1373,22 +1275,6 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 - * - * @param wmsMoveSn - * @return - */ - public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - getStringBuilderPack(wmsMoveSn, result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - - return result.toString(); - } - - /** * 根据条件查询库存条码信息 * * @param wmsStockSn @@ -1590,19 +1476,22 @@ public class WmsHqlPack { * @param wmsTransModule * @return */ - public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { + DdlPackBean packBean = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { - HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); } - getStringBuilderPack(wmsTransModule, result); - return result.toString(); + if (StringUtils.isNotBlank(wmsTransModule.orderBy())) { + packBean.setOrderByStr(wmsTransModule.orderBy()); + } + getStringBuilderPack(wmsTransModule, packBean); + return packBean; } /** @@ -1701,7 +1590,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() , + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(), WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);