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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
crish 6 years ago
parent 30007cee47 1e0f0c706c
commit 67461457fc
20 changed files with 292 additions and 67 deletions
Show Stats Download Patch File Download Diff File

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

@ -28,7 +28,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_呼叫原因")
@Api(value = "ANDON_呼叫原因")
public class AndonAlarmCause extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@ -40,6 +40,7 @@ public class AndonAlarmCause extends BaseBean {
@ApiParam(value = "呼叫原因代码")
private String acCode;
@AnnoOutputColumn(hidden = true)
@Column(name = "PARENT_AC_CODE")
@ApiParam(value = "父阶原因代码")
private String parentAcCode;
@ -48,10 +49,12 @@ public class AndonAlarmCause extends BaseBean {
@ApiParam(value = "呼叫原因描述")
private String acName;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作单元")
private String workCellCode;

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

@ -31,15 +31,15 @@ import javax.persistence.Table;
public class AndonAlarmDetailType extends BaseBean {
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯子类型编码")
private String alarmDetailCode;
@Column(name = "ALARM_DETAIL_NAME")
@ApiParam(value = "安灯类型名称")
@ApiParam(value = "安灯子类型名称")
private String alarmDetailName;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯类型")
private String alarmCode;
}

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

@ -32,16 +32,16 @@ public class AndonAlarmResponseCfg extends BaseBean {
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description")
@Column(name = "ANDON_STATUS")
@ApiParam(value = "安灯状态")
private String andonStatus;
@Column(name = "RP_WHERE")
@ApiParam(value = "通知条件时长")
@ApiParam(value = "通知时间")
private String rpWhere;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
@ -50,7 +50,7 @@ public class AndonAlarmResponseCfg extends BaseBean {
private String rpCode;
@Column(name = "RP_OBJECT_CODE")
@ApiParam(value = "通知对象代码")
@ApiParam(value = "通知对象")
private String rpObjectCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description")
@ -59,9 +59,10 @@ public class AndonAlarmResponseCfg extends BaseBean {
private String rpLevel;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Column(name = "WORK_CENTER_NAME_RDD")
@ApiParam(value = "工作中心名称")
private String workCenterNameRdd;

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

@ -29,22 +29,20 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元呼叫原因配置")
public class AndonCellAlarmCause extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
@ApiParam(value = "事件描述")
private String acCode;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,15 +35,16 @@ public class AndonCellEventCause extends BaseBean {
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "EC_CODE")
@ApiParam(value = "事件原因代码")
@ApiParam(value = "事件原因")
private String ecCode;

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

@ -29,22 +29,20 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元处理方法配置")
public class AndonCellEventMethod extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
@ApiParam(value = "处理方法")
private String emCode;
}

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

@ -37,24 +37,24 @@ public class AndonDisposalCfg extends BaseBean {
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型代码")
@ApiParam(value = "安灯类型")
private String alarmCode;
@Column(name = "AC_CODE")
@ApiParam(value = "呼叫原因代码")
@ApiParam(value = "事件描述编码")
private String acCode;
@Column(name = "AC_NAME_RDD")
@ApiParam(value = "呼叫原因描述")
@ApiParam(value = "事件描述名称")
private String acNameRdd;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
@ApiParam(value = "处理方法")
private String emCode;
@Column(name = "EM_NAME_RDD")
@ -72,5 +72,6 @@ public class AndonDisposalCfg extends BaseBean {
@Transient
@ApiParam(value = "审批意见集合")
@AnnoOutputColumn(hidden = true)
private Integer[] flowStatusArray;
}

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

@ -28,7 +28,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件原因")
@Api(value = "ANDON_事件原因")
public class AndonEventCause extends BaseBean {
@Column(name = "EC_CODE")
@ -41,6 +41,7 @@ public class AndonEventCause extends BaseBean {
@Column(name = "PARENT_EC_CODE")
@ApiParam(value = "父阶原因代码")
@AnnoOutputColumn(hidden = true)
private String parentEcCode;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@ -50,9 +51,11 @@ public class AndonEventCause extends BaseBean {
@Transient
@ApiParam(value = "工作中心")
@AnnoOutputColumn(hidden = true)
private String workCenterCode;
@Transient
@ApiParam(value = "工作单元")
@AnnoOutputColumn(hidden = true)
private String workCellCode;
}

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

@ -28,7 +28,7 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件处理方法")
@Api(value = "ANDON_事件处理方法")
public class AndonEventMethod extends BaseBean {
@Column(name = "EM_CODE")
@ -39,6 +39,7 @@ public class AndonEventMethod extends BaseBean {
@ApiParam(value = "事件方法描述")
private String emName;
@AnnoOutputColumn(hidden = true)
@Column(name = "PARENT_EM_CODE")
@ApiParam(value = "父阶方法代码")
private String parentEmCode;
@ -48,10 +49,12 @@ public class AndonEventMethod extends BaseBean {
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作单元")
private String workCellCode;

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

@ -44,10 +44,12 @@ public class AndonEventPhenoMenon extends BaseBean {
@ApiParam(value = "安灯类型")
private String alarmCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作中心")
private String workCenterCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "工作单元")
private String workCellCode;

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

@ -29,7 +29,7 @@ import javax.persistence.Table;
public class AndonHaltType extends BaseBean {
@Column(name = "HALT_CODE")
@ApiParam(value = "停机类型代码")
@ApiParam(value = "停机类型编码")
private String haltCode;
@Column(name = "HALT_NAME")

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

@ -34,5 +34,4 @@ public class AndonKnowledgeBase extends BaseManageQueue {
@Column(name = "FLOW_MEMO")
@ApiParam(value = "审批意见")
private String flowMemo;
}

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

@ -32,15 +32,15 @@ import javax.persistence.Table;
public class AndonPLC extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
@ApiParam(value = "工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作单元代码")
@ApiParam(value = "工位代码")
private String workCellCode;
@Column(name = "NODE_CODE")
@ApiParam(value = "控制节点代码")
@ApiParam(value = "控制节点编码")
private String nodeCode;
@Column(name = "NODE_IP")
@ -52,7 +52,7 @@ public class AndonPLC extends BaseBean {
private String channelName;
@Column(name = "TAG_NAME")
@ApiParam(value = "标签名称")
@ApiParam(value = "标签名字")
private String tagName;
@Column(name = "TAG_ADDRESS")
@ -77,9 +77,9 @@ public class AndonPLC extends BaseBean {
@ApiParam(value = "标签业务类型")
private String tagBusinessType;
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
@AnnoOutputColumn(refClass = AndonEnumUtil.IS_ALARM_STATUS.class,refForeignKey = "value",value = "description")
@Column(name = "IS_ALARM_STATUS")
@ApiParam(value = "是否按灯状态", example = "1")
@ApiParam(value = "是否安灯")
private Integer isAlarmStatus;
public int getIsAlarmStatusVal(){

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 安灯通知对象
@ -29,14 +31,19 @@ import javax.persistence.Table;
public class AndonResponseObject extends BaseBean {
@Column(name = "RP_OBJECT_CODE")
@ApiParam(value = "对象代码")
@ApiParam(value = "通知对象对象编码")
private String rpObjectCode;
@Column(name = "RP_OBJECT_NAME")
@ApiParam(value = "对象名称")
@ApiParam(value = "通知对象名称")
private String rpObjectName;
@Column(name = "RP_OBJECT_VALUE")
@ApiParam(value = "对象值")
@ApiParam(value = "通知对象值")
private String rpObjectValue;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "通知对象")
private String rpObjectValueRdd;
}

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

@ -279,13 +279,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result);
DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result);
getStringBuilderPack(andonAlarmCause, result);
return result;
}
@ -296,10 +293,8 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonEventMethod, result);
return result;
}
@ -310,10 +305,8 @@ public class AndonHqlPack {
*/
public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonEventCause, result);
return result;
}
@ -348,6 +341,23 @@ public class AndonHqlPack {
* @param andonManageQueue
* @return
*/
public static DdlPackBean packHqlAndonManageQueueUseByPlc(AndonManageQueue andonManageQueue, Object[] obj){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonManageQueue, result);
return result;
}
/**
* 按条件查询按灯队列信息
* @param andonManageQueue
* @return
*/
public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result);
@ -365,7 +375,6 @@ public class AndonHqlPack {
if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
}
getStringBuilderPack(andonManageQueue, result);
// 根据优先级倒序，序号升序排序
// DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
@ -541,14 +550,13 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result);
DdlPreparedPack.getStringEqualPack(responseCfg.getRpCode(), "rpCode", result);
getStringBuilderPack(responseCfg, result);
return result;
@ -627,9 +635,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result);
DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result);
DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result);
getStringBuilderPack(andonResponseObject, result);
return result;
}
@ -640,13 +646,10 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result);
DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result);
getStringBuilderPack(andonEventCause, result);
return result;
}
@ -673,6 +676,11 @@ public class AndonHqlPack {
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result);
DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getOrderByPack(
new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},
new String[]{eventPhenoMenon.getOrderByParam()},
result
);
getStringBuilderPack(eventPhenoMenon, result);
@ -681,18 +689,15 @@ public class AndonHqlPack {
/**
* ANDON_ 事件处理方法
* @param eventPhenoMenon
* @param eventMethod
* @return
*/
public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) {
public static DdlPackBean packAndonEventMethod(AndonEventMethod eventMethod) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmName(), "emName", result);
DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmCode(), "emCode", result);
getStringBuilderPack(eventPhenoMenon, result);
DdlPreparedPack.getStringEqualPack(eventMethod.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(eventMethod.getEmName(), "emName", result);
DdlPreparedPack.getStringLikerPack(eventMethod.getEmCode(), "emCode", result);
getStringBuilderPack(eventMethod, result);
return result;
}
@ -703,13 +708,14 @@ public class AndonHqlPack {
*/
public static DdlPackBean packAndonPLC(AndonPLC plc) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result);
DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result);
DdlPreparedPack.getStringEqualPack(plc.getChannelName(),"channelName",result);
DdlPreparedPack.getStringEqualPack(plc.getGroupNo(),"groupNo",result);
DdlPreparedPack.getStringEqualPack(plc.getWorkCenterCode(), "workCenterCode", result);
DdlPreparedPack.getStringEqualPack(plc.getWorkCellCode(), "workCellCode", result);
DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(plc, result);
return result;
}

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -67,14 +67,14 @@ public abstract class BaseBean implements Serializable {
@Column(name="IS_VALID")
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED")
@ApiParam(value = "是否已删除",example = "2")
@AnnoOutputColumn(hidden = true)
//逻辑删除，软删除
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSE
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA
@Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户")

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

@ -292,6 +292,58 @@ public class AndonEnumUtil {
}
/**
* 处理标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_ALARM_STATUS {
TRUE(10, "是"), FALSE(20, "否");
private int value;
private String description;
private IS_ALARM_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getValueStr() {
return value + "";
}
public String getDescription() {
return description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {return valueOf(val);}
public static int descriptionOfValue(String desc) {return descOf(desc);}
}
/**
* 按灯状态
* 10-是，20-否
*/
@ -453,6 +505,16 @@ public class AndonEnumUtil {
}
return tmp;
}
public static String descriptionOfCode(String val) {
String tmp = "";
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
tmp = values()[i].code;
}
}
return tmp;
}
}

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

