diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 0004a3f..fa26efe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -39,4 +39,16 @@ public class WmsLocatePart extends BaseBean{ @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") private String partNameRdd; + + @Column(name = "PULL_QTY") + @ApiParam(value = "拉动数量", example = "0") + private Double pullQty; + + @Column(name = "MAX") + @ApiParam(value = "最大值", example = "0") + private Double max; + + @Column(name = "MIN") + @ApiParam(value = "最小值", example = "0") + private Double min; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 0be658a..755af50 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -23,6 +21,10 @@ import java.util.List; * @Modify: **/ @Data +@Entity +//以子类table为准 +@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) @Api("单据明细Model") public class WmsOrderDetailsModel extends BaseBean {