From 3e63e9636215c5b9371ddad30a374e67cbe7dc6b Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 29 Jun 2026 16:41:13 +0800
Subject: [PATCH] =?UTF-8?q?getOrderSource=E8=8E=B7=E5=8F=96=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=BB=84=E7=B1=BB=E5=9E=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/vo/PlateDetailRespVO.java       | 8 +++++++-
 .../executor/dal/dataobject/plate/PlateDetailDO.java      | 7 +++++++
 .../src/main/resources/mapper/planitem/PlanItemMapper.xml | 2 ++
 .../src/main/resources/mapper/plate/PlateMapper.xml       | 2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
index 290fc4aed..119237aed 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java
@@ -198,9 +198,15 @@ public class PlateDetailRespVO {
     @Schema(description = "加工组ID")
     private Long groupId;
 
-    @Schema(description = "加工组名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "加工组类型ID")
+    private Long groupTypeId;
+
+    @Schema(description = "加工组名称")
     private String processGroupName;
 
+    @Schema(description = "加工组类型名称")
+    private String processGroupTypeName;
+
 
     @Schema(description = "开门类型，0 无 1 左 2 右 3 上 4 下", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private Integer openDoorType;
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
index 309718e21..6570696f9 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java
@@ -268,6 +268,13 @@ public class PlateDetailDO {
      */
     private Long groupId;
 
+    private Long groupTypeId;
+
+    /**
+     * 加工组名称
+     */
+    private String processGroupTypeName;
+
     /**
      * 加工组名称
      */
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
index b974b2f7f..6fc140535 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
@@ -480,9 +480,11 @@
         oi.body_id as bodyId,
         oi.room_id as roomId,
         oi.group_id as groupId,
+        og.group_type_id as groupTypeId,
         ob.name as bodyName,
         ob.room_name as roomName,
         og.name as processGroupName,
+        og.group_type_name as processGroupTypeName,
         oc.name as componentName,
         oc.id as componentId
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index c04dcd650..a427fbc65 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -409,9 +409,11 @@
         oi.body_id,
         oi.room_id,
         oi.group_id,
+        og.group_type_id as groupTypeId,
         ob.name as bodyName,
         ob.room_name,
         og.name as processGroupName,
+        og.group_type_name as processGroupTypeName,
         oc.name as componentName,
         oc.id as componentId