From abab07f9a0bfa15c4d475521cd16d5981642ea83 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 9 Jul 2026 11:23:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A3=85=E9=85=8D=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85=E9=95=BF?=
 =?UTF-8?q?=E5=AE=BD=E5=8E=9A=E5=B1=9E=E6=80=A7=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E5=B7=B2=E6=8E=92=E8=AE=A2=E5=8D=95=E6=92=A4=E5=9B=9E=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E9=99=90=E5=88=B6=E8=BF=9B=E5=85=A5=E5=BC=80=E6=96=99?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=93=8D=E4=BD=9C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ordercomponent/vo/OrderComponentRespVO.java     |  9 +++++++++
 .../assemblylist/AssemblyListServiceImpl.java       |  3 ++-
 .../executor/service/plan/PlanServiceImpl.java      | 13 +++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java
index 707521a7b..ceb408252 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderComponentRespVO.java
@@ -25,4 +25,13 @@ public class OrderComponentRespVO {
 
     @Schema(description = "加工状态")
     private Integer processStatus;
+
+    @Schema(description = "部件宽度")
+    private Double width;
+
+    @Schema(description = "部件高度")
+    private Double height;
+
+    @Schema(description = "部件深度")
+    private Double depth;
 }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
index be0bb97ba..2e81ed169 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
@@ -155,7 +155,8 @@ public class AssemblyListServiceImpl implements AssemblyListService {
         List<OrderComponentDO> allNodesOnTopIds = orderComponentMapper.selectList(new LambdaQueryWrapperX<OrderComponentDO>()
                 .in(OrderComponentDO::getTopId, topIds)
                 .in(OrderComponentDO::getOrderId, orderIds)
-                .select(OrderComponentDO::getId, OrderComponentDO::getPid, OrderComponentDO::getName, OrderComponentDO::getProcessStatus, OrderComponentDO::getExtraProcessStatus));
+                .select(OrderComponentDO::getId, OrderComponentDO::getPid, OrderComponentDO::getName, OrderComponentDO::getProcessStatus,
+                        OrderComponentDO::getExtraProcessStatus, OrderComponentDO::getWidth, OrderComponentDO::getHeight, OrderComponentDO::getDepth));
 
         // 遍历处理状态
         for (OrderComponentDO orderComponent : allNodesOnTopIds) {
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
index f8a58147f..1ac3a24d7 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
@@ -218,11 +218,12 @@ public class PlanServiceImpl implements PlanService {
         if (planId != null) {
 
             PlanDO planDO = validatePlan(planId);
+            Integer planDOStatus = planDO.getStatus();
 
             Long currProcessId = updateReqVO.getProcessId();
             if (currProcessId != null) {
 
-                if (planDO.getStatus().equals(PlanStatusEnum.OPENING.getStatus()) || planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus())) {
+                if (planDOStatus.equals(PlanStatusEnum.OPENING.getStatus()) || planDOStatus.equals(PlanStatusEnum.OPENED.getStatus())) {
                     throw new ServiceException(PLAN_PLATE_IS_CUT);
                 }
                 // 如果方案组id发生改变需要记录前序的
@@ -237,8 +238,16 @@ public class PlanServiceImpl implements PlanService {
                 planMapper.updateById(planDO);
 
             } else {
+                // true投入生产、false撤回生产
+                Boolean isScheduled = updateReqVO.getIsScheduled();
+                // 任何开料状态都不允许撤回了
+                if (isScheduled != null
+                        && Boolean.FALSE.equals(isScheduled)
+                        && PlanStatusEnum.OPENING.getStatus().equals(planDOStatus) || PlanStatusEnum.OPENED.getStatus().equals(planDOStatus)) {
+                    throw new ServiceException(PLAN_PLATE_IS_CUT);
+                }
 
-                planDO.setIsScheduled(updateReqVO.getIsScheduled());
+                planDO.setIsScheduled(isScheduled);
                 planMapper.updateById(planDO);
             }