From 13472d77c5e4480bce1164e3d6dabefad07e4986 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 19 Mar 2025 14:07:21 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20(MeterSphere100027)=E3=80=90?=
 =?UTF-8?q?=E6=A8=A1=E5=85=B7=E4=BF=A1=E6=81=AF=E3=80=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 取消机台必填项
---
 .../java/org/dromara/mes/domain/bo/ProdBaseMouldInfoBo.java  | 2 +-
 .../main/java/org/dromara/mes/domain/vo/PlanMonitorVo.java   | 5 +++++
 .../main/java/org/dromara/mes/domain/vo/ShiftGroupVo.java    | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

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<ShiftGroupVo> 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<ProdPlanInfoVo> plans;
 }