订单详情板件、配件、cadinfo支持多加工组组合查询

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<Long> bodyIds;
 
     @Schema(description = "加工组编号", example = "1024")
-    private Long groupId;
+    private Set<Long> groupIds;
 
     @Schema(description = "部件编号", example = "1024")
     private Long componentId;

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<OrderItemDO> {
      * @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<OrderItemDO> {
     IPage<OrdersViewPlatesPageDO> selectOrdersViewPlatesPage(@Param("page") IPage<OrdersViewPlatesPageDO> page,
                                                              @Param("orderIds") List<Long> orderIds,
                                                              @Param("bodyIds") Set<Long> bodyIds,
-                                                             @Param("groupId") Long groupId,
+                                                             @Param("groupIds") Set<Long> groupId,
                                                              @Param("componentIds") Set<Long> 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<OrderItemDO> {
     IPage<OrdersViewPartsPageDO> selectOrdersViewPartsPage(@Param("page") IPage<OrdersViewPartsPageDO> page,
                                                            @Param("orderIds") List<Long> orderId,
                                                            @Param("bodyIds") Set<Long> bodyIds,
-                                                           @Param("groupId") Long groupId,
+                                                           @Param("groupIds") Set<Long> groupIds,
                                                            @Param("componentIds") Set<Long> componentIds,
                                                            @Param("name") String name,
                                                            @Param("cadView") boolean cadView);

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<OrdersViewPlatesPageDO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         IPage<OrdersViewPlatesPageDO> pageRes = orderItemMapper.selectOrdersViewPlatesPage(page, List.of(pageReqVO.getOrderId()),
-                bodyIds, pageReqVO.getGroupId(), null, false);
+                bodyIds, pageReqVO.getGroupIds(), null, false);
 
         List<OrdersViewPlatesPageDO> records = pageRes.getRecords();
         // cad图纸id赋到每块板上
@@ -861,7 +861,7 @@ public class PlateServiceImpl implements PlateService {
 
         PageDTO<OrdersViewPartsPageDO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         IPage<OrdersViewPartsPageDO> pageRes = orderItemMapper.selectOrdersViewPartsPage(page, List.of(pageReqVO.getOrderId()),
-                bodyIds, pageReqVO.getGroupId(), null, pageReqVO.getName(), false);
+                bodyIds, pageReqVO.getGroupIds(), null, pageReqVO.getName(), false);
 
         List<OrdersViewPartsPageDO> records = pageRes.getRecords();
         // cad图纸id赋到每个配件上
@@ -896,7 +896,7 @@ public class PlateServiceImpl implements PlateService {
 
         // 查询所有板件的视图所需信息
         PageDTO<OrdersViewPlatesPageDO> page1 = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE);
-        IPage<OrdersViewPlatesPageDO> viewPlatesPage = orderItemMapper.selectOrdersViewPlatesPage(page1, List.of(orderId), bodyIds, reqVO.getGroupId(), null, true);
+        IPage<OrdersViewPlatesPageDO> viewPlatesPage = orderItemMapper.selectOrdersViewPlatesPage(page1, List.of(orderId), bodyIds, reqVO.getGroupIds(), null, true);
 
         List<OrdersViewPlatesPageDO> plateRecords = viewPlatesPage.getRecords();
 
@@ -907,7 +907,7 @@ public class PlateServiceImpl implements PlateService {
 
         // 查询所有配件的视图所需信息
         PageDTO<OrdersViewPartsPageDO> page2 = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE);
-        IPage<OrdersViewPartsPageDO> viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page2, List.of(orderId), bodyIds, reqVO.getGroupId(), null, null, true);
+        IPage<OrdersViewPartsPageDO> viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page2, List.of(orderId), bodyIds, reqVO.getGroupIds(), null, null, true);
 
         List<OrdersViewPartsPageDO> partRecords = viewPartsPage.getRecords();
 
@@ -946,7 +946,7 @@ public class PlateServiceImpl implements PlateService {
 
         // 查询所有配件的视图所需信息
         PageDTO<OrdersViewPartsPageDO> page = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE);
-        IPage<OrdersViewPartsPageDO> viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page, List.of(orderId), bodyIds, reqVO.getGroupId(), null, reqVO.getName(), true);
+        IPage<OrdersViewPartsPageDO> viewPartsPage = orderItemMapper.selectOrdersViewPartsPage(page, List.of(orderId), bodyIds, reqVO.getGroupIds(), null, reqVO.getName(), true);
 
         List<OrdersViewPartsPageDO> partRecords = viewPartsPage.getRecords();
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml

@@ -577,8 +577,11 @@
                 #{bodyId}
             </foreach>
         </if>
-        <if test="groupId != null">
-            AND group_id = #{groupId}
+        <if test="groupIds != null and groupIds.size() > 0">
+            AND group_id IN
+            <foreach item="groupId" collection="groupIds" open="(" separator="," close=")">
+                #{groupId}
+            </foreach>
         </if>
         <if test="orderIds != null and orderIds.size() > 0">
             AND order_id IN
@@ -643,8 +646,11 @@
                 #{bodyId}
             </foreach>
         </if>
-        <if test="groupId != null">
-            AND group_id = #{groupId}
+        <if test="groupIds != null and groupIds.size() > 0">
+            AND group_id IN
+            <foreach item="groupId" collection="groupIds" open="(" separator="," close=")">
+                #{groupId}
+            </foreach>
         </if>
         <if test="componentIds != null and componentIds.size() > 0">
             AND comp_id IN