【3484 20063-待处理报工基础数据-20210610】

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

@@ -2101,7 +2101,9 @@ public class MesEnumUtil {
         MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"),
         MES_JISA(640, "jisaExcelService", "JISA导入"),
         MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"),
-        MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入");
+        MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"),
+        MES_PENDING_REPORT_TYPE(670, "PendingReportTypeExcelService", "待处理报工类型导入"),
+        MES_FAILURE_MODE_PARTS(680, "FailureModePartsExcelService", "失效模式零件导入");
 
         private int value;
         private String service;
@@ -8432,4 +8434,37 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PENDING_REPORT_TYPE {
+
+        IDENTIFICATION_TYPE(10, "鉴定类型"),
+        FAILURE_MODE(20, "失效模式");
+
+        private int value;
+        private String description;
+
+        PENDING_REPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(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 int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -0,0 +1,54 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FAILURE_MODE_PARTS")
+@Api("MES_失效模式零件")
+public class MesFailureModeParts extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5274274774653791153L;
+
+    @Column(name = "PATTERN_CODE")
+    @ApiParam("模式代码")
+    private String patternCode;
+
+    @Column(name = "PATTERN_NAME")
+    @ApiParam("模式代码名称")
+    private String patternName;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("上限值")
+    private Double maximum = 0d;
+}

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

@@ -0,0 +1,44 @@
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PENDING_REPORT_TYPE")
+@Api("MES_待处理报工类型")
+public class MesPendingReportType extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -5274274774653791153L;
+
+    @Column(name = "PATTERN_CODE")
+    @ApiParam("模式代码")
+    private String patternCode;
+
+    @Column(name = "PATTERN_NAME")
+    @ApiParam("模式代码名称")
+    private String patternName;
+
+    @Column(name = "REPORT_TYPE")
+    @ApiParam("类型")
+    private Integer reportType;
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesFailureModeParts;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Repository
+public interface MesFailureModePartsRepository extends BaseRepository<MesFailureModeParts, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPendingReportType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: dominic
+ * @Date: 2020/12/03 20:29
+ * @Modify:
+ */
+@Repository
+public interface MesPendingReportTypeRepository extends BaseRepository<MesPendingReportType, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3825,4 +3825,21 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getMesPendingReportType(MesPendingReportType mesPendingReportType) {
+        DdlPackBean packBean = getAllBaseData(mesPendingReportType.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternCode(), "patternCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternName(), "patternName", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPendingReportType.getReportType(), "reportType", packBean);
+        DdlPreparedPack.getNumEqualPack(mesPendingReportType.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesFailureModeParts(MesFailureModeParts mesFailureModeParts) {
+        DdlPackBean packBean = getAllBaseData(mesFailureModeParts.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPatternCode(), "patternCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(mesFailureModeParts.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }