From e514479f0062b6fb942190d38f07ef59659189f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 4 Jun 2019 11:26:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 4 ++-- .../i3plus/pojo/form/bean/BfElementPropertyVirtual.java | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index f68a09e..1f1a66f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -16,8 +16,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TABLE_TYPE { - TABLE(1, "table", "表"), - VIEW(2, "view", "视图"); + TABLE(1, "TABLE", "表"), + VIEW(2, "*", "视图"); private int value; private String code; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 4e27e99..01c97de 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -49,9 +46,14 @@ public class BfElementPropertyVirtual extends BaseBean { private String propertyCode; @Column(name="PROPERTY_NAME") - @ApiParam(value ="虚拟属性名称") + @ApiParam(value ="显示名称") private String propertyName; + @Lob + @Column(name="PROPERTY_CODES") + @ApiParam(value ="属性代码") + private String propertyCodes; + @Column(name="PROPERTY_TYPE") @ApiParam(value ="属性类型") private Integer propertyType; From 8ea762e5df4125b7dba80565ceab21e648f8d73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 4 Jun 2019 11:26:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 1f1a66f..fa9043b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -17,7 +17,7 @@ public class BlockFormEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TABLE_TYPE { TABLE(1, "TABLE", "表"), - VIEW(2, "*", "视图"); + VIEW(2, "VIEW", "视图"); private int value; private String code; From 65beb8549f54aa62faaa139f5373c2ec56ce055e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 4 Jun 2019 13:58:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?wms=E5=AD=98=E5=82=A8=E5=8C=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=20=20=E6=98=AF=E5=90=A6=E5=AD=90?= =?UTF-8?q?=E8=8A=82=E7=82=B9IS=5FSON=5FNODE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 55e0b3f..c8980af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -45,9 +45,13 @@ public class WmsZones extends BaseBean { private String zoneName; @Column(name = "PARENT_ZONE_NO") - @ApiParam(value = "上层存储区") + @ApiParam(value = "父级存储区") private String parentZoneNo; + @Column(name = "IS_SON_NODE") + @ApiParam(value = "是否子节点") + private String isSonNode; + @Column(name = "IS_PM") @ApiParam(value = "零件级管控" , example = "2") private Integer isPm;