I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
刘敏 6 years ago
parent ac1090d661 d7ddf4d5a0
commit b10262b21f
6 changed files with 139 additions and 2 deletions
Show Stats Download Patch File Download Diff File

14
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -103,6 +103,12 @@ public class AndonManageQueue extends BaseBean {
@AnnoOutputColumn(hidden = true)
public String callTime;
@Column(name="CLOSE_TIME")
@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 closeTime;
@Transient
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00")
@ -129,6 +135,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "呼叫人")
private String callUser;
@Column(name = "CLOSE_USER")
@ApiParam(value = "撤销人")
private String closeUser;
@Transient
@ApiParam(value = "呼叫人名字")
private String callUserName;
@ -203,6 +213,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "事件方法描述")
private String emNameRdd;
@Column(name = "CLOSE_CAUSE")
@ApiParam(value = "撤销原因")
private String closeCause;
@Column(name = "EM_DESC")
@ApiParam(value = "事件具体方法")
private String emDesc;

62
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -3,10 +3,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack;
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.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
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 cn.estsh.i3plus.pojo.base.tool.HqlPack;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
/**
@ -17,6 +20,65 @@ import org.apache.commons.lang3.StringUtils;
* @Modify:
**/
public class AndonHqlPack {
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 Start ***********/
/**
* 工作单元呼叫原因配置查询条件封装
* @param andonCellAlarmCause
* @return
*/
public static DdlPackBean getAndonCellAlarmCause(AndonCellAlarmCause andonCellAlarmCause) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAlarmCode(), "alarmCode", packBean);
return packBean;
}
/**
* 工作单元事件方法配置查询条件封装
* @param andonEventMethod
* @return
*/
public static DdlPackBean getAndonCellEventMethod(AndonCellEventMethod andonEventMethod) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventMethod.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventMethod.getEmCode(), "emCode", packBean);
return packBean;
}
/**
* 工作单元事件原因查询封装
* @param andonEventCause
* @return
*/
public static DdlPackBean getAndonCellEventCause(AndonCellEventCause andonEventCause) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventCause.getEcCode(), "ecCode", packBean);
return packBean;
}
/**
* 工作单元事件现象查询条件封装
* @param andonEventPhenoMenon
* @return
*/
public static DdlPackBean getAndonCellEventPhenomenon(AndonCellEventPhenomenon andonEventPhenoMenon) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getOrganizeCode(), "organizeCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
return packBean;
}
/***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/
/**
* genju 安灯队列参数查询安灯队列
* @param andonManageQueue

39
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -12,8 +12,45 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesPcnEnumUtil {
/**
* mes-pcn定时任务状态
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_STATUS{
OPEN(1,"OPEN"),
CLOSE(2,"CLOSE");
private int value;
private String description;
MES_PCN_TASK_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;
}
}
/**
* mes-pcn定时任务同步结果状态
* 10.
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PCN_TASK_SYNC_STATUS{

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java
Unescape Escape View File

@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@ -69,7 +73,15 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
public int getTaskTypeVal() {
return this.taskType == null ? 0 : this.taskType;
}
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
}

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class MesPcnTaskLog extends BaseBean {
@Column(name="ERROR_CONTENT")
@ApiParam("异常内容")
private String errorContent;
private Long errorContent;
public int getSyncStatusVal() {
return this.syncStatus == null ? 0 : this.syncStatus;

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java
Unescape Escape View File

@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务名称")
private String taskName;
@Column(name="TASK_GROUP_NAME")
@ApiParam("任务组名称")
private String taskGroupName;
@Column(name="TASK_DESCRIPTION")
@ApiParam("任务描述")
private String taskDescription;
@ -69,7 +73,15 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务周期描述")
private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
public int getTaskTypeVal() {
return this.taskType == null ? 0 : this.taskType;
}
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
}

Write Preview
Loading…
Cancel
Save