From 5c841c706b244c1b1f126680bffdf25ce2fd4102 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 Jan 2020 16:16:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=907201=20=E6=94=B6=E8=B4=A7BOP?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e618c9d..e24bbf8 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 @@ -2107,7 +2107,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { PO_SN("PO_SN", "PO条码"), - VDA_SN("VDA_SN", "VDA条码"); + VDA_SN("VDA_SN", "VDA条码"), + SELF_SN("SELF_SN", "自制件条码"); private String code; private String description; From 503f3cd7a3f6c453840300930da88b7aa81e2a93 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 10 Jan 2020 16:27:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 9fc03f1..f012813 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -286,7 +286,8 @@ public class BlockReportEnumUtil { ECHARTS_PIE(10, "饼图", "实芯饼图"), ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"), ECHARTS_LINE(30, "折线图", "向右折线条图"), - ECHARTS_TREEMAP(40, "矩形图", "矩形图"); + ECHARTS_TREEMAP(40, "矩形图", "矩形图"), + SELECT_SINGLE(50, "下拉单选", "下拉单选"); private int value; private String name; From 86694d3ceb4aca9ba8f41a49d6f70d5a94e22224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Jan 2020 19:12:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index 8ffe833..e9d4ccc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -8,10 +8,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.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : WMS搜索元素表 @@ -62,4 +59,8 @@ public class WmsSearchElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + private String groupName; + + private String groupConnector; } From c2e66de6384048b95bb5aeaeed986d4d975852b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Jan 2020 19:13:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index e9d4ccc..302f426 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -60,7 +60,13 @@ public class WmsSearchElement extends BaseBean { @ApiParam(value = "用户编号") private String userCode; + /** + * 搜索组名称 + */ private String groupName; + /** + * 搜索组连接符 + */ private String groupConnector; }