diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java index 4c1f609..00b7a77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java @@ -41,4 +41,8 @@ public class MesBoardShift extends BaseBean implements Serializable { @Column(name = "SHIFT_NAME") @ApiParam("班次名称") private String shiftName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; } 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 5838d4a..755e931 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 @@ -217,7 +217,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { 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, Double qty, Double finsihQty) { + String workCenterCode, String workCellCode, Double qty, Double finsihQty, String groupNo) { this.id = id; this.seq = seq; this.partNo = partNo; @@ -235,6 +235,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workCellCode = workCellCode; this.qty = qty; this.finsihQty = finsihQty; + this.groupNo = groupNo; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 3af7858..ae19bfc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -92,6 +92,10 @@ public class MesStationBom extends BaseBean implements Serializable { private Double feedWarningQty; @Transient + @ApiParam("标准包规数量") + private Double partSpecQty = 0d; + + @Transient @ApiParam("是否已绑定") private Boolean isBind; 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 5807d66..500b492 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 @@ -18,13 +18,13 @@ public class MgnBjBoardModel implements Serializable { private Integer qty; @ApiParam("jsa数量") - private Integer jsaQty; + private Integer jsaQty = 0; @ApiParam("jsa数量") private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty = 0; @ApiParam("完成率") - private Integer completeRate; + private Integer completeRate = 0; @ApiParam("总数量") private Integer totalQty = 0; @ApiParam("预警数量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java new file mode 100644 index 0000000..1c05c3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/11/29 5:40 PM + * @Modify: + */ +@Data +public class SparePartStockModel { + + private Integer maxQty; + + private Integer minQty; +}