diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java index 1794089..7672a2b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRouteErrorRecord.java @@ -26,6 +26,7 @@ import java.io.Serializable; @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE"), @Index(columnList = "ANDON_ORDER_NO"), @Index(columnList = "MSG_TYPE"), + @Index(columnList = "HANDLE_STATUS"), @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE, ANDON_ORDER_NO"), @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE, HANDLE_STATUS") }) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java new file mode 100644 index 0000000..95a575e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAlarmDetailTypeModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author wangjie + * @version 1.0 + * @date 2021/1/15 15:32 + **/ +@Data +@ApiModel("安灯子类型model") +public class AndonAlarmDetailTypeModel implements Serializable { + + private static final long serialVersionUID = 2877279779029264810L; + + @ApiParam("id") + private Long id; + + @ApiParam(value = "安灯子类型编码") + private String alarmDetailCode; + + @ApiParam(value = "安灯子类型名称") + private String alarmDetailName; + + @ApiParam(value = "安灯类型") + private String alarmCode; + + @ApiParam(value = "安灯类型") + private String alarmName; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("创建用户") + private String createUser; + + @ApiParam("创建日期") + private String createDatetime; + + @ApiParam("修改人") + private String modifyUser; + + @ApiParam("修改日期") + private String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java index dcc689e..9b604da 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonConfigModel.java @@ -12,7 +12,7 @@ import java.io.Serializable; * @date 2021/1/15 15:32 **/ @Data -@ApiModel("模块EXCEL管理") +@ApiModel("安灯系统配置model") public class AndonConfigModel implements Serializable { private static final long serialVersionUID = -3904799282814930138L; 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 f9d5777..2113e64 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 @@ -1264,6 +1264,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(record.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(record.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringLikerPack(record.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getNumEqualPack(record.getHandleStatus(), "handleStatus", packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java index b6ae404..ae54a9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java @@ -45,6 +45,10 @@ public class MesBypassMapping extends BaseBean implements Serializable { @ApiParam("是否显示") private Integer isDisplay; + @Column(name = "PART_LOCATION") + @ApiParam("产品位置") + private String partLocation; + @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java index 2d6bf63..0f4dc91 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -24,4 +25,6 @@ public class AndonQueryUserModel { private String userName; @ApiModelProperty(value ="部门名称" , access ="部门名称") private String department; + @ApiModelProperty(value ="分页参数" , access ="分页参数") + private Pager pager; }