Merge remote-tracking branch 'origin/dev' into test

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

@@ -69,11 +69,11 @@ public class MesPart extends BaseBean {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name="PRODUCE_CATEGORY")
-    @ApiParam("产品类型")
-    private String  produceCategory;
+    @Column(name="PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String  produceCategoryCode;
 
     @Transient
-    @ApiParam("分类名称")
-    private String categoryName;
+    @ApiParam("产品类型名称")
+    private String produceCategoryName;
 }

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-26-10:25
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_CATEGORY")
+@Api("系统业务动作")
+public class MesProduceCategory extends BaseBean {
+
+    @Column(name="PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
+
+    @Column(name="PRODUCE_CTGY_NAME")
+    @ApiParam("产品类型名称")
+    private String  produceCategoryName;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceCategory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-26-10:28
+ * @Modify:
+ **/
+@Repository
+public interface MesProduceCategoryRepository extends BaseRepository<MesProduceCategory, Long> {
+}