yun-zuoyi
许心洁 6 years ago
commit c7e417e644

@ -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;
}

@ -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 : 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;
}

@ -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;
}

@ -25,7 +25,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="安灯类型",description = "安灯类型")
@Api("安灯类型")
public class AndonAlarmType extends BaseBean {
@Column(name = "ALARM_CODE")

@ -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 : 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;
}

@ -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;
}

@ -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 ec_desc;
@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;
}
}

@ -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 ec_desc;
@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;
}
}

@ -0,0 +1,74 @@
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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<AndonAction, Long> {
}

@ -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<AndonAlarmCause, Long> {
}

@ -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<AndonAlarmResponseCfg, Long> {
}

@ -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<AndonEventCause, Long> {
}

@ -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<AndonHaltType, Long> {
}

@ -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 IAndonManagetQueueRepository extends BaseRepository<AndonManageQueue,Long> {
}

@ -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 IAndonManagetRecordRepository extends BaseRepository<AndonManageRecord,Long> {
}

@ -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<AndonPLCRecord, Long> {
}

@ -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<AndonPLC, Long> {
}

@ -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<AndonResponseObject,Long> {
}

@ -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<AndonResponse,Long> {
}

@ -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<AndonStatus,Long> {
}

@ -0,0 +1,55 @@
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.MesWorkOrder;
import java.util.List;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-29-11:58
* @Modify:
**/
public class RequestModel {
private List<MesWorkOrder> workOrderList;
private List<MesPart> partList;
private List<MesPlanOrder> planOrderList;
public RequestModel(List<MesWorkOrder> workOrderList, List<MesPart> partList) {
this.workOrderList = workOrderList;
this.partList = partList;
}
public List<MesWorkOrder> getWorkOrderList() {
return workOrderList;
}
public RequestModel() {
}
public void setWorkOrderList(List<MesWorkOrder> workOrderList) {
this.workOrderList = workOrderList;
}
public List<MesPart> getPartList() {
return partList;
}
public void setPartList(List<MesPart> partList) {
this.partList = partList;
}
public List<MesPlanOrder> getPlanOrderList() {
return planOrderList;
}
public void setPlanOrderList(List<MesPlanOrder> planOrderList) {
this.planOrderList = planOrderList;
}
}

@ -45,10 +45,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 +172,19 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", 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;
}
}

@ -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;
}

Loading…
Cancel
Save