From ef81357ed08b914eae99aba9dbdae2b7487a3a97 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 4 Jul 2025 16:44:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20mes=E7=8F=AD=E6=AC=A1=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=8A=A0=E7=8F=AD=E5=88=B6=EF=BC=88?=
 =?UTF-8?q?=E4=B8=A4=E7=8F=AD=E3=80=81=E4=B8=89=E7=8F=AD=EF=BC=89=E3=80=81?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E4=BF=A1=E6=81=AF=E9=80=89=E7=8F=AD=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/mes/domain/BaseShiftInfo.java    | 5 +++++
 .../java/org/dromara/mes/domain/ProdBaseMachineInfo.java   | 6 ++++++
 .../java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java    | 6 +++++-
 .../org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java   | 6 ++++++
 .../java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java    | 7 ++++++-
 .../org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java   | 7 +++++++
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java
index 2cdb4ef..6b94791 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseShiftInfo.java
@@ -67,6 +67,11 @@ public class BaseShiftInfo extends TenantEntity {
      */
     private String activeFlag;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    private String classType;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java
index 49f9a1b..d3b9f02 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdBaseMachineInfo.java
@@ -122,6 +122,11 @@ public class ProdBaseMachineInfo extends TenantEntity {
      */
     private Long requestInterval;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    private String classType;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */
@@ -144,4 +149,5 @@ public class ProdBaseMachineInfo extends TenantEntity {
      */
     @TableField(exist = false)
     private String deviceModeName;
+
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java
index 444b1be..e4caa92 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/BaseShiftInfoBo.java
@@ -74,5 +74,9 @@ public class BaseShiftInfoBo extends BaseEntity {
 /*    @NotBlank(message = "激活标识（1是 0否）不能为空", groups = { AddGroup.class, EditGroup.class })*/
     private String activeFlag;
 
-
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @NotBlank(message = "班制类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String classType;
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java
index bc7c754..ab7d7c4 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdBaseMachineInfoBo.java
@@ -145,5 +145,11 @@ public class ProdBaseMachineInfoBo extends BaseEntity {
      */
     private String instockType;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @NotBlank(message = "班制类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String classType;
+
     private List<ProdBaseMachineProcess> baseMachineProcessList;
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java
index cbd0953..9469adc 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseShiftInfoVo.java
@@ -122,5 +122,10 @@ public class BaseShiftInfoVo implements Serializable {
     @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
-
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @ExcelProperty(value = "班制类型(2两班 3三班)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_class_type")
+    private String classType;
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java
index bdbaae8..4283aec 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdBaseMachineInfoVo.java
@@ -197,6 +197,13 @@ public class ProdBaseMachineInfoVo implements Serializable {
     @ExcelProperty(value = "设备模型名称")
     private String deviceModeName;
 
+    /**
+     * 班制类型(2两班 3三班)
+     */
+    @ExcelProperty(value = "班制类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "mes_class_type")
+    private String classType;
+
     /**
      * 入库类型（1直接入库 2扫描入库）
      */