diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index dcc8eed..59f5e0f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -12,7 +12,6 @@ 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; import java.math.BigDecimal; @@ -52,6 +51,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("数量") private BigDecimal qty; + @Column(name = "FINISH_QTY") + @ApiParam("已检数量") + private BigDecimal finishQty; + @Column(name = "UNIT") @ApiParam("单位") private String unit; @@ -84,7 +87,7 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("检测整体结果") private Integer checkResult; - @Transient - @ApiParam("供应商名称") - private String supplierName; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 599196a..3816286 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -12,7 +12,6 @@ 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; /** @@ -63,23 +62,19 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("是否允许让步") private String isConcession; - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - @Column(name = "CHECK_RESULT") - @ApiParam("检测整体结果") + @ApiParam("检测结果") private Integer checkResult; @Column(name = "CHECK_VALUE") @ApiParam("检测值") private String checkValue; - @Transient - @ApiParam("本批次生产总数") - private Integer currentLotNoSum; + @Column(name = "ITEM_NO") + @ApiParam("检验行号") + private Integer itemNo; - @Transient - @ApiParam("收货批次") - private String srcLotNo; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; }