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 index 0f46e3b..749eae4 100644 --- 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 @@ -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; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index b92a876..1ec4182 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -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; } 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 index a6824e0..e0bbc8e 100644 --- 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 @@ -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; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index 87b497a..d79eb4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -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; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index afef3d0..4f04613 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -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; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 2553c7c..b2f933c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -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; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 819f768..9f8d287 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -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; } 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 index f5f0469..2491043 100644 --- 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 @@ -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; } 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 index ccd2315..f681bb6 100644 --- 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 @@ -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; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java index 0580ab0..43877a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java @@ -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; 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 index 962309b..3c89d14 100644 --- 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 @@ -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") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java index 835046b..ff4853d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -34,5 +34,4 @@ public class AndonKnowledgeBase extends BaseManageQueue { @Column(name = "FLOW_MEMO") @ApiParam(value = "审批意见") private String flowMemo; - } 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 index 748105e..828a12a 100644 --- 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 @@ -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(){ 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 index fda0737..b2ad1a2 100644 --- 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 @@ -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; } 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 index 15572d5..547a389 100644 --- 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 @@ -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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 6a0a0d2..1eb5b9d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.annotation; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -21,4 +23,7 @@ public @interface FieldAnnotation { int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 String defaultValue() default ""; // 字段的默认值 + boolean popSearch() default false; // 弹出选择对象时是否显示 + EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型 + String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 12c9683..dd36fb7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -32,6 +32,7 @@ public class BaseOrder extends BaseCode { @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private Integer priority; @Column(name="LET") @@ -40,18 +41,22 @@ public class BaseOrder extends BaseCode { @Column(name="CALC_EST") @ApiParam(value ="最早开始时刻计算值") + @FieldAnnotation(modify = false) private Date calcEst; @Column(name="CALC_LET") @ApiParam(value ="最晚结束时刻计算值") + @FieldAnnotation(modify = false) private Date calcLet; @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始") + @FieldAnnotation(modify = false) private Date planBegin; @Column(name="PLAN_END") @ApiParam(value ="计划结束") + @FieldAnnotation(modify = false) private Date planEnd; @Column(name="RECEIVE_DATE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index f302131..ea3296d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -44,6 +45,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="类型名称") private String typeName; + @Column(name="TYPE_FULL_NAME") + @ApiParam(value ="类型全名称包含路径") + private String typeFullName; + @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") private Boolean customize; @@ -84,6 +89,14 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @Column(name="POP_SEARCH") + @ApiParam(value ="弹出选择时是否显示") + private Boolean popSearch; + + @Column(name="EDIT_TYPE") + @ApiParam(value ="字段编辑类型") + private EDIT_TYPE editType; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 89699c0..97056fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -33,10 +34,12 @@ public class Inventory extends BaseOrder { @Column(name="ASSIGN_COUNT") @ApiParam(value ="已分配量") + @FieldAnnotation(modify = false) private Double assignCount; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 46880ed..7b7ba76 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -70,7 +70,7 @@ public class Material extends BaseCode { @Column(name="LEVEL") @ApiParam(value ="低阶码") - @RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel") + @RippleAnnotation(dependence = {"OperInputs.Operation.ProductRouting.Material.level"}, method = "calcLevel") @FieldAnnotation(modify = false) private Integer level; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 23bcbe8..a006cdf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -77,14 +77,17 @@ public class ProductOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @Column(name="LACK_COUNT") @ApiParam(value ="缺少量") + @FieldAnnotation(modify = false) private Double lackCount; @Column(name="AUTO_SUPPLY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index eab91d2..f784093 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -41,10 +42,12 @@ public class PurchaseOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") + @FieldAnnotation(modify = false) private Double excessCount; @Column(name="AUTO_SUPPLY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 2ec0cbc..125255d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; @@ -27,6 +29,7 @@ import java.util.List; public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源代码") + @FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT, typeName = "Resource") private String resCodes; @Column(name="WEEKS") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index e74a116..dc63b89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -42,6 +43,7 @@ public class SalesOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") + @FieldAnnotation(modify = false) private String calcLeadTime; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 70f77de..4f68bf4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.enums.ROUTING_VALID_TYPE; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,4 +31,13 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; + + @Column(name="TYPE") + @ApiParam(value ="工艺路径有效判断类型") + private ROUTING_VALID_TYPE type; + + @Column(name="RULE_GROUP_ID") + @ApiParam(value ="规则组id") + @FieldAnnotation(display = false) + private Long ruleGroupId; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 896eb83..5e68d01 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -31,10 +31,12 @@ import java.util.List; public class Work extends BaseCode { @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") + @FieldAnnotation(modify = false) private WORK_TYPE workType; @Column(name="count") @ApiParam(value ="数量") + @FieldAnnotation(modify = false) private Double count; @Column(name="SPECIFY_COUNT") @@ -75,10 +77,12 @@ public class Work extends BaseCode { @Column(name="CALC_EST") @ApiParam(value ="最早开始时间计算值") + @FieldAnnotation(modify = false) private Date calcEst; @Column(name="CALC_LET") @ApiParam(value ="最晚结束时间计算值") + @FieldAnnotation(modify = false) private Date calcLet; @Column(name="WORK_STATUS") @@ -87,14 +91,17 @@ public class Work extends BaseCode { @Column(name="PLAN_BEGIN") @ApiParam(value ="计划开始时间") + @FieldAnnotation(modify = false) private Date planBegin; @Column(name="PLAN_END") @ApiParam(value ="计划结束时间") + @FieldAnnotation(modify = false) private Date planEnd; @Column(name="PLAN_RESOURCE") @ApiParam(value ="计划主资源") + @FieldAnnotation(modify = false) private String planResource; @Column(name="FIX_SPLIT") @@ -103,14 +110,17 @@ public class Work extends BaseCode { @Column(name="NEED_PREV_COUNT") @ApiParam(value ="需要的前工作数量") + @FieldAnnotation(display = false, modify = false) private Double needPrevCount; @Column(name="SCH_FAILED") @ApiParam(value ="是否排程失败") + @FieldAnnotation(modify = false) private Boolean schFailed; @Column(name="FAILED_REASON") @ApiParam(value ="排程失败原因") + @FieldAnnotation(modify = false) private String failedReason; @Column(name="ORDER_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index c74f140..e690ba2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,14 +29,17 @@ import java.util.List; public class WorkInput extends BaseAPS { @Column(name="INPUT_TIME") @ApiParam(value ="输入时间") + @FieldAnnotation(modify = false) private Date inputTime; @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") + @FieldAnnotation(modify = false) private Double inputCount; @Column(name="SHORT_COUNT") @ApiParam(value ="短缺数量") + @FieldAnnotation(modify = false) private Double shortCount; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 49116dd..c947efd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -30,14 +30,17 @@ import java.util.List; public class WorkOutput extends BaseAPS { @Column(name="OUTPUT_TIME") @ApiParam(value ="输出时间") + @FieldAnnotation(modify = false) private Date outputTime; @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") + @FieldAnnotation(modify = false) private Double outputCount; @Column(name="REMAIN_COUNT") @ApiParam(value ="多余数量") + @FieldAnnotation(modify = false) private Double remainCount; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 95b5a20..ddd9a92 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; @@ -34,66 +35,82 @@ import java.util.List; public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_BEGIN") @ApiParam(value ="前设置开始时间") + @FieldAnnotation(modify = false) private Date prevSetBegin; @Column(name="PREV_SET_END") @ApiParam(value ="前设置结束时间") + @FieldAnnotation(modify = false) private Date prevSetEnd; @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(modify = false) private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") + @FieldAnnotation(modify = false) private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") + @FieldAnnotation(modify = false) private Date produceEnd; @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") + @FieldAnnotation(modify = false) private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") + @FieldAnnotation(modify = false) private Date postSetBegin; @Column(name="POST_SET_END") @ApiParam(value ="后设置结束时间") + @FieldAnnotation(modify = false) private Date postSetEnd; @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(modify = false) private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") + @FieldAnnotation(modify = false) private Date lockBegin; @Column(name="LOCK_END") @ApiParam(value ="锁定结束时间") + @FieldAnnotation(modify = false) private Date lockEnd; @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") + @FieldAnnotation(modify = false) private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") + @FieldAnnotation(property = false) private Long workId; @Column(name="RESOURCE_ID") @ApiParam(value ="资源对象id") + @FieldAnnotation(property = false) private Long resourceId; @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") + @FieldAnnotation(property = false) private Long workResourceId; @Column(name="MAIN_PLAN_ID") @ApiParam(value ="主计划对象id") + @FieldAnnotation(property = false) private Long mainPlanId; public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 8894581..e4d86da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -29,22 +29,27 @@ import javax.persistence.Table; public class WorkRelation extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="关联类型") + @FieldAnnotation(modify = false) private WORK_RELATION_TYPE type; @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") + @FieldAnnotation(modify = false) private CONSTRAINT_TYPE consType; @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大间隔时间") + @FieldAnnotation(modify = false) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小间隔时间") + @FieldAnnotation(modify = false) private String minSpaceTime; @Column(name="COUNT") @ApiParam(value ="关联数量") + @FieldAnnotation(modify = false) private Double count; @Column(name="FIX_RELATION") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index f4266ec..f51f6b1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -28,38 +28,47 @@ import javax.persistence.Table; public class WorkResource extends BaseAPS { @Column(name="USE_TYPE") @ApiParam(value ="使用类型") + @FieldAnnotation(modify = false) private USE_TYPE useType; @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(modify = false) private Long prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") + @FieldAnnotation(modify = false) private Long produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(modify = false) private Long postTime; @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(modify = false) private Integer priority; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(modify = false) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大制造中断时间") + @FieldAnnotation(modify = false) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(modify = false) private String maxPostSdTime; @Column(name="USER_MATCH_NUMBER") @ApiParam(value ="资源使用配套号") + @FieldAnnotation(modify = false) private String userMatchNumber; @Column(name="WORK_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index e61ce60..a300c90 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.MappedSuperclass; +import javax.persistence.Transient; import java.util.HashMap; import java.util.Map; @@ -22,6 +26,12 @@ public abstract class BaseAPS extends BaseBean { @JsonIgnore private transient Map customFields = new HashMap<>(); + @Column(name="KEY") + @ApiParam(value ="主键值") + @FieldAnnotation(display = false, modify = false) + @Transient + private String key; + public Object getCustomField(String code) { return customFields.get(code); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index b434092..5d03f34 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.common; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -18,10 +19,12 @@ import javax.persistence.MappedSuperclass; public abstract class BaseCode extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) private String code; @Column(name="NAME") @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) private String name; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 86df02c..17cc18a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; @@ -235,6 +232,34 @@ public class BeanRelation { return index == 0 && bNotLast; } + /** + * 获取关联对象集合，排除重复的对象 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ + public static Set listUnique(BaseBean bean, Enum holder, Enum... args) { + Set result = new HashSet<>(); + List nextBeans = list(bean, holder); + for (BaseBean nextBean : nextBeans) { + listUniqueImpl(result, nextBean, args, 0); + } + result.remove(bean); + return result; + } + + private static void listUniqueImpl(Set result, BaseBean bean, Enum[] holders, int index) { + if (index >= holders.length) { + result.add((T)bean); + } else { + List nextBeans = list(bean, holders[index]); + for (BaseBean nextBean : nextBeans) { + listUniqueImpl(result, nextBean, holders, index + 1); + } + } + } /** @@ -400,4 +425,38 @@ public class BeanRelation { recursionImpl(relaBean, fun, holders, index + 1); } } + + /** + * 判断target是否为bean为起点的以holders路径上的点。 + * @param bean + * @param target + * @param holders + * @return + */ + public static boolean recursionContains(BaseBean bean, BaseBean target, Enum... holders) { + if (holders.length == 0) { + return false; + } + + return recursionContainsImpl(bean, target, holders, 0); + } + + private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target, + Enum[] holders, int index) { + if (index >= holders.length) { + if (target == bean) { + return true; + } + index = 0; + } + + List relaBeans = list(bean, holders[index]); + for (BaseBean relaBean : relaBeans) { + if (recursionContainsImpl(relaBean, target, holders, index + 1)) { + return true; + } + } + + return false; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index af5476a..68b2fd5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -25,7 +25,7 @@ public class DateDuration { public static final double PRECISION = 0.00001; private String value; - private long time = 0; + private int time = 0; private double rate = 0.0; private boolean bValid = false; @@ -60,7 +60,7 @@ public class DateDuration { * 对于无效的时间区间，返回0。单位为秒。 * @return */ - public long getTime() { + public int getTime() { return this.time; } @@ -68,7 +68,7 @@ public class DateDuration { * 设置新的时间区间。 * @return */ - public void setTime(long time) { + public void setTime(int time) { this.time = time; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java new file mode 100644 index 0000000..b231839 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EDIT_TYPE.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :字段的编辑类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum EDIT_TYPE { + NONE, + BOOLEAN, // 布尔, 开关编辑 + CHAR, // 字符, 文本框编辑 + SHORT, // 短整型, 数字编辑 + INTEGER, // 整型, 数字编辑 + LONG, // 长整型, 数字编辑 + DOUBLE, // 浮点型, 文本框编辑 + DATE, // 日期类型(2019-09-16) + TIME, // 时间类型(17:35:30) + DATE_TIME, // 日期时间类型(2019-09-16 17:35:30) + DURATION, // 时间段(1H),文本框编辑 + ENUM, // 枚举,下拉选择 + MULTI_ENUM, // 多选枚举， 下拉多选 + STRING, // 字符串，文本框编辑 + OBJECT, // 关联对象，下来选择关联对象的Code值 + LIST, // 对象集合，不可编辑。 + MULTI_OBJECT // 多选对象，弹出框选择，可以选择全部对象，以*表示选择全部 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java new file mode 100644 index 0000000..47f2580 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/ROUTING_VALID_TYPE.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :工艺路径有效性判断类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-29 + * @Modify: + **/ +public enum ROUTING_VALID_TYPE { + ORDER_CALC_LET, // 与订单的最晚结束时刻计算值做比较 + CALC_LET_LT, // 与最晚结束时刻计算值-提前期做比较 + BASE_TIME // 与基准时刻做比较 +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 5ed2462..08085ad 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -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 = "创建用户") 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 index 230f235..b27a4a3 100644 --- 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 @@ -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; + } } 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 1d8aa2a..8403580 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 @@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesScrap 报废原因 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + + SCRAP_TYPE(10, "过期"), + SCRAP_TYPE2(20, "不合格"), + SCRAP_TYPE3(30, "缺失"); + + private int value; + private String description; + + SCRAP_TYPE(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) @@ -203,6 +240,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) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index c6a96dc..c7a0b65 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -12,6 +12,155 @@ import org.apache.commons.lang3.StringUtils; **/ public class MesPcnEnumUtil { + + /** + * MesScrap 报废原因 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SCRAP_TYPE { + + SCRAP_TYPE(10, "过期"), + SCRAP_TYPE2(20, "不合格"), + SCRAP_TYPE3(30, "缺失"); + + private int value; + private String description; + + SCRAP_TYPE(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; + } + } + + /** + * MesProduceSn实体对应的qcStatus值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_SN_QC_STATUS { + + QUALIFIED(10, "合格"), + DEFECTED(20, "不合格"), + SCRAPED(30, "报废"), + DISMANTLED(40, "已拆解"); + + private int value; + private String description; + + PRODUCE_SN_QC_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 工位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_TYPE { + + NORMAL(10, "正常"), + REWORK(20, "返修"); + + private int value; + private String description; + + MES_WORK_CELL_TYPE(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) + public enum MES_PRODUCE_SN_RESULT { + + OK(10, "OK"); + + private int value; + private String description; + + MES_PRODUCE_SN_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缺陷原因类型 */ diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java new file mode 100644 index 0000000..84fb49f --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacInstructionSetStep( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepName varchar(50) null, + *
stepSort int null, + *
stepExecCond double null, + *
stepDescription varchar(255) null + *
); + * + *
comment on table LacInstructionSetStep is'指令集模板步骤'; + *
comment on column LacInstructionSetStep.templateId is'模板id'; + *
comment on column LacInstructionSetStep.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStep.templateCode is'模板代码'; + *
comment on column LacInstructionSetStep.stepName is'步骤名称'; + *
comment on column LacInstructionSetStep.stepSort is'步骤顺序'; + *
comment on column LacInstructionSetStep.stepExecCond is'步骤执行条件'; + *
comment on column LacInstructionSetStep.stepDescription is'步骤描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackStep extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="STEP_NAME") + @ApiParam(value ="模板名称") + private String stepName; + + @Column(name="STEP_CODE") + @ApiParam(value ="模板代码") + private String stepCode; + + @Column(name="STEP_SORT") + @ApiParam(value ="步骤顺序") + private Integer stepSort; + + @Column(name="STEP_EXEC_COND") + @ApiParam(value ="步骤执行条件") + private Integer stepExecCond; + + @Column(name="STEP_DESCRIPTION") + @ApiParam(value ="步骤执行条件") + private String stepDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java new file mode 100644 index 0000000..a0aac59 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacInstructionSetStepTask( + *
templateId bigint null, + *
templateNameRdd varchar(50) null, + *
templateCode varchar(50) null, + *
stepId bigint null, + *
stepNameRdd varchar(50) null, + *
taskId bigint null, + *
taskNameRdd varchar(50) null, + *
taskCode varchar(50) null, + *
isCrux int null + *
); + * + *
comment on table LacInstructionSetStepTask is'指令集模板步骤任务'; + *
comment on column LacInstructionSetStepTask.templateId is'模板id'; + *
comment on column LacInstructionSetStepTask.templateNameRdd is'模板名称'; + *
comment on column LacInstructionSetStepTask.templateCode is'模板代码'; + *
comment on column LacInstructionSetStepTask.stepId is'步骤id'; + *
comment on column LacInstructionSetStepTask.stepNameRdd is'步骤名称'; + *
comment on column LacInstructionSetStepTask.taskId is'任务id'; + *
comment on column LacInstructionSetStepTask.taskNameRdd is'任务名称'; + *
comment on column LacInstructionSetStepTask.taskCode is'任务代码'; + *
comment on column LacInstructionSetStepTask.isCrux is'是否关键'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_STEP_TASK") +@Api(value="步骤任务",description = "步骤任务信息") +public class LacCommandStackStepTask extends BaseBean { + + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + +// @Column(name="TEMPLATE_NAME_RDD") +// @ApiParam(value ="模板名称") +// private String templateNameRdd; +// +// @Column(name="TEMPLATE_CODE_RDD") +// @ApiParam(value ="模板代码") +// private String templateCodeRdd; + + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; +// +// @Column(name="STEP_NAME_RDD") +// @ApiParam(value ="步骤名称") +// private String stepNameRdd; +// +// @Column(name="STEP_CODE_RDD") +// @ApiParam(value ="步骤代码") +// private String stepCodeRdd; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String taskNameRdd; + + @Column(name="STEP_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + + @Column(name="IS_CRUX") + @ApiParam(value ="是否关键") + private Integer isCrux; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java new file mode 100644 index 0000000..11ff867 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table instructionSetTemplate( + *
templateName varchar(50) null, + *
templateCode varchar(50) null, + *
templateTypeId bigint null, + *
templateTypeNameRdd varchar(50) null, + *
templateDescription varchar(50) null, + *
templateStepNum int null + *
); + * + *
comment on table instructionSetTemplate is'指令集模板'; + *
comment on column instructionSetTemplate.templateName is'模板名称'; + *
comment on column instructionSetTemplate.templateCode is'模板代码'; + *
comment on column instructionSetTemplate.templateTypeId is'模板大类id'; + *
comment on column instructionSetTemplate.templateTypeNameRdd is'模板大类名称'; + *
comment on column instructionSetTemplate.templateDescription is'模板描述'; + *
comment on column instructionSetTemplate.templateStepNum is'模板步骤'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午5:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_TEMPLATE") +@Api(value="指令集模板",description = "指令集模板信息") +public class LacCommandStackTemplate extends BaseBean { + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long stackTypeId; + + @Column(name="STACK_TYPE_NAME_RDD") + @ApiParam(value ="类型名称") + private String stackTypeNameRdd; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="模板大类名称") + private String typeDescription; + + @Column(name="TEMPLATE_NUM") + @ApiParam(value ="适配器使用数量") + private Integer templateNum; + + @Column(name="TEMPLATE_DESCRIPTION") + @ApiParam(value ="模板描述") + private String templateDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java new file mode 100644 index 0000000..af6e6fb --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitCase( + *
sutiCaseId bigint null, + *
sutiCaseNameRdd varchar(50) null, + *
suitCaseCode varchar(50) null, + *
sutiType int null, + *
hardwareType int null, + *
returnMethod int null, + *
timeout int null, + *
retryNum int null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
sutiCaseStatus int null + *
); + *
+ *
comment on table LacSuitCase is'适配器'; + *
comment on column LacSuitCase.sutiCaseId is'适配器id'; 不推荐使用ID绑定，数据库调整会有变动，推荐使用Code 绑定 + *
comment on column LacSuitCase.sutiCaseNameRdd is'适配器名称'; + *
comment on column LacSuitCase.suitCaseCode is'适配器代码'; + *
comment on column LacSuitCase.sutiType is'适配器类型（枚举）'; + *
comment on column LacSuitCase.hardwareType is'硬件类型（枚举）'; + *
comment on column LacSuitCase.returnMethod is'返回方式（枚举）'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.successNum is'成功次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.failNum is'失败次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.countNum is'总次数'; -> 移至 任务当中 + *
comment on column LacSuitCase.sutiCaseStatus is'适配器状态'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_CASE") +@Api(value="适配器",description = "适配器信息") +public class LacSuitCase extends BaseBean { + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String sutiCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="SUTI_TYPE") + @ApiParam(value ="适配器类型") + private Integer sutiType; + + @Column(name="HARDWARE_TYPE") + @ApiParam(value ="硬件类型") + private Integer hardwareType; + + @Column(name="RETURN_METHOD") + @ApiParam(value ="返回类型") + private Integer returnMethod; + + @Column(name="SUTI_CASE_STATUS") + @ApiParam(value ="适配器状态") + private Integer sutiCaseStatus; + + @Column(name="SUIT_CASE_DESCRIPTION") + @ApiParam(value ="适配器描述") + private String suitCaseDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java new file mode 100644 index 0000000..d9af1a4 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTask( + *
taskName varchar(50) null, + *
taskCode varchar(50) null, + *
taskTypeId bigint null, + *
taskTypeNameRdd varchar(50) null, + *
suitCaseId bigint null, + *
suitCaseCode varchar(50) null, + *
suitCaseNameRdd varchar(50) null, + *
successNum int null, + *
failNum int null, + *
countNum int null, + *
taskDescription varchar(255) null + *
); + *
comment on table LacSuitTask is'适配任务'; + *
comment on column LacSuitTask.taskName is'任务名称'; + *
comment on column LacSuitTask.taskCode is'任务代码'; + *
comment on column LacSuitTask.taskTypeId is'任务大类id'; + *
comment on column LacSuitTask.taskTypeNameRdd is'任务大类名称'; + *
comment on column LacSuitTask.suitCaseId is'适配器id'; + *
comment on column LacSuitTask.suitCaseCode is'适配器代码'; + *
comment on column LacSuitTask.suitCaseNameRdd is'适配器名称'; + *
comment on column LacSuitTask.successNum is'成功次数'; + *
comment on column LacSuitTask.failNum is'适配次数'; + *
comment on column LacSuitTask.countNum is'总次数'; + *
comment on column LacSuitTask.taskDescription is'任务描述'; + *
comment on column LacSuitCase.timeout is'超时时间'; -> 移至 任务当中 + *
comment on column LacSuitCase.retryNum is'重试次数'; -> 移至 任务当中 + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK") +@Api(value="调度任务",description = "调度任务信息") +public class LacSuitTask extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="适配器名称") + private String taskName; + + @Column(name="TASK_CODE") + @ApiParam(value ="适配器代码") + private String taskCode; + + @Column(name="TASK_TIMEOUT") + @ApiParam(value ="超时时间") + private Integer taskTimeout; + + @Column(name="TASK_RETRY_NUM") + @ApiParam(value ="重试次数") + private Integer taskRetryNum; + + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型名称") + private String taskTypeNameRdd; + + @Column(name="SUIT_CASE_ID") + @ApiParam(value ="适配器ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name="SUTI_CASE_NAME_RDD") + @ApiParam(value ="适配器名称") + private String suitCaseNameRdd; + + @Column(name="SUIT_CASE_CODE_RDD") + @ApiParam(value ="适配器代码") + private String suitCaseCodeRdd; + + @Column(name="NUM_SUCCESS") + @ApiParam(value ="执行成功次数") + private Integer numSuccess = 0; + + @Column(name="NUM_FAIL") + @ApiParam(value ="执行失败次数") + private Integer numFail = 0; + + @Column(name="NUM_COUNT") + @ApiParam(value ="执行次数") + private Integer numCount = 0; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="任务描述") + private String taskDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java new file mode 100644 index 0000000..2b4b3af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTaskParam( + *
suitTaskId bigint null, + *
suitTaskName varchar(50) null, + *
suitTaskCode varchar(50) null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
paramDescrition varchar(255) null + *
); + *
comment on table LacSuitTaskParam is'适配任务参数'; + *
comment on column LacSuitTaskParam.suitTaskId is'适配任务id'; + *
comment on column LacSuitTaskParam.suitTaskName is'适配任务名称'; + *
comment on column LacSuitTaskParam.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParam.paramName is'参数名称'; + *
comment on column LacSuitTaskParam.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParam.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParam.defaultValue is'默认值'; + *
comment on column LacSuitTaskParam.paramDescrition is'参数描述'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午6:49 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM") +@Api(value="调度任务参数",description = "调度任务参数信息") +public class LacSuitTaskParam extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_CODE") + @ApiParam(value ="参数编码") + private String paramCode; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="PARAM_DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String paramDefaultValue; + + @Column(name="PARAM_DESCRIPTION") + @ApiParam(value ="参数描述") + private String paramDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java new file mode 100644 index 0000000..b44528b --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * + *
create table LacSuitTaskParamAdapter( + *
sutiTaskId bigint null, + *
suitTaskCode varchar(50) null, + *
suitTaskNameRdd varchar(50) null, + *
paramId bigint null, + *
paramName varchar(50) null, + *
paramType int null, + *
paramValueType int null, + *
defaultValue varchar(50) null, + *
transferParamName varchar(50) null, + *
transferParamValueType int null + *
); + *
comment on table LacSuitTaskParamAdapter is'适配任务参数转换'; + *
comment on column LacSuitTaskParamAdapter.sutiTaskId is'适配任务id'; + *
comment on column LacSuitTaskParamAdapter.suitTaskCode is'适配任务代码'; + *
comment on column LacSuitTaskParamAdapter.suitTaskNameRdd is'适配任务名称'; + *
comment on column LacSuitTaskParamAdapter.paramId is'参数id'; + *
comment on column LacSuitTaskParamAdapter.paramName is'参数名称'; + *
comment on column LacSuitTaskParamAdapter.paramType is'参数类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.paramValueType is'参数值类型(枚举)'; + *
comment on column LacSuitTaskParamAdapter.defaultValue is'默认值'; + *
comment on column LacSuitTaskParamAdapter.transferParamName is'转换后参数名称'; + *
comment on column LacSuitTaskParamAdapter.transferParamValueType is'转换后参数值类型'; + * + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-25 下午1:45 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_SUIT_TASK_PARAM_ADAPTER") +@Api(value="调度任务参数转换",description = "调度任务参数转换信息") +public class LacSuitTaskParamAdapter extends BaseBean { + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_CODE_RDD") + @ApiParam(value ="任务代码") + private String taskCodeRdd; + + @Column(name="PARAM_ID") + @ApiParam(value ="参数ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long paramId; + + @Column(name="PARAM_NAME") + @ApiParam(value ="参数名称") + private String paramName; + + @Column(name="PARAM_TYPE") + @ApiParam(value ="参数类型") + private Integer paramType; + + @Column(name="PARAM_VALUE_TYPE") + @ApiParam(value ="参数值类型") + private Integer paramValueType; + + @Column(name="TRANSFER_PARAM_NAME") + @ApiParam(value ="转换后参数名称") + private String transferParamName; + + @Column(name="TRANSFER_PARAM_VALUE_TYPE") + @ApiParam(value ="转换后参数值类型") + private String transferParamValueType; + + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="参数默认值") + private String defaultValue; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java new file mode 100644 index 0000000..8df6834 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java new file mode 100644 index 0000000..4db8217 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackStepTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:55 + * @Modify: + **/ +public interface LacCommandStackStepTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java new file mode 100644 index 0000000..6aa60e8 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacCommandStackTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java new file mode 100644 index 0000000..c4d52d5 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitCaseRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitCase; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午2:56 + * @Modify: + **/ +public interface LacSuitCaseRepository extends BaseRepository { +} + diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java new file mode 100644 index 0000000..887c5b6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamAdapterRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamAdapterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java new file mode 100644 index 0000000..d1026e0 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java new file mode 100644 index 0000000..c65e6c7 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacSuitTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-28 下午3:19 + * @Modify: + **/ +public interface LacSuitTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 53f4b36..30c641c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -53,6 +53,10 @@ public class MesDefectRecord extends BaseBean { @ApiParam("缺陷位置") private String defectLocation; + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + @Column(name="REPAIR_STATUS") @ApiParam("维修状态") private Integer repairStatus; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index 9dfa3d0..a03c46a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -95,6 +95,14 @@ public class MesProcessBom extends BaseBean { @ApiParam("显示颜色") private String color; + @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 09fd0cd..4047e39 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -73,4 +73,15 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测值") private String checkValue; + public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) { + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java index cad4af5..c42611a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java @@ -36,4 +36,8 @@ public class MesScrap extends BaseBean { @ApiParam("报废名称") private String scrapName; + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + private String scrapType; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index 2c60f7a..46b20b1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -60,10 +60,6 @@ public class MesScrapRecord extends BaseBean { @ApiParam("工位") private String workCellCode; - @Column(name = "SCRAP_REASON") - @ApiParam("报废原因") - private String scrapReason; - @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 9dece32..8736abb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -36,6 +36,16 @@ public class MesProdBindRecordModel { private Integer missQty; @ApiParam("报废数") private Integer scrapQty; + @ApiParam("创建时间") + private String createUser; + @ApiParam("创建时间") + private String createDatetime; + @ApiParam("修改人") + private String modifyUser; + @ApiParam("修改时间") + private String modifyDatetime; + @ApiParam("产品条码") + private String serialNumber; public MesProdBindRecordModel() { } @@ -56,4 +66,42 @@ 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; + } + + 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, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) { + 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; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index c9a071a..82ef884 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -220,4 +220,64 @@ public class MesHqlPack { return packBean; } + /** + * MES PCN系维修信息条件查询 + * + * @param mesRepair + * @return + */ + public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); + } + if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); + } + if (mesRepair.getRepairType() != null) { + DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + } + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesScrap + * @return + */ + public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); + } + if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); + } + if (StringUtils.isNotEmpty(mesScrap.getScrapType())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); + } + return packBean; + } + + /** + * MES PCN缺陷原因信息条件查询 + * + * @param mesDefectCause + * @return + */ + public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesDefectCause.getDcCode())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); + } + if (StringUtils.isNotEmpty(mesDefectCause.getDcName())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); + } + if (mesDefectCause.getDcType() != null) { + DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); + } + return packBean; + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 0882b81..b018ee8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -41,6 +41,10 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象值") private String notifyObjectValue; + @Column(name="NOTIFY_OBJECT_VALUE_RDD") + @ApiParam("对象值") + private String notifyObjectValueRdd; + @Column(name="NOTIFY_OBJECT_TYPE") @ApiParam("对象类型") private Integer notifyObjectType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 651fd4d..82bb4aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -58,6 +58,10 @@ public class MesEquTaskStandardRecord extends BaseBean { @ApiParam("操作指导") private String actionGuide; + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + @Column(name = "CHECK_RESULT") @ApiParam("判定结果") private Integer checkResult; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java new file mode 100644 index 0000000..ed95336 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java @@ -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; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index e26b0c3..49202fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -32,7 +32,7 @@ import java.util.List; public class EquTaskNotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") - private Long userId; + private Long userInfoId; @Column(name="USER_NAME_RDD") @ApiParam(value ="用户名称" , access ="账号名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index 1928952..c8316cc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -50,5 +50,8 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("关闭按钮-提醒") private boolean closeButtonNoticeFlag; + @ApiParam("维修任务按钮") + private boolean repairButton; + } 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 6887621..33494dc 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 @@ -1454,8 +1454,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) { DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean); } - if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) { - DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean); + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValueRdd())) { + DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValueRdd", packBean); } if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) { DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 76aad42..0a90db5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -185,6 +185,10 @@ public class WmsMoveDetails extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam(value = "车号") + private String carNo; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -225,12 +229,14 @@ public class WmsMoveDetails extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + public WmsMoveDetails(String partNo, String partNameRdd, String unit, Double transQty) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.unit = unit; this.transQty = transQty; } + public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 8af7dae..c905237 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -182,11 +182,12 @@ public class WmsPart extends BaseBean { public WmsPart() { } - public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) { + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; this.partName = partName; this.max = maxQty; this.min = minQty; this.qty = cqty; + this.partType = partType; } }