From 1fd8e5e76fe0f15f5edfca0fddae6fbb93030b6d Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Sun, 10 Mar 2019 09:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java    | 12 ++++++++++++
 .../i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java      | 10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

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 {