From ce019e6929ad2ba9723fdda044771db060b5fbff Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 7 Apr 2025 11:15:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20mes=E7=94=9F=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=B7=BB=E5=8A=A0=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dromara/mes/domain/ProdPlanInfo.java    | 2 +-
 .../main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java   | 4 ++--
 .../main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java
index d5235e9..3466b65 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdPlanInfo.java
@@ -145,7 +145,7 @@ public class ProdPlanInfo extends TenantEntity {
     private String attachId;
 
     /**
-     * 工单计划状态（0未下发 1已下发 2已开始 3已完成）
+     * 工单计划状态（0未下发 1已下发 2已开始 3已完成 4已撤回）
      */
     private String planStatus;
 
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java
index d62b7b3..646c940 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdPlanInfoBo.java
@@ -64,12 +64,12 @@ public class ProdPlanInfoBo extends BaseEntity {
     /**
      * 物料BOM_ID
      */
-    @NotNull(message = "物料BOM不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long materialBomId;
 
     /**
      * 物料bom版本
      */
+    @NotNull(message = "物料BOM版本不能为空", groups = { AddGroup.class, EditGroup.class })
     private String materialBomVersion;
 
 
@@ -151,7 +151,7 @@ public class ProdPlanInfoBo extends BaseEntity {
     private String attachId;
 
     /**
-     * 工单计划状态（0未下发 1已下发 2已开始 3已完成）
+     * 工单计划状态（0未下发 1已下发 2已开始 3已完成 4已撤回）
      */
     private String planStatus;
 
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java
index 15e501f..597a1bb 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdPlanInfoVo.java
@@ -178,7 +178,7 @@ public class ProdPlanInfoVo implements Serializable {
     private String attachId;
 
     /**
-     * 工单计划状态（0未下发 1已下发 2已开始 3已完成）
+     * 工单计划状态（0未下发 1已下发 2已开始 3已完成 4已撤回）
      */
     @ExcelProperty(value = "工单计划状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "mes_plan_status")