From 73ea0fdfbf5233d235246e47f974ee943bdd25cc Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 13 Aug 2026 15:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BB=93=E6=9E=84=E6=96=B0=E7=BB=93=E6=9E=84=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/plan/component/BoardLayoutResultSummary.java       | 5 -----
 .../service/optimizeplan/OptimizePlanServiceImpl.java        | 2 +-
 .../OptimizePlanServiceImplComponentResultTest.java          | 5 ++---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java
index 4fbf8a887..b2fc9fc4c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/component/BoardLayoutResultSummary.java
@@ -104,11 +104,6 @@ public class BoardLayoutResultSummary {
      */
     private List<String> startCutBlockIds;
 
-    /**
-     * 开始开料的自定义板件编号列表，对应 MES 的板件短号。
-     */
-    private List<String> customStartCutBlockNos;
-
     /**
      * 结束开料的组件内部板件 ID 列表。
      */
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
index 915bd3cfe..9d0df3bfc 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
@@ -1612,7 +1612,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
                 throw new ServiceException(PLAN_PLATE_IS_CUT);
             }
             List<String> optimizatePlateNoList = layoutResultSummary.stream()
-                    .flatMap(summary -> summary.getCustomStartCutBlockNos().stream())
+                    .flatMap(summary -> summary.getCustomBlockNos().stream())
                     .toList();
 
             // 更新开料中状态
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/test/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImplComponentResultTest.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/test/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImplComponentResultTest.java
index 55606bfad..9dd42e8bc 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/test/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImplComponentResultTest.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/test/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImplComponentResultTest.java
@@ -72,7 +72,7 @@ class OptimizePlanServiceImplComponentResultTest {
     }
 
     @Test
-    void shouldUseCustomStartCutBlockNosWhenStartingCut() {
+    void shouldUseCustomBlockNosWhenStartingCut() {
         Long planId = 1002L;
         when(planMapper.selectById(planId)).thenReturn(plan(planId));
         when(orderMapper.selectByIds(List.of(2001L))).thenReturn(List.of(new OrderDO()));
@@ -81,7 +81,7 @@ class OptimizePlanServiceImplComponentResultTest {
                 request(planId, FlowProcessStatus.IN_PROGRESS.getStatus()));
 
         verify(plateMapper).updatePlanPlateCuttingStatus(
-                planId, List.of(2001L), List.of("custom-start-cut-block-1"));
+                planId, List.of(2001L), List.of("custom-block-1"));
     }
 
     @Test
@@ -114,7 +114,6 @@ class OptimizePlanServiceImplComponentResultTest {
         summary.setPlacedBlockIds(List.of("component-block-id"));
         summary.setCustomBlockNos(List.of("custom-block-1"));
         summary.setStartCutBlockIds(List.of("component-start-cut-block-id"));
-        summary.setCustomStartCutBlockNos(List.of("custom-start-cut-block-1"));
         summary.setEndCutBlockIds(List.of("component-end-cut-block-id"));
         summary.setCustomEndCutBlockNos(List.of("custom-end-cut-block-1"));