From 4fb19a6bf6df198e19a9660ebafaf20b70803d0d Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 19 Mar 2026 11:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=9D=BF?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E9=85=8D=E4=BB=B6=E3=80=81cadinfo=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E5=8A=A0=E5=B7=A5=E7=BB=84=E7=BB=84=E5=90=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/vo/order/OrderCadViewPlatePageReqVO.java | 2 +- .../dal/mysql/orderItem/OrderItemMapper.java | 10 +++++----- .../executor/service/plate/PlateServiceImpl.java | 10 +++++----- .../resources/mapper/orderItem/OrderItemMapper.xml | 14 ++++++++++---- 4 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/order/vo/order/OrderCadViewPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java index 0eb6e0864..1d4ccd87a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java @@ -28,7 +28,7 @@ public class OrderCadViewPlatePageReqVO extends PageParam { private Set bodyIds; @Schema(description = "加工组编号", example = "1024") - private Long groupId; + private Set groupIds; @Schema(description = "部件编号", example = "1024") private Long componentId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java index 78759177d..e12ba2d28 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java @@ -194,7 +194,7 @@ public interface OrderItemMapper extends BaseMapperX { * @param page 分页参数 * @param orderIds 订单ID * @param bodyIds 柜体ID列表 - * @param groupId 加工组ID + * @param groupId 加工组ID列表 * @param componentIds 部件ID列表 * @param cadView 是否需要cad图纸内信息：cad_view_id、seal_left、seal_down、seal_right、seal_up * @return @@ -202,17 +202,17 @@ public interface OrderItemMapper extends BaseMapperX { IPage selectOrdersViewPlatesPage(@Param("page") IPage page, @Param("orderIds") List orderIds, @Param("bodyIds") Set bodyIds, - @Param("groupId") Long groupId, + @Param("groupIds") Set groupId, @Param("componentIds") Set componentIds, @Param("cadView") boolean cadView); /** - * 分页查询订单板件视图数据 + * 分页查询订单配件视图数据 * * @param page 分页参数 * @param orderId 订单ID * @param bodyIds 柜体ID列表 - * @param groupId 加工组ID + * @param groupIds 加工组ID列表 * @param componentIds 部件ID列表 * @param cadView 是否需要cad图纸内信息：cad_view_id、seal_left、seal_down、seal_right、seal_up * @return @@ -220,7 +220,7 @@ public interface OrderItemMapper extends BaseMapperX { IPage selectOrdersViewPartsPage(@Param("page") IPage page, @Param("orderIds") List orderId, @Param("bodyIds") Set bodyIds, - @Param("groupId") Long groupId, + @Param("groupIds") Set groupIds, @Param("componentIds") Set componentIds, @Param("name") String name, @Param("cadView") boolean cadView); 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 08b7e7ce2..890da32f1 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 @@ -833,7 +833,7 @@ public class PlateServiceImpl implements PlateService { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage pageRes = orderItemMapper.selectOrdersViewPlatesPage(page, List.of(pageReqVO.getOrderId()), - bodyIds, pageReqVO.getGroupId(), null, false); + bodyIds, pageReqVO.getGroupIds(), null, false); List records = pageRes.getRecords(); // cad图纸id赋到每块板上 @@ -861,7 +861,7 @@ public class PlateServiceImpl implements PlateService { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage pageRes = orderItemMapper.selectOrdersViewPartsPage(page, List.of(pageReqVO.getOrderId()), - bodyIds, pageReqVO.getGroupId(), null, pageReqVO.getName(), false); + bodyIds, pageReqVO.getGroupIds(), null, pageReqVO.getName(), false); List records = pageRes.getRecords(); // cad图纸id赋到每个配件上 @@ -896,7 +896,7 @@ public class PlateServiceImpl implements PlateService { // 查询所有板件的视图所需信息 PageDTO page1 = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE); - IPage viewPlatesPage = orderItemMapper.selectOrdersViewPlatesPage(page1, List.of(orderId), bodyIds, reqVO.getGroupId(), null, true); + IPage viewPlatesPage = orderItemMapper.selectOrdersViewPlatesPage(page1, List.of(orderId), bodyIds, reqVO.getGroupIds(), null, true); List plateRecords = viewPlatesPage.getRecords(); @@ -907,7 +907,7 @@ public class PlateServiceImpl implements PlateService { // 查询所有配件的视图所需信息 PageDTO page2 = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE); - IPage viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page2, List.of(orderId), bodyIds, reqVO.getGroupId(), null, null, true); + IPage viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page2, List.of(orderId), bodyIds, reqVO.getGroupIds(), null, null, true); List partRecords = viewPartsPage.getRecords(); @@ -946,7 +946,7 @@ public class PlateServiceImpl implements PlateService { // 查询所有配件的视图所需信息 PageDTO page = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE); - IPage viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page, List.of(orderId), bodyIds, reqVO.getGroupId(), null, reqVO.getName(), true); + IPage viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page, List.of(orderId), bodyIds, reqVO.getGroupIds(), null, reqVO.getName(), true); List partRecords = viewPartsPage.getRecords(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml index 8f85b931b..f666ff4ec 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml @@ -577,8 +577,11 @@ #{bodyId} - - AND group_id = #{groupId} + + AND group_id IN + + #{groupId} + AND order_id IN @@ -643,8 +646,11 @@ #{bodyId} - - AND group_id = #{groupId} + + AND group_id IN + + #{groupId} + AND comp_id IN