From a92090a3ab9f4a032099b06b39d8f4544debb274 Mon Sep 17 00:00:00 2001
From: e-jiawentao1 <ejiawentao1@geely.com>
Date: Tue, 7 Jan 2020 18:11:40 +0800
Subject: [PATCH] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95=E5=90=84=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/bean/dynamic/WmsSearchElementFunction.java |  4 +-
 .../pojo/wms/modelbean/WmsListElementModel.java    | 55 ++++++++++++++++++++++
 .../pojo/wms/modelbean/WmsSearchElementModel.java  | 48 +++++++++++++++++++
 3 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
index 4e0a3fd..81bf452 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java
@@ -49,7 +49,7 @@ public class WmsSearchElementFunction extends BaseBean {
     @ApiParam(value = "用户编号")
     private String userCode;
 
-    @Column(name = "IS_SHAER")
+    @Column(name = "IS_SHARE")
     @ApiParam(value = "是否共享")
-    private Integer isShaer;
+    private Integer isShare;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java
new file mode 100644
index 0000000..1c2eb95
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java
@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WMS列表菜单model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+@Api("WMS列表菜单model")
+public class WmsListElementModel extends BaseBean {
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("标题名称")
+    private String titleName;
+
+    @ApiParam("序列号:字段标题排序使用默认0（不排序）")
+    private Integer seq;
+
+    @ApiParam(value = "是否必选:默认1-必选，2-非必选")
+    private Integer isRequire;
+
+    @ApiParam(value = "宽度")
+    private Double width;
+
+    @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序")
+    private Integer sort;
+
+    @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
+    private Integer isWider;
+
+    @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
+    private Integer isSelect;
+
+    @ApiParam(value = "表单字段默认值")
+    private String defaultValue;
+
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @ApiParam(value = "是否默认配置")
+    private Integer isDefault;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java
new file mode 100644
index 0000000..b9a1224
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WMS列表搜索model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+@Api("WMS列表搜索model")
+public class WmsSearchElementModel extends BaseBean {
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("标题名称")
+    private String titleName;
+
+    @ApiParam(value = "条件表达式:>,<,>=等")
+    private String conditionExpre;
+
+    @ApiParam(value = "检索值")
+    private String value;
+
+    @ApiParam(value = "条件连接符:and/or")
+    private String conditionConnector;
+
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @ApiParam(value = "组名称")
+    private String groupName;
+
+    @ApiParam(value = "组条件连接符")
+    private String groupConnector;
+
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @ApiParam(value = "是否共享")
+    private Integer isShare;
+}