Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -22,14 +22,13 @@ import java.io.Serializable;
  * @Modify:
  **/
 @Data
-@Entity
+@MappedSuperclass
+//@Entity
 //以子类table为准
-@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
+//@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
 //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     //此处使用hibernate的主键策略方式
     //手动设置,使用iplus-platform-common中的idtool生成
     //将Long类型系列化成String避免精度丢失
@@ -130,7 +129,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
-    public Integer ascOrDesc = 1;
+    public transient Integer ascOrDesc = 1;
 
     //排序方式
     public String orderBy(){

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -105,6 +105,10 @@ public class BfElement extends BaseBean {
     private BfDataObject dataObject;
 
     @Transient
+    @ApiParam(value = "数据对象")
+    private BfElementProperty elementSortProperty;
+
+    @Transient
     @ApiParam(value = "元素表单")
     private BfElementGrid elementGrid;
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java

@@ -42,16 +42,28 @@ public class BfElementTree extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeParentId;
 
+    @Column(name = "TREE_PARENT_RDD")
+    @ApiParam(value = "父级属性ID")
+    private String treeParentRdd;
+
     @Column(name = "TREE_ATTR_NAME_ID")
     @ApiParam(value = "显示属性ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeAttrNameId;
 
+    @Column(name = "TREE_ATTR_NAME_RDD")
+    @ApiParam(value = "显示属性ID")
+    private String treeAttrNameRdd;
+
     @Column(name = "TREE_ATTR_VALUE_ID")
     @ApiParam(value = "取值属性ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeAttrValueId;
 
+    @Column(name = "TREE_ATTR_VALUE_RDD")
+    @ApiParam(value = "取值属性ID")
+    private String treeAttrValueRdd;
+
     @Column(name="TREE_IS_OPEN_ALL")
     @ApiParam(value ="是否全部展开")
     private Integer treeIsOpenAll;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.form.bean.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -36,6 +38,9 @@ public class ElementModel{
     @ApiParam(value = "元素基础属性信息")
     private List<BfElementProperty> propertyList;
 
+    @ApiParam(value = "元素查询排序")
+    private BfElementProperty propertySort;
+
     @ApiParam(value = "元素基础虚拟属性信息")
     private List<BfElementPropertyVirtual> virtualList;
 
@@ -51,4 +56,11 @@ public class ElementModel{
     @ApiParam(value = "元素类型")
     private Integer elementType;
 
+    @ApiParam(value = "排序属性")
+    public String orderByParam;
+
+    //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
+    @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
+    public Integer ascOrDesc = 1;
+
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java

@@ -59,7 +59,7 @@ public class BrRefReportTypeset extends BaseBean {
     /**
      * 关联元素或模板html
      */
-    @Column(name = "REF_HTML")
+    @Column(name = "REF_HTML",columnDefinition = "TEXT")
     @ApiParam(value = "关联对象html")
     private String refHtml;
 

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java

@@ -55,7 +55,7 @@ public class BrReport extends BaseBean {
     @ApiParam(value ="布局名称")
     private String layoutNameRdd;
 
-    @Column(name="LAYOUT_HTML")
+    @Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
     @ApiParam(value ="报表html")
     private String reportHtml;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 供应商微服调用Model
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-30 19:18
+ * @Modify:
+ **/
+@Data
+@Api("供应商微服调用Model")
+public class WmsBasVendorModel extends BaseBean {
+
+    @ApiParam("供应商")
+    private BasVendor basVendor;
+
+    @ApiParam("分页对象")
+    private Pager pager;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 供应商微服调用Model
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-30 19:18
+ * @Modify:
+ **/
+@Data
+@Api("供应商微服调用Model")
+public class WmsPartModel extends BaseBean {
+
+    @ApiParam("物料")
+    private WmsPart wmsPart;
+
+    @ApiParam("分页对象")
+    private Pager pager;
+}