@ -203,6 +203,43 @@ public class MesEnumUtil {
}
/**
* mes设备作业任务明细-判定结果
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_EQU_TASK_DETAIL_CHECK_RESULT {
YES(10, "合格"),
NO(20, "不合格");
private int value;
private String description;
MES_EQU_TASK_DETAIL_CHECK_RESULT(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设备作业任务明细-整体结果
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

16
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java
Unescape Escape View File

@ -56,4 +56,20 @@ public class MesProdBindRecordModel {
this.parentPartName = parentPartName;
this.dismantleQty = dismantleQty;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
}

86
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java
Unescape Escape View File

@ -0,0 +1,86 @@
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.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Description : mes同步设备安灯维修任务model
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-10 17:16
* @Modify:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("mes同步设备安灯维修任务model")
public class AndonEquRepairModel extends BaseBean {
@ApiParam(value = "安灯队列编号")
public String andonOrderNo;
@ApiParam(value = "工作中心代码")
public String workCenterCode;
@ApiParam(value = "工作中心名称")
public String workCenterNameRdd;
@ApiParam(value = "工作单元名称")
public String workCellNameRdd;
@ApiParam(value = "工作单元代码")
public String workCellCode;
@ApiParam(value = "设备代码")
public String equipmentCode;
@ApiParam(value = "设备名称")
public String equipmentNameRdd;
@ApiParam(value = "安灯状态代码")
public String statusCode;
@ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
public String resetTime;
@ApiParam(value = "呼叫原因代码")
public String acCode;
@ApiParam(value = "呼叫原因描述")
public String acNameRdd;
@ApiParam(value = "呼叫具体原因")
public String acDesc;
@ApiParam(value = "事件原因代码")
public String ecCode;
@ApiParam(value = "事件原因描述")
public String ecNameRdd;
@ApiParam(value = "事件具体原因")
public String ecDesc;
@ApiParam(value = "事件方法代码")
public String emCode;
@ApiParam(value = "事件方法描述")
public String emNameRdd;
@ApiParam(value = "事件具体方法")
public String emDesc;
@ApiParam(value = "事件现象代码")
private String epmCode;
@ApiParam(value = "事件现象描述")
private String epmNameRdd;
@ApiParam(value = "组织名称")
private String organizeNameRdd;
}
Write Preview
Loading…
Cancel
Save