diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java index 284358c..36a7f61 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -121,7 +121,7 @@ public class MesStationBom extends BaseBean { @Override public String toString() { - return "MesProcessBom{" + + return "MesStationBom{" + "partNo='" + partNo + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java new file mode 100644 index 0000000..83a9451 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class DefectModel { + + private Long id; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷类型子集") + private List mesDefectList; + public DefectModel() { + + } + + public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { + this.id = id; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java similarity index 91% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java index 86e92b4..e6504ec 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java @@ -11,7 +11,7 @@ import lombok.Data; * @Modify: **/ @Data -public class MesProcessBomModel { +public class MesStationBomModel { private Long id; @ApiParam("子物料编码") @@ -40,11 +40,11 @@ public class MesProcessBomModel { @ApiParam("报废数") private Integer scrapQty; - public MesProcessBomModel() { + public MesStationBomModel() { } - public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + public MesStationBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; @@ -59,7 +59,7 @@ public class MesProcessBomModel { this.parentPartName = parentPartName; } - public MesProcessBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; this.qty = qty; 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 233bf70..b66d940 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 @@ -110,7 +110,7 @@ public class MesStationBom extends BaseBean { @Override public String toString() { - return "MesProcessBom{" + + return "MesStationBom{" + "partNo='" + partNo + '\'' + ", itemPartNo='" + itemPartNo + '\'' + ", qty=" + qty + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index 2d5ffd2..b668562 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -66,4 +66,8 @@ public class ProdOrgModel extends BaseBean { @Transient @ApiParam("工位类型") private Integer workCellType; + + @Transient + @ApiParam("序号") + private Integer seq; }