getOrderSource获取优化数据接口补充部件信息

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateDetailRespVO.java

@@ -228,6 +228,9 @@ public class PlateDetailRespVO {
     @Schema(description = "部件名称")
     private String componentName;
 
+    @Schema(description = "部件ID")
+    private Long componentId;
+
     @Schema(description = "是否双面造型")
     private Boolean doubleSideModel;
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDetailDO.java

@@ -278,6 +278,11 @@ public class PlateDetailDO {
      */
     private String componentName;
 
+    /**
+     * 部件ID
+     */
+    private Long componentId;
+
     /**
      * 开门类型，0 无 1 左 2 右 3 上 4 下
      */

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -331,9 +331,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
         List<Long> orderIds = JSON.parseArray(orderNos).toJavaList(Long.class).stream().distinct().toList();
 
-
-        List<Long> ids = goodsDOS.stream().map(GoodsReqVO::getId).toList();
-
         // 查询排单对应的小板信息
         List<PlateDetailDO> plateDetailRespVOS = planItemMapper.selectPlanPlateDetailList(planId, orderIds, getUserOrganId());
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java

@@ -401,11 +401,6 @@ public class PlateServiceImpl implements PlateService {
                 .build();
     }
     
-    /**
-     * 合并加工组名称
-     *
-     * @param list
-     */
     /**
      * 合并加工组、部件名称
      *

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml

@@ -482,7 +482,9 @@
         oi.group_id as groupId,
         ob.name as bodyName,
         ob.room_name as roomName,
-        og.name as processGroupName
+        og.name as processGroupName,
+        oc.name as componentName,
+        oc.id as componentId
 
         FROM order_plate op
 
@@ -491,8 +493,9 @@
         AND op.order_id = ogs.order_id
         AND op.goods_id = ogs.id
         left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
-        left join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
-        left join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
+        join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
+        join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
+        join order_component oc on oc.organ_id = op.organ_id and oc.order_id = op.order_id and oc.id = oi.comp_id
 
         WHERE op.organ_id = #{organId}
         and op.order_id in

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -411,13 +411,16 @@
         oi.group_id,
         ob.name as bodyName,
         ob.room_name,
-        og.name as processGroupName
+        og.name as processGroupName,
+        oc.name as componentName,
+        oc.id as componentId
 
         from order_plate op
             join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
             left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
-            left join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
-            left join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
+            join order_body ob on ob.organ_id = op.organ_id and ob.order_id = op.order_id and ob.id = oi.body_id
+            join order_group og on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = oi.group_id
+            join order_component oc on oc.organ_id = op.organ_id and oc.order_id = op.order_id and oc.id = oi.comp_id
 
         where op.organ_id = #{organId}
           and op.deleted = false