Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java

@@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description :生产数据
@@ -102,4 +99,9 @@ public class MesProductData extends BaseBean {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Lob
+    @Column(name = "TEST_DATA")
+    @ApiParam("测试json数据")
+    private String testData;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java

@@ -11,5 +11,5 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Documented
-public @interface UseMongoDb {
+public @interface ElasticSearch {
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface Json4Es {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
+import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch;
+import cn.estsh.i3plus.pojo.mes.annotation.Json4Es;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -10,11 +11,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :生产数据
@@ -34,7 +31,7 @@ import javax.persistence.Transient;
         @Index(columnList = "OBJECT_CODE"),
         @Index(columnList = "MODIFY_DATE_TIME")
 })
-//@UseMongoDb
+@ElasticSearch
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
@@ -109,6 +106,12 @@ public class MesProductData extends BaseBean {
     @ApiParam("数据组号")
     private String groupNo;
 
+    @Json4Es
+    @Column(name = "TEST_DATA")
+    @ApiParam("测试json数据")
+    private String testData;
+
+    @Lob
     @Transient
     @ApiParam("字段总数")
     private Integer fieldNum;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS字段信息表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsFieldInfoRepository extends BaseRepository<WmsFieldInfo, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS列表元素菜单关系表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsListElementFunctionRepository extends BaseRepository<WmsListElementFunction, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS列表元素表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsListElementRepository extends BaseRepository<WmsListElement, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS搜索元素菜单关系表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsSearchElementFunctionRepository extends BaseRepository<WmsSearchElementFunction, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS搜索元素表
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 11:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsSearchElementRepository extends BaseRepository<WmsSearchElement, Long> {
+}