From e9191e8fb2599f2b34c842a2132f17f6ff1333a8 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 29 Jun 2026 11:33:49 +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?=E9=83=A8=E4=BB=B6=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 | 3 +++ .../executor/dal/dataobject/plate/PlateDetailDO.java | 5 +++++ .../service/optimizeplan/OptimizePlanServiceImpl.java | 3 --- .../module/executor/service/plate/PlateServiceImpl.java | 7 +------ .../main/resources/mapper/planitem/PlanItemMapper.xml | 9 ++++++--- .../src/main/resources/mapper/plate/PlateMapper.xml | 9 ++++++--- 6 files changed, 21 insertions(+), 15 deletions(-) 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 33b36fb0e..290fc4aed 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 @@ -228,6 +228,9 @@ public class PlateDetailRespVO { @Schema(description = "部件名称") private String componentName; + @Schema(description = "部件ID") + private Long componentId; + @Schema(description = "是否双面造型") private Boolean doubleSideModel; 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 041dbe7b7..309718e21 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 @@ -278,6 +278,11 @@ public class PlateDetailDO { */ private String componentName; + /** + * 部件ID + */ + private Long componentId; + /** * 开门类型，0 无 1 左 2 右 3 上 4 下 */ 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 9f60e821c..cca860054 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 @@ -331,9 +331,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List orderIds = JSON.parseArray(orderNos).toJavaList(Long.class).stream().distinct().toList(); - - List ids = goodsDOS.stream().map(GoodsReqVO::getId).toList(); - // 查询排单对应的小板信息 List plateDetailRespVOS = planItemMapper.selectPlanPlateDetailList(planId, orderIds, getUserOrganId()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index e46cd270a..c78f88c89 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -400,12 +400,7 @@ public class PlateServiceImpl implements PlateService { .plateModels(models) .build(); } - - /** - * 合并加工组名称 - * - * @param list - */ + /** * 合并加工组、部件名称 * 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 0d2a719ca..b974b2f7f 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 @@ -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 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 339b38fd1..c04dcd650 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 @@ -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