diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index db6edcf..e126301 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1796,58 +1796,58 @@ public class MesEnumUtil { * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_INSERT_EXCEL { - - MES_PLAN_ORDER(10, "planOrderExcelImportService", "生产计划"), - MES_EQUIPMENT(20, "equipmentExcelImportService", "设备台账，支持编辑"), - MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelImportService", "设备作业要求，支持编辑"), - MES_CUST_ORDER(40, "custOrderExcelImportService", "客户订单"), - MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelImportService", "PCN同步配置"), - MES_PART(60, "partExcelImportService", "物料表，支持编辑"), - MES_PRODUCE_CATEGORY(70, "produceCategoryExcelImportService", "产品类型"), - MES_PACK_SPEC(80, "packSpecExcelImportService", "包装规格，支持编辑"), - MES_PROD_PACK(90, "prodPackExcelImportService", "产品包装关系"), - MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelImportService", "产品编码配置"), - MES_BOM(110, "bomExcelImportService", "物料清单，支持编辑"), - MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelImportService", "产品配置类型"), - MES_CUSTOMER(130, "customerExcelImportService", "客户表，支持编辑"), - MES_CUSTOMER_PART(140, "customerPartExcelImportService", "客户零件关系表，支持编辑"), - MES_WORK_CENTER(150, "workCenterExcelImportService", "生产线，支持编辑"), - MES_WORK_CELL(160, "workCellExcelImportService", "工位，支持编辑"), - MES_WC_EQUIPMENT(170, "wcEquipmentExcelImportService", "工位设备关系表"), - MES_SHIFT(180, "shiftExcelImportService", "班次，支持编辑"), - MES_SHIFT_GROUP(190, "shiftGroupExcelImportService", "班组，支持编辑"), - MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelImportService", "工作单元参数配置"), - MES_STATION_BOM(210, "stationBomExcelImportService", "工位BOM表"), - MES_DATA_OBJECT(220, "dataObjectExcelImportService", "数据对象"), - MES_OBJECT_CFG(230, "objectCfgExcelImportService", "对象结构"), - MES_WC_CHECK(240, "wcCheckExcelImportService", "开线检查，支持编辑"), - MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelImportService", "质量检测标准，支持编辑"), - MES_FAULT_CAUSE(260, "faultCauseExcelImportService", "设备故障原因，支持编辑"), - MES_FAULT_METHOD(270, "faultMethodExcelImportService", "设备故障处理措施，支持编辑"), - MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelImportService", "设备故障现象，支持编辑"), - MES_DEFECT(290, "defectExcelImportService", "缺陷，支持编辑"), - MES_DEFECT_CAUSE(300, "defectCauseExcelImportService", "缺陷原因，支持编辑"), - MES_SCRAP(310, "scrapExcelImportService", "报废原因，支持编辑"), - MES_REPAIR(320, "repairExcelImportService", "质量数据处理措施，支持编辑"), - MES_EQU_TASK_PLAN(330, "equTaskPlanExcelImportService", "设备作业周期计划，支持编辑"), - MES_PART_OJBECT(340, "partObjectExcelImportService", "物料对象"), - MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelImportService", "工序工作单元"), - MES_DATASOURCE(360, "datasourceExcelImportService", "DB地址清单"), - MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelImportService", "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelImportService", "设备通知对象"), - MES_PLC(390, "plcExcelImportService", "PLC地址清单，支持编辑"), - MES_PROCESS(400, "processExcelImportService", "工序信息"), - MES_KPSN_RULE(410, "kpsnRuleExcelImportService", "关键件条码校验规则，支持编辑"), - MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelImportService", "客户JIT生产队列"), - MES_PART_BOM_IMPORT(430, "partBomExcelImportService", "散件BOM导入"), - MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelImportService", "生产计划批量编制，支持编辑"); + public enum MES_EXCEL { + + MES_PLAN_ORDER(10, "planOrderExcelService", "生产计划"), + MES_EQUIPMENT(20, "equipmentExcelService", "设备台账，支持编辑"), + MES_EQU_TASK_STANDARD(30, "equTaskStandardExcelService", "设备作业要求，支持编辑"), + MES_CUST_ORDER(40, "custOrderExcelService", "客户订单"), + MES_PCN_SYNC_CFG(50, "pcnSyncCfgExcelService", "PCN同步配置"), + MES_PART(60, "partExcelService", "物料表，支持编辑"), + MES_PRODUCE_CATEGORY(70, "produceCategoryExcelService", "产品类型"), + MES_PACK_SPEC(80, "packSpecExcelService", "包装规格，支持编辑"), + MES_PROD_PACK(90, "prodPackExcelService", "产品包装关系"), + MES_PRODUCT_ENCODE_CFG(100, "productEncodeCfgExcelService", "产品编码配置"), + MES_BOM(110, "bomExcelService", "物料清单，支持编辑"), + MES_PROD_CFG_TYPE(120, "prodCfgTypeExcelService", "产品配置类型"), + MES_CUSTOMER(130, "customerExcelService", "客户表，支持编辑"), + MES_CUSTOMER_PART(140, "customerPartExcelService", "客户零件关系表，支持编辑"), + MES_WORK_CENTER(150, "workCenterExcelService", "生产线，支持编辑"), + MES_WORK_CELL(160, "workCellExcelService", "工位，支持编辑"), + MES_WC_EQUIPMENT(170, "wcEquipmentExcelService", "工位设备关系表"), + MES_SHIFT(180, "shiftExcelService", "班次，支持编辑"), + MES_SHIFT_GROUP(190, "shiftGroupExcelService", "班组，支持编辑"), + MES_WORK_CELL_PARAM_CFG(200, "workCellParamCfgExcelService", "工作单元参数配置"), + MES_STATION_BOM(210, "stationBomExcelService", "工位BOM表"), + MES_DATA_OBJECT(220, "dataObjectExcelService", "数据对象"), + MES_OBJECT_CFG(230, "objectCfgExcelService", "对象结构"), + MES_WC_CHECK(240, "wcCheckExcelService", "开线检查，支持编辑"), + MES_QC_CHECK_STANDARD(250, "qcCheckStandardExcelService", "质量检测标准，支持编辑"), + MES_FAULT_CAUSE(260, "faultCauseExcelService", "设备故障原因，支持编辑"), + MES_FAULT_METHOD(270, "faultMethodExcelService", "设备故障处理措施，支持编辑"), + MES_FAULT_PHENOMENON(280, "faultPhenomenonExcelService", "设备故障现象，支持编辑"), + MES_DEFECT(290, "defectExcelService", "缺陷，支持编辑"), + MES_DEFECT_CAUSE(300, "defectCauseExcelService", "缺陷原因，支持编辑"), + MES_SCRAP(310, "scrapExcelService", "报废原因，支持编辑"), + MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"), + MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"), + MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"), + MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"), + MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"), + MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"), + MES_EQU_NOTIFY_OBJECT_CFG(380, "equNotifyObjectCfgExcelService", "设备通知对象"), + MES_PLC(390, "plcExcelService", "PLC地址清单，支持编辑"), + MES_PROCESS(400, "processExcelService", "工序信息"), + MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"), + MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"), + MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"), + MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"); private int value; private String service; private String description; - MES_INSERT_EXCEL(int value, String service, String description) { + MES_EXCEL(int value, String service, String description) { this.value = value; this.service = service; this.description = description; @@ -1865,10 +1865,10 @@ public class MesEnumUtil { return description; } - public static MES_INSERT_EXCEL getByValue(int value) { - for (MES_INSERT_EXCEL mesInsertExcel : values()) { - if (mesInsertExcel.getValue() == value) { - return mesInsertExcel; + public static MES_EXCEL getByValue(int value) { + for (MES_EXCEL excel : values()) { + if (excel.getValue() == value) { + return excel; } } return null; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java index 23a5718..3a9d9e4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java @@ -19,4 +19,8 @@ public class ExportDataModel { private String exportCol; + private String title; + + private Integer module; + }