Merge branch 'dev' of gragon.xu/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java

@@ -39,4 +39,6 @@ public @interface DynamicField {
     String listColumnName() default "";
     // 下拉搜索列名称,多个列名需要根据逗号分隔
     String searchColumnName() default "";
+    // 回显列名
+    String explicitColumnName() default "";
 }

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

@@ -64,19 +64,16 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
 //    @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
     @ApiParam(value = "有效性",example = "1")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否已删除",example = "2")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
     public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSEA
@@ -135,13 +132,11 @@ public abstract class BaseBean implements Serializable {
     @Transient
     @ApiParam(value = "排序属性")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
     public String orderByParam = "";
 
     @Transient
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 
@@ -158,5 +153,4 @@ public abstract class BaseBean implements Serializable {
         }
         return result;
     }
-
 }

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

@@ -52,12 +52,14 @@ public class WmsLocate extends BaseBean {
 
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse",
+            searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code")
     private String whNo;
 
     @Column(name = "ZONE_NO")
     @ApiParam(value = "存储区代码")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
+            searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo")
     private String zoneNo;
 
     @Column(name = "FURNITURE_NO")

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

@@ -147,7 +147,8 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IN_LOCATE_NO")
     @ApiParam(value = "默认入库库位")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate",
+            searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String inLocateNo;
 
     @Column(name = "PROD_CFG_TYPE_CODE")

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

@@ -93,11 +93,15 @@ public class WmsFieldInfo extends BaseBean {
     @ApiParam(value = "条件连接符:and/or")
     private String conditionConnector;
 
-    @Column(name = "LIST_COLUMNNAME")
+    @Column(name = "LIST_COLUMN_NAME")
     @ApiParam(value = "开窗列表显示列名称")
     private String listColumnName;
 
-    @Column(name = "SEARCH_COLUMNNAME")
+    @Column(name = "SEARCH_COLUMN_NAME")
     @ApiParam(value = "开窗搜索列名称")
     private String searchColumnName;
+
+    @Column(name = "EXPLICIT_COLUMN_NAME")
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
 }