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

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

@@ -13,8 +13,6 @@ import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 /**
  * @Description :
@@ -65,18 +63,18 @@ public abstract class BaseBean implements Serializable {
         this.id = id;
     }
 
-    @Column(name="ORGANIZE_CODE", nullable = false)
+    @Column(name="ORGANIZE_CODE")
     @ApiParam(value ="组织代码")
 //    @AnnoOutputColumn(hidden = true)
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
     public String organizeCode;
 
-    @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
+    @Column(name="IS_VALID", columnDefinition = "int default 1")
     @ApiParam(value = "有效性",example = "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)
+    @Column(name="IS_DELETED", columnDefinition = "int default 2")
     @ApiParam(value = "是否已删除",example = "2")
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -1331,7 +1331,8 @@ public class CommonEnumUtil {
         //        ELEMENT(700, "DICT_SELECT", "元素"),
         DICTIONARY(800, "DICT_SELECT", "字典"),
         CASCADE(900, "CASCADE", "级联"),
-        PICK_UP(1000, "PICK_UP", "拾取");
+        PICK_UP(1000, "PICK_UP", "拾取"),
+        INTERVAL(1100, "INTERVAL", "区间",SQL_WHERE.INTERVAL);
         //FILE(400, "file", "文件"),
         //IMAGE(410, "image", "image"),
         //OFF(500, "color", "颜色"),
@@ -1440,7 +1441,8 @@ public class CommonEnumUtil {
         START_LIKE(41, " LIKE ", "前模糊"),
         END_LIKE(52, " LIKE ", "后模糊"),
         IN(50, " IN ", " in "),
-        BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),;
+        BETWEEN(60, " BETWEEN ", "(between)区间查询(逗号区分)"),
+        INTERVAL(70, ">=And=< ", "(>= =<)区间查询(逗号区分)");
 
         private int value;
         private String code;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -2351,7 +2351,8 @@ public class WmsEnumUtil {
         MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
         CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"),
-        INITIALIZE_SN("INITIALIZE_SN", "库存初始化");
+        INITIALIZE_SN("INITIALIZE_SN", "库存初始化"),
+        IMPORT_DATA_MODEL_NO("IMPORT_DATA_MODEL_NO", "导入数据库文档模板单号");
 
         private String code;
         private String description;
@@ -6433,7 +6434,12 @@ public class WmsEnumUtil {
         DATE_FORMAT(4, "Date", "日期格式"),
         FLOAT_FORMAT(5, "Float", "浮点格式"),
         BOOL_FORMAT(6, "Boolean", "布尔格式"),
-        LONG_FORMAT(7, "LONG", "长整数格式");
+        LONG_FORMAT(7, "LONG", "长整数格式"),
+        BYTE_FORMAT(8, "Byte", "字节格式"),
+        BIGDECIMAL_FORMAT(9, "Bigdecimal", "BigDecimal格式"),
+        BLOB_FORMAT(10, "Blob", "BLOB格式"),
+        CLOB_FORMAT(11, "Clob", "CLOB格式"),
+        TIMESTAMP_FORMAT(12, "Timestamp", "时间戳格式")
 
         private int value;
         private String code;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java

@@ -45,4 +45,7 @@ public class BasBeanFieldInfoModel implements Serializable {
 
     @ApiParam(value = "自增")
     private String isFieldGeneric;
+
+    @ApiParam(value = "数据表描述")
+    private String tableDesc;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java

@@ -34,4 +34,7 @@ public class BasBeanInfoModel implements Serializable {
 
     @ApiParam(value = "字段列表数据")
     private List<BasBeanFieldInfoModel> fieldInfoModelList;
+
+    @ApiParam(value = "表名列表数据")
+    private List<BasBeanInfoModel> basBeanInfoModelList;
 }