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 abfa556..312c1f6 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 @@ -1182,7 +1182,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_TYPE { - GET_MES_DATA(1, "pcn获取mes数据"), + GET_MES_DATA(1, "pcn拉取mes数据"), DATA_TO_MES(2, "pcn推送数据至mes"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 6a01945..ab59fa1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -45,4 +46,8 @@ public class MesShiftGroup extends BaseBean implements Serializable { @Column(name = "SQUAD_LEADER") @ApiParam("班长") private String squadLeader; + + @Transient + @ApiParam("班组数") + private String count; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java new file mode 100644 index 0000000..59a4d30 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesAndonManageQueueModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * + */ + +/** + * @Description: 中航-工位停线原因(取AndonManageQueue数据) + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesAndonManageQueueModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("故障名称") + private String acDesc; + + @ApiParam("故障来源") + private String workCellNameRdd; + + @ApiParam("安灯类型") + private String alarmDetailNameRdd; + + @ApiParam("事件描述") + private String ecDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java index 7d51b88..586c574 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterOverviewModel.java @@ -30,5 +30,5 @@ public class MesBoardWorkCenterOverviewModel { List workOrderList; @ApiParam("班组信息") - List shiftGroupList; + MesShiftGroup shiftGroup; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java new file mode 100644 index 0000000..41a9001 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBoardWorkCenterStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 中航-产线状态图 + * @CreateDate: 2020/11/2 + * @Author: simon.song + */ +@Data +public class MesBoardWorkCenterStatusModel { + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("实时节拍") + private String realTimeTakt; + + @ApiParam("工位状态列表") + private List workCellStatusList; + + @ApiParam("工位停线原因") + private List workCellStopLineList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java new file mode 100644 index 0000000..9507a38 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkCellStatusModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class MesWorkCellStatusModel { + + @ApiParam("工位运行状态") + private String cellStatus; + + @ApiParam("工作单元代码") + private String workCellCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 81613fd..f585b43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -106,7 +106,7 @@ public class MesPcnHqlPack { public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean); + DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "rawQty", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); return packBean;