diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index 6c046d9..bc61bd2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable { @ApiParam("图表类型颜色") private String color; + @ApiParam("停线时间比率") + private Integer downtimeRate; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 6b1f00b..8524845 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -202,10 +202,11 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workType = workType; this.orderNo = orderNo; } - public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty, + public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, String workCenterCode, String workCellCode) { + this.id = id; this.seq = seq; this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 6640422..c1994c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -31,10 +31,16 @@ public class MgnBjBoardModel implements Serializable { private Integer warnQty; @ApiParam("预警率") private Integer warnRate; + @ApiParam("目标数量") + private Integer targetQty; + @ApiParam("计划 数量") + private Integer planQty; @ApiParam("目标合格率") private Integer targetRate = 0; @ApiParam("一次合格率") private Integer onceQualityRate = 0; + @ApiParam("待生产订单数量") + private Integer waitProduceQty = 0; @ApiParam(value = "显示颜色") private String color; @@ -42,6 +48,21 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("x坐标内容") private String xAxis; + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("班次人数") + private Integer shiftNum; + + @ApiParam("产品位置代码") + private String produceCategoryCode; + + @ApiParam("产品位置名称") + private String produceCtgyName; + + @ApiParam("时段") + private String timeInterval; + @ApiParam("x坐标内容") private List xAxisList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java index a1b7261..50c452d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java @@ -5,8 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author Wynne.Lu @@ -57,8 +55,5 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; - @ApiParam("单元格编号") - private Map cellNoMap = new HashMap<>(); - }