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 b7cb9c1..e674f07 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 @@ -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; @@ -28,6 +30,7 @@ import javax.persistence.Table; @Api("ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean { + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java index b217ba9..b92a876 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 @@ -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; @@ -36,6 +38,7 @@ public class AndonAlarmDetailType extends BaseBean { @ApiParam(value = "安灯类型名称") private String alarmDetailName; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java index 2a816ce..a6824e0 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 @@ -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; @@ -28,10 +30,12 @@ import javax.persistence.Table; @Api("ANDON_呼叫通知配置") public class AndonAlarmResponseCfg extends BaseBean { + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "ANDON_STATUS") @ApiParam(value = "安灯状态") private String andonStatus; @@ -40,6 +44,7 @@ public class AndonAlarmResponseCfg extends BaseBean { @ApiParam(value = "通知条件时长") private String rpWhere; + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "RP_CODE") @ApiParam(value = "通知方式代码") private String rpCode; @@ -48,6 +53,7 @@ public class AndonAlarmResponseCfg extends BaseBean { @ApiParam(value = "通知对象代码") private String rpObjectCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description") @Column(name = "RP_LEVEL") @ApiParam(value = "通知级别") private String rpLevel; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java index 8991528..126d29e 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 @@ -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; @@ -36,6 +38,7 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "工作单元代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; @@ -44,6 +47,7 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因代码") private String acCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "APPROVAL_STATUS") @ApiParam(value = "审批状态") private String approvalStatus; 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 c91b9b9..8e4a816 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 @@ -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; @@ -40,6 +42,7 @@ public class AndonEventCause extends BaseBean { @ApiParam(value = "父阶原因代码") private String parentEcCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java index f214629..ad4611d 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 @@ -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; @@ -40,6 +42,7 @@ public class AndonEventMethod extends BaseBean { @ApiParam(value = "父阶方法代码") private String parentEmCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java index 1c8726d..c0d4d3a 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 @@ -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; @@ -36,6 +38,7 @@ public class AndonEventPhenoMenon extends BaseBean { @ApiParam(value = "事件现象描述") private String epmName; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java index b1718d0..95aa421 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.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; @@ -34,6 +36,7 @@ import javax.persistence.Table; @Api("安灯队列") public class AndonHaltCfg extends BaseBean { + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 4d6bca8..748105e 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 @@ -1,6 +1,9 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -64,14 +67,17 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "分组号") private String groupNo; + @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_BUSI_FLAG.class,refForeignKey = "value",value = "description") @Column(name = "TAG_BUSINESS_TYPE") @ApiParam(value = "标签业务类型") private String tagBusinessType; + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") @ApiParam(value = "是否按灯状态", example = "1") private Integer isAlarmStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java index 2241c79..09c6388 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -48,6 +48,10 @@ public class MesArea extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return areaName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java index 7959144..1933b6e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -17,7 +17,7 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :生产区域 + * @Description :生产设备 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -59,6 +59,10 @@ public class MesEquipment extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.equipmentName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java index 112dc97..25f802f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -55,6 +55,10 @@ public class MesWorkCell extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.workCellName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index 2fc7aec..575fd1c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -59,6 +59,10 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.workCenterName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") 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 d21e6d6..cd7d4e5 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import org.apache.commons.lang3.StringUtils; /** @@ -286,9 +287,8 @@ public class AndonHqlPack { */ public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); - if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); - } + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(mesArea.orderBy()); return packBean; } @@ -300,12 +300,10 @@ public class AndonHqlPack { */ public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); - } + + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(mesWorkCenter.orderBy()); return packBean; } @@ -317,15 +315,12 @@ public class AndonHqlPack { */ public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); - } + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + + packBean.setOrderByStr(mesWorkCell.orderBy()); return packBean; } @@ -343,6 +338,7 @@ public class AndonHqlPack { if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } + packBean.setOrderByStr(mesEquipment.orderBy()); return packBean; } @@ -501,6 +497,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result); + DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result); + DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(eventPhenoMenon, result); return result; @@ -550,4 +551,90 @@ public class AndonHqlPack { getStringBuilderPack(andonManageRecord, result); return result; } + + /** + * 区域唯一校验 + * @param mesArea + * @return + */ + public static DdlPackBean packHqlCheckMesAreaOnlyByAreaCode(MesArea mesArea){ + DdlPackBean result = new DdlPackBean(); + if (mesArea != null && mesArea.getId() != null && mesArea.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 工作中心唯一校验 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlCheckMesWorkCenterOnlyByWorkCenterCode(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + if (mesWorkCenter != null && mesWorkCenter.getId() != null && mesWorkCenter.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 工作单元唯一校验 + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlCheckMesWorkCellOnlyByWorkCellCode(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + if (mesWorkCell != null && mesWorkCell.getId() != null && mesWorkCell.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 设备唯一校验 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlCheckMesEquipmentOnlyByEquipmentCode(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + if (mesEquipment != null && mesEquipment.getId() != null && mesEquipment.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 班次唯一校验 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlCheckMesShiftOnlyByShiftCode(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + if (mesShift != null && mesShift.getId() != null && mesShift.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesShift.getId(),"id",result); + DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result); + } + + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java index b376d1c..f5011e7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java @@ -28,4 +28,6 @@ public class BaseConstWords { public static final String DICTIONARY_POLITICAL_STATUS ="POLITICAL_STATUS"; // 员工类型 EMPLOYEE_TYPE public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE"; + // 系统参数配置 PROPERTIES + public static final String DICTIONARY_PROPERTIES ="PROPERTIES"; } 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 9788e06..a00d90e 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 @@ -45,6 +45,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -83,6 +93,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -119,6 +139,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -149,6 +179,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -193,6 +243,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } @@ -232,6 +292,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } @@ -280,6 +350,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -311,12 +391,22 @@ public class AndonEnumUtil { public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val ) { + if (values()[i].value == val) { tmp = values()[i].description; } } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -343,6 +433,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -369,6 +479,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -407,6 +537,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -446,6 +586,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -479,5 +639,77 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + /** + * 设备状态： + * 10=备用， + * 20=运行， + * 30=故障， + * 40=检修 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_EQUIPMENT_STATUS{ + SPARE("10","备用"), + RUN("20","运行"), + ERROR("30","故障"), + OVERHAUL("40","检修"); + + private String value; + private String description; + + ANDON_EQUIPMENT_STATUS(String value,String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 1b6d43a..fca7f7d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -237,6 +237,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val); + } + } + + /** * 封装String对象成equal语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java index 8c963a4..e4b74f9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; /** @@ -13,7 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class CommonTreeModel { +public class CommonTreeModel implements Serializable { + + private static final long serialVersionUID = -3612131411549787983L; private BaseBean bean; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java index 0759bd3..ce51116 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -14,7 +15,9 @@ import java.util.List; * @Modify: **/ @Data -public class LabelTemplateModel { +public class LabelTemplateModel implements Serializable { + + private static final long serialVersionUID = 2488615810903387414L; private SysLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java index 442e0a2..62546d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class MessagePagerModel { +public class MessagePagerModel implements Serializable { + private static final long serialVersionUID = 6236940647561791913L; private SysMessage sysMessage; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java index 97b20df..4eb0420 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class RefUserMessagePagerModel { +public class RefUserMessagePagerModel implements Serializable { + private static final long serialVersionUID = -4109915131051843577L; private SysRefUserMessage sysRefUserMessage; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 5ff8bed..3a35968 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -22,6 +22,8 @@ import java.util.List; @Data public class UserDetailModel extends BaseBean { + + private static final long serialVersionUID = 4413526491980249893L; @ApiParam(value ="账号ID") private String userId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java index 80c430e..cdc3da2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -11,8 +13,10 @@ import lombok.Data; * @Modify: **/ @Data -public class UserDetailPagerModel { +public class UserDetailPagerModel implements Serializable { + + private static final long serialVersionUID = -5347423781211585908L; private UserDetailModel userDetailModel; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java index 4ca730e..b8c77f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class UserRolePagerModel { +public class UserRolePagerModel implements Serializable { + private static final long serialVersionUID = 6180855492105859082L; private SysRole sysRole; private Pager pager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java index d5ffa91..234778b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 邮件配置信息 * @Reference : @@ -11,8 +13,9 @@ import lombok.Data; * @Modify: **/ @Data -public class MailConfig { +public class MailConfig implements Serializable { + private static final long serialVersionUID = -6776607385471325344L; @ApiParam(value = "邮箱开关") private int mailSwitch; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 3ee307d..c2ad1d4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -16,6 +16,11 @@ import java.util.List; @Data public class SessionUser implements Serializable { + private static final long serialVersionUID = -6478598185766500419L; + + @ApiParam("会话ID") + private String token; + @ApiParam("用户ID") private Long userId; @@ -32,6 +37,9 @@ public class SessionUser implements Serializable { @ApiParam("用户类型") private String userType; + @ApiParam("用户登录平台") + private Integer loginPlatform; + @ApiParam("用户信息") private SysUser user; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index 61c82cc..a0b2a6a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="条码规则",description = "条码规则") public class SysBarcodeRule extends BaseBean { + private static final long serialVersionUID = -2041412527908996307L; @Column(name = "NAME") @ApiParam(value = "规则名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 85501de..3ab55af 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="系统配置",description = "系统配置") public class SysConfig extends BaseBean { + private static final long serialVersionUID = 2718495807943432629L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 69f2625..79daa0f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="部门",description = "部门") public class SysDepartment extends BaseBean { + private static final long serialVersionUID = -1505054622781210062L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 5eaa6c5..32929c7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="系统字典",description = "系统字典") public class SysDictionary extends BaseBean { + private static final long serialVersionUID = 593801368328634592L; @Column(name="NAME") @ApiParam(value ="字典名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java index 626eef0..460bbfe 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="企业信息",description = "企业信息") public class SysEnterprise extends BaseBean { + private static final long serialVersionUID = -2138074947458189045L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java index 46d607e..4ae6fa6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="企业配置信息",description = "企业配置信息") public class SysEnterpriseConfig extends BaseBean { + private static final long serialVersionUID = -6131429295344210675L; @Column(name="ENTERPRISE_ID") @ApiParam(value ="企业id" , example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index 814ba4f..fefa471 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("工厂仓库") public class SysFactoryStore extends BaseBean { + private static final long serialVersionUID = 6717712070974796221L; @Column(name="store_code") @ApiParam("仓库代码") private String storeCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 6da63b3..ff0c38f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="文件",description = "文件") public class SysFile extends BaseBean { + private static final long serialVersionUID = 623700632055475696L; @Column(name="NAME") @ApiParam(value ="文件名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java index 72f47cc..256ee0a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="文件附件",description = "文件附件") public class SysFileAttach extends BaseBean { + private static final long serialVersionUID = -6730529794381568890L; @Column(name="ATTACH_SOFT_TYPE") @ApiParam(value ="附件所属模块") private Integer attachSoftType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 39eb527..339fb7e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Api(value="打印模板",description = "打印模板") public class SysLabelTemplate extends BaseBean { + private static final long serialVersionUID = 5371856566557305323L; @Column(name="TEMPLATE_CODE") @ApiParam(value ="模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java index 4654f76..92e08e2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -29,6 +29,7 @@ import javax.persistence.*; @Api(value="打印模板参数",description = "打印模板参数") public class SysLabelTemplateParam extends BaseBean { + private static final long serialVersionUID = 6476163540527157643L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java index 7f4d218..61f5c39 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java @@ -24,6 +24,7 @@ import javax.persistence.Table; @Api(value="系统语言表",description = "对系统语言进行匹配。") public class SysLocaleLanguage extends BaseBean { + private static final long serialVersionUID = -1904007575555304772L; @Column(name="LANGUAGE_NAME") @ApiParam(value = "语言名称",example = "前台显示的名称") private String languageName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 1a6f01a..8289035 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。") public class SysLocaleResource extends BaseBean { + private static final long serialVersionUID = -2397207310100672746L; @Column(name="resource_type") @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index 4be79ff..f1a39bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="用户登录记录",description = "用户登录记录") public class SysLogUserLogin extends BaseBean { + private static final long serialVersionUID = 4665598896654312569L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , access ="用户ID") private Long userId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 4c9d314..0e0cbab 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { + private static final long serialVersionUID = 6892387964234712323L; @Column(name="NAME") @ApiParam(value ="功能名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 695c519..8eacda3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "系统消息", description = "系统消息") public class SysMessage extends BaseBean { + private static final long serialVersionUID = -6090909263221993356L; @Column(name = "MESSAGE_TITLE") @ApiParam(value = "消息标题", access = "消息标题") private String messageTitle; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 258e35d..6bb092f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="单号规则",description = "单号规则") public class SysOrderNoRule extends BaseBean { + private static final long serialVersionUID = -283233170141936426L; @Column(name = "NAME") @ApiParam(value = "规则名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index fbbfbe2..2bb58d7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="组织",description = "组织") public class SysOrganize extends BaseBean { + private static final long serialVersionUID = 5932340027033720434L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 513f3c2..1479652 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="岗位",description = "岗位") public class SysPosition extends BaseBean { + private static final long serialVersionUID = -3438901661332705721L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 1851937..68dabba 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="关系-角色菜单",description = "关系-角色菜单") public class SysRefRoleMenu extends BaseBean { + private static final long serialVersionUID = -2013469818246101184L; @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java index 58f2528..272f76c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-任务周期与计划",description = "关系-任务周期与计划") public class SysRefTaskCyclePlan extends BaseBean { + private static final long serialVersionUID = 5217923903994138624L; @Column(name="TASK_CYCLE_ID") @ApiParam(value ="任务周期id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index 5350620..bcb6a0a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="关系-账号部门",description = "关系-账号部门") public class SysRefUserDepartment extends BaseBean { + private static final long serialVersionUID = -2361062982274833764L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java index 81dc295..c465eb5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户部门",description = "关系-用户部门") public class SysRefUserInfoDepartment extends BaseBean { + private static final long serialVersionUID = -1023456569329939973L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 7d02db8..6caccdc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="关系-用户消息",description = "关系-用户消息") public class SysRefUserMessage extends BaseBean { + private static final long serialVersionUID = 555705651072659162L; @Column(name="MESSAGE_ID") @ApiParam(value ="消息id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java index b323292..77eff8c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户岗位",description = "关系-用户岗位") public class SysRefUserPosition extends BaseBean { + private static final long serialVersionUID = 3234085587521697199L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index 223afa8..b6bdcc9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -30,7 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户角色",description = "关系-用户角色") public class SysRefUserRole extends BaseBean { - + private static final long serialVersionUID = -2253689528880200360L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 6e8adc4..9786250 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value="用户角色表",description = "用户权限角色。") public class SysRole extends BaseBean { + private static final long serialVersionUID = -869130572226447415L; @Column(name="NAME") @ApiParam(value ="角色名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index d861209..2b54d99 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="任务",description = "任务") public class SysTask extends BaseBean { + private static final long serialVersionUID = -4462661508105857312L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java index e4d43e4..de6575e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="任务周期",description = "任务周期") public class SysTaskCycle extends BaseBean { + private static final long serialVersionUID = 6821425488105955756L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index df65a54..6b239f8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value = "任务计划", description = "任务计划") public class SysTaskPlan extends BaseBean { + private static final long serialVersionUID = -136675837627794707L; @Column(name = "NAME") @ApiParam(value = "名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java index 2a03f16..2887e9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java @@ -37,6 +37,7 @@ import javax.persistence.Table; @Api(value="硬件设备表",description = "硬件设备表") public class SysTool extends BaseBean { + private static final long serialVersionUID = 100098534186501411L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java index bd8eeb0..4765ce2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java @@ -29,6 +29,7 @@ import java.text.DecimalFormat; @Api(value="设备类型",description = "设备类型") public class SysToolType extends BaseBean { + private static final long serialVersionUID = 6736217130492256001L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index af22709..b607923 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="账号登陆表",description = "账号登陆系统账户。") public class SysUser extends BaseBean { + private static final long serialVersionUID = 3721769401146979123L; @Column(name="USER_INFO_ID") @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 7ac1d95..51d7362 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -34,6 +34,8 @@ import java.util.List; @Api(value="用户详细",description = "用户详细") public class SysUserInfo extends BaseBean { + private static final long serialVersionUID = 3876318482048754222L; + @Column(name="USER_ID") @ApiParam(value ="账号ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java index 7f5be42..8751bde 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java @@ -32,6 +32,7 @@ import javax.persistence.Version; @Api(value="测试用户类",description = "测试事务信息") public class TestTransUser extends BaseBean { + private static final long serialVersionUID = 3860279685301736213L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 5a5d5f2..bcff699 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -243,6 +243,15 @@ public class CoreHqlPack { return result; } + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu){ + + DdlPackBean result = DdlPackBean.getDdlPackBean(menu); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + result.setOrderByStr(menu.orderBy()); + + return result; + } + /** * 系统角色复杂查询 * @param role @@ -416,36 +425,38 @@ public class CoreHqlPack { /** * 任务周期复杂查询 - * @param taskTimeExpression + * @param sysTaskCycle * @return */ - public static String packHqlSysTaskCycle(SysTaskCycle taskTimeExpression) { + public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result); + HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); + HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); // 添加默认排序 - HqlPack.getOrderDefault(taskTimeExpression); + HqlPack.getOrderDefault(sysTaskCycle); return result.toString(); } /** * 定时任务复杂查询 - * @param taskTime + * @param sysTaskPlan * @return */ - public static String packHqlSysTaskPlan(SysTaskPlan taskTime){ + public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(taskTime.getName(),"name",result); - HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result); - HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result); + HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); + HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); + HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); // 添加默认排序 - HqlPack.getOrderDefault(taskTime); + HqlPack.getOrderDefault(sysTaskPlan); return result.toString(); } @@ -715,6 +726,7 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); + HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -753,6 +765,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(sysTask.getName(),"name",result); + HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); return result.toString(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index de6005f..116c383 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -136,4 +136,17 @@ public class WmsASNMasterDetails extends BaseBean { @Transient @ApiParam("标准包装") public Double snp; + + public WmsASNMasterDetails(){} + + public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){ + this.recQty = recQty; + this.partNo = partNo; + this.orderNo = orderNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.unit = unit; + this.erpAreaNo = erpAreaNo; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 5b4030c..693435d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -132,8 +132,10 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(){}; - public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, + public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { + this.id = id; + this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 91a2e34..7803190 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -809,6 +809,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + if (wmsStockSn.getSnStatus() == null) { + DdlPreparedPack.getInPackArray(new Integer[]{ + WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); + } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result);