diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 6095463..dc0a116 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable { @ApiParam("报废数") private Double wasteQty = 0d; + @Transient + @ApiParam("客户零件号") + private String custPartNo; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java index 46a5850..bdf9ab3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") private String repairName; + + @Column(name = "IS_CANCEL_REPAIR") + @ApiParam("取消报废") + private Integer isCancelScrap; }