I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

Browse Source
yun-zuoyi
王杰 5 years ago committed by nancy.li
parent d29a26c73f 2b01efb15b
commit 3660418497
2 changed files with 85 additions and 45 deletions
Show Stats Download Patch File Download Diff File

106
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -1798,55 +1798,58 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_INSERT_EXCEL {
MES_PLAN_ORDER(10, "生产计划"),
MES_EQUIPMENT(20, "设备台账"),
MES_EQU_TASK_STANDARD(30, "设备作业要求"),
MES_CUST_ORDER(40, "客户订单"),
MES_PCN_SYNC_CFG(50, "PCN同步配置"),
MES_PART(60, "物料表"),
MES_PRODUCE_CATEGORY(70, "产品类型"),
MES_PACK_SPEC(80, "包装规格"),
MES_PROD_PACK(90, "产品包装关系"),
MES_PRODUCT_ENCODE_CFG(100, "产品编码配置"),
MES_BOM(110, "物料清单"),
MES_PROD_CFG_TYPE(120, "产品配置类型"),
MES_CUSTOMER(130, "客户表"),
MES_CUSTOMER_PART(140, "客户零件关系表"),
MES_WORK_CENTER(150, "生产线"),
MES_WORK_CELL(160, "工位"),
MES_WC_EQUIPMENT(170, "工位设备关系表"),
MES_SHIFT(180, "班次"),
MES_SHIFT_GROUP(190, "班组"),
MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"),
MES_STATION_BOM(210, "工位BOM表"),
MES_DATA_OBJECT(220, "数据对象"),
MES_OBJECT_CFG(230, "对象结构"),
MES_WC_CHECK(240, "开线检查"),
MES_QC_CHECK_STANDARD(250, "质量检测标准"),
MES_FAULT_CAUSE(260, "设备故障原因"),
MES_FAULT_METHOD(270, "设备故障处理措施"),
MES_FAULT_PHENOMENON(280, "设备故障现象"),
MES_DEFECT(290, "缺陷"),
MES_DEFECT_CAUSE(300, "缺陷原因"),
MES_SCRAP(310, "报废原因"),
MES_REPAIR(320, "质量数据处理措施"),
MES_EQU_TASK_PLAN(330, "设备作业周期计划"),
MES_PART_OJBECT(340, "物料对象"),
MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
MES_DATASOURCE(360, "DB地址清单"),
MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
MES_PLC(390, "PLC地址清单"),
MES_PROCESS(400, "工序信息"),
MES_KPSN_RULE(410, "关键件条码校验规则"),
MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"),
MES_PART_BOM_IMPORT(430, "散件BOM导入");
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", "生产计划批量编制");
private int value;
private String service;
private String description;
MES_INSERT_EXCEL(int value, String description) {
MES_INSERT_EXCEL(int value, String service, String description) {
this.value = value;
this.service = service;
this.description = description;
}
@ -1854,6 +1857,10 @@ public class MesEnumUtil {
return value;
}
public String getService() {
return service;
}
public String getDescription() {
return description;
}
@ -1867,7 +1874,6 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1878,6 +1884,16 @@ public class MesEnumUtil {
return tmp;
}
public static String valueOfService(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].service;
}
}
return tmp;
}
}
/**

24
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
Unescape Escape View File

@ -153,6 +153,26 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@Column(name = "RESERVED2")
@ApiParam("预留字段2")
private String reserved2;
@Column(name = "RESERVED3")
@ApiParam("预留字段13")
private String reserved3;
@Column(name = "RESERVED4")
@ApiParam("预留字段14")
private String reserved4;
@Column(name = "RESERVED5")
@ApiParam("预留字段5")
private String reserved5;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
@ -248,6 +268,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("工单状态描述")
private String workOrderStatusDesc;
@Transient
@ApiParam("计划类型")
private Integer planType;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

Write Preview
Loading…
Cancel
Save