Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -182,7 +182,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
     public boolean isDefaultField(String fieldName){
         if (!ATTR_PREFIX.equals(fieldName)) {
             if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName)
-                    || "LOGGER".equals(fieldName)){
+                    || "LOGGER".equals(fieldName) || "ATTR_PREFIX".equals(fieldName)){
                 return true;
             }
         }

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

@@ -53,5 +53,5 @@ public class BfCascade extends BaseBean {
     @Transient
     @ApiParam(value = "元素详细")
     @AnnoOutputColumn(hidden = true)
-    private List<BfCascadeDetail> detailList;
+    private List<BfCascadeDetail> childList;
 }

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

@@ -68,4 +68,9 @@ public class BfDataObject extends BaseBean {
     @AnnoOutputColumn(hidden = true)
     private List<BfDataObjectProperty> propertyList;
 
+    @Transient
+    @ApiParam(value = "元素对象虚拟属性")
+    @AnnoOutputColumn(hidden = true)
+    List<BfElementPropertyVirtual> virtualList;
+
 }

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

@@ -45,6 +45,16 @@ public class BfElement extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long dataObjectId;
 
+    //外键关联数据对象主键
+    @Column(name = "ELEMENT_PROPERTY_PRIMARY_KEY")
+    @ApiParam(value = "元素主键Key ", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementPropertyPrimaryKey;
+
+    @Column(name="ELEMENT_PROPERTY_PRIMARY_KEY_NAME_RDD")
+    @ApiParam(value ="元素主键Key名称")
+    private String elementPropertyPrimaryKeyNameRdd;
+
     @Column(name="ELEMENT_TYPE")
     @ApiParam(value ="元素类型")
     private Integer elementType;
@@ -57,14 +67,30 @@ public class BfElement extends BaseBean {
     @ApiParam(value ="元素编码")
     private String elementCode;
 
-    @Column(name="ELEMENT_ATTR_ID")
+    @Column(name = "IS_OBJECT_ADD")
+    @ApiParam(value = "是否新增")
+    private Integer isObjectAdd;
+
+    @Column(name = "IS_OBJECT_EDIT")
+    @ApiParam(value = "是否编辑")
+    private Integer isObjectEdit;
+
+    @Column(name = "IS_OBJECT_DEL")
+    @ApiParam(value = "是否删除")
+    private Integer isObjectDel;
+
+    @Column(name="ELEMENT_SORT_ATTR_ID")
     @ApiParam(value ="默认排序属性")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long elementAttrId;
+    private Long elementSortAttrId;
+
+    @Column(name="ELEMENT_SORT_ATTR_CODE_RDD")
+    @ApiParam(value ="默认排序属性名称")
+    private String elementSortAttrCodeRdd;
 
-    @Column(name="ELEMENT_SORT_TYPE")
+    @Column(name="ELEMENT_SORT_ATTR_TYPE")
     @ApiParam(value ="默认排序规则")
-    private Integer elementSortType;
+    private Integer elementSortAttrType;
 
     @Column(name="ELEMENT_CSS_STYLE")
     @ApiParam(value ="元素样式")

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

@@ -44,18 +44,6 @@ public class BfElementGrid extends BaseBean {
     @ApiParam(value = "是否单选")
     private Integer isLineMultiple;
 
-    @Column(name = "IS_OBJECT_ADD")
-    @ApiParam(value = "是否新增")
-    private Integer isObjectAdd;
-
-    @Column(name = "IS_OBJECT_EDIT")
-    @ApiParam(value = "是否编辑")
-    private Integer isObjectEdit;
-
-    @Column(name = "IS_OBJECT_DEL")
-    @ApiParam(value = "是否删除")
-    private Integer isObjectDel;
-
     @Column(name = "IS_OBJECT_FIND")
     @ApiParam(value = "是否查询")
     private Integer isObjectFind;

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

@@ -39,8 +39,11 @@ public class ElementModel{
     @ApiParam(value = "元素基础虚拟属性信息")
     private List<BfElementPropertyVirtual> virtualList;
 
+    @ApiParam(value = "级联信息集合")
+    private List<BfCascade> cascadeList;
+
     @ApiParam(value = "动态对象Class")
-    private Class dynClass;
+    private transient Class dynClass;
 
     @ApiParam(value = "数据对象信息")
     private BfDataObject dataObject;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java

@@ -72,10 +72,6 @@ public class WmsQCMaster extends BaseBean {
     @ApiParam("关联单号")
     public String refSrc;
 
-    @Column(name = "IB_NO")
-    @ApiParam("入库单号")
-    public String ibNo;
-
     @Transient
     @ApiParam(value = "客户简称")
     private String custName;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1028,7 +1028,7 @@ public class WmsHqlPack {
     }
 
     /**
-     * 针对质检查询库存移动条码条件封装
+     * 针对质检查询库存移动条码条件封装(特殊处理)
      * @param sn
      * @return
      */
@@ -1066,8 +1066,6 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
         //关联单据号
         HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
-        //入库单号
-        HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
 
         getStringBuilderPack(wmsQCMaster, result);