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

@@ -25,6 +25,8 @@ public @interface DynamicField {
     int sort() default 0;
     // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
     int isWider() default 2;
+    // 是否可选作查询条件:默认1-可选，2-不可选
+    int isQuery() default 1;
     // 是否勾选:默认1-勾选，2-非勾选
     int isSelect() default 1;
     // 是否必选:默认1-必选，2-非必选

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

@@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable {
     @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
 //    @AnnoOutputColumn(hidden = true)
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
     public String organizeCode;
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)

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

@@ -12,10 +12,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :物料实体
@@ -29,7 +26,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_PART")
+@Table(name = "WMS_PART", indexes = {
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("物料表")
 public class WmsPart extends BaseBean {
     private static final long serialVersionUID = 4849044986767609346L;