diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java index 1f7aa51a..788cca24 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialInfoVo.java @@ -373,7 +373,7 @@ public class BaseMaterialInfoVo implements Serializable { * 所属工厂 */ @ExcelProperty(value = "所属工厂") - private String factoryName; + private String factoryName;//映射字段 /** * 物料类型名称 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java index f9fe420a..bcd97d3f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java @@ -131,7 +131,7 @@ public class BaseMaterialTypeVo implements Serializable { * 工序名称 */ @ExcelProperty(value = "工序名称") - private String processName; + private String processName;//工序名称 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java index d8bc63da..3d0b6db3 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseProcessInfoVo.java @@ -1,5 +1,6 @@ package org.dromara.mes.domain.vo; +import com.alibaba.excel.annotation.ExcelIgnore; import com.baomidou.mybatisplus.annotation.TableField; import org.dromara.mes.domain.ProdBaseProcessInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; @@ -121,14 +122,14 @@ public class ProdBaseProcessInfoVo implements Serializable { /** * 工序关联产线信息 */ - + @ExcelIgnore private List prodBaseProcessProdlineVoList;//工序关联产线信息,映射字段 /** 工序关联人员信息 */ - + @ExcelIgnore private List prodBaseProcessUserVoList;//工序关联人员信息,映射字段 - + @ExcelIgnore private String processPercentageVo;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java index ef4c4a5a..d3a99b24 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteProcessVo.java @@ -59,4 +59,19 @@ public class ProdBaseRouteProcessVo implements Serializable { private String remark; + + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName; + + /** + * 工序类别(1生产工序 2质检工序) + */ + @ExcelProperty(value = "工序类别", converter = ExcelDictConvert.class) + private String processType; + + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java index 3a3378d2..b8ed28b3 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseRouteVo.java @@ -1,5 +1,6 @@ package org.dromara.mes.domain.vo; +import com.alibaba.excel.annotation.ExcelIgnore; import org.dromara.mes.domain.ProdBaseRoute; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -95,6 +96,10 @@ public class ProdBaseRouteVo implements Serializable { @ExcelProperty(value = "更新时间") private Date updateTime; + /** + * 工艺路线 + */ + @ExcelIgnore private List routeProcessVoList;