From 6457cac82808599492b75f11d770bdf4675005f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 4 Sep 2020 10:44:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=8E=BB=E9=99=A4=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index a517b70..518f691 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/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) //逻辑删除，软删除 From 332e37ea941ddcd24604cd9097612394dc68b9cd Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 4 Sep 2020 18:27:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=902719=2006=201.1.10=09=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=96=B0=E5=A2=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 10 ++++++++-- .../cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java | 3 +++ .../java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java | 3 +++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 6b4590a..b89b62b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/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; @@ -6376,7 +6377,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; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java index df22498..fee7d8f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java +++ b/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; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java index 63e108f..016a446 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java +++ b/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 fieldInfoModelList; + + @ApiParam(value = "表名列表数据") + private List basBeanInfoModelList; } From 1ccd4f3b65228becc1a6b4e648d37b259fbc51f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 5 Sep 2020 18:47:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=8C=BA=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b53822b..64cd8a5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/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;