组件保存优化结构新结构适配

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 列表。
      */

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();
 
             // 更新开料中状态

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"));