Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -83,6 +83,72 @@ public class MesEnumUtil {
     }
 
     /**
+     *  排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
      * JIS发运是否按主队列顺序扫描
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -0,0 +1,58 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-03-12 7:45 下午
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = {
+		@Index(columnList = "CREATE_DATE_TIME")
+})
+@Api("工作单元组件参数配置")
+public class MesWorkCellModuleParam extends BaseBean implements Serializable {
+	@Column(name = "WORK_CENTER_CODE")
+	@ApiParam("工作中心代码")
+	private String  workCenterCode;
+
+	@Column(name = "WORK_CELL_CODE")
+	@ApiParam("工作单元代码")
+	private String workCellCode;
+
+	@Column(name = "MODULE_CODE")
+	@ApiParam("组件代码")
+	private String moduleCode;
+
+	@Column(name = "CALL_CLASS")
+	@ApiParam("调用类")
+	private String callClass;
+
+	@Column(name = "PARAM_CODE")
+	@ApiParam("参数代码")
+	private String paramCode;
+
+	@Column(name = "PARAM_VALUE")
+	@ApiParam("参数值")
+	private String paramValue;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.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.MesWorkCellModuleParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description: 工作单元组件参数配置
+ * @Reference:
+ * @Author: qianhuasheng
+ * @CreateDate:2019-04-17-17:11
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellModuleParamRepository extends BaseRepository<MesWorkCellModuleParam, Long> {
+}