diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMouldInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMouldInfoBo.java index 4b2ef8de..4092d5a8 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMouldInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMouldInfoBo.java @@ -37,7 +37,7 @@ public class ProdBaseMouldInfoBo extends BaseEntity { /** * 所在机台ID */ - @NotNull(message = "所在机台ID不能为空", groups = {AddGroup.class, EditGroup.class}) +/* @NotNull(message = "所在机台ID不能为空", groups = {AddGroup.class, EditGroup.class})*/ private Long machineId; /** diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/PlanMonitorVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/PlanMonitorVo.java index 1d1c92db..51350c1b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/PlanMonitorVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/PlanMonitorVo.java @@ -1,6 +1,8 @@ package org.dromara.mes.domain.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; + import java.util.List; /** @@ -11,16 +13,19 @@ public class PlanMonitorVo { /** * 机台ID */ + @ExcelProperty(value = "机台ID") private Long machineId; /** * 机台名称 */ + @ExcelProperty(value = "机台名称") private String machineName; /** * 班次分组列表 */ + @ExcelProperty(value = "班次分组列表") private List shifts; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ShiftGroupVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ShiftGroupVo.java index 25f7623b..afa4d7c8 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ShiftGroupVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ShiftGroupVo.java @@ -1,5 +1,6 @@ package org.dromara.mes.domain.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.List; @@ -12,15 +13,18 @@ public class ShiftGroupVo { /** * 班次ID */ + @ExcelProperty(value = "班次ID") private Long shiftId; /** * 班次名称 */ + @ExcelProperty(value = "班次名称") private String shiftName; /** * 该班次下的物料计划列表 */ + @ExcelProperty(value = "该班次下的物料计划列表") private List plans; }