cad三维看图能力相关字段修复

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

@@ -24,4 +24,7 @@ public class OrderBodyViewPlatePageReqVO extends PageParam {
 
     @Schema(description = "柜体编号", example = "1024")
     private Long bodyId;
+
+    @Schema(description = "加工组编号", example = "1024")
+    private Long groupId;
 }

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

@@ -22,6 +22,9 @@ import java.math.BigDecimal;
 @Schema(description = "管理后台 - 柜体对应的板件视图信息")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class OrderBodyViewPlatePageRespVO {
+    @Schema(description = "板件id")
+    private Long id;
+
     @Schema(description = "板件编号")
     private String plateNo;
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderItem/OrderBodyViewPlatesPageDO.java

@@ -12,6 +12,11 @@ import java.math.BigDecimal;
  */
 @Data
 public class OrderBodyViewPlatesPageDO {
+    /**
+     * 主键
+     */
+    private Long id;
+
     /**
      * 板编号
      */

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/orderItem/OrderItemMapper.java

@@ -200,6 +200,7 @@ public interface OrderItemMapper extends BaseMapperX<OrderItemDO> {
                                                               @Param("orderId") Long orderId,
                                                               @Param("roomId") Long roomId,
                                                               @Param("bodyId") Long bodyId,
+                                                              @Param("groupId") Long groupId,
                                                               @Param("organId") Long organId,
                                                               @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

@@ -848,7 +848,7 @@ public class PlateServiceImpl implements PlateService {
     @Override
     public PageResult<OrderBodyViewPlatePageRespVO> getBodyViewPlatesPage(OrderBodyViewPlatePageReqVO pageReqVO) {
         PageDTO<PlateRespVO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        IPage<OrderBodyViewPlatesPageDO> pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(), getUserOrganId(), false);
+        IPage<OrderBodyViewPlatesPageDO> pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(), pageReqVO.getGroupId(), getUserOrganId(), false);
         return new PageResult(BeanUtil.copyToList(pageRes.getRecords(), OrderBodyViewPlatePageRespVO.class), pageRes.getTotal());
     }
 
@@ -879,7 +879,7 @@ public class PlateServiceImpl implements PlateService {
 
         // 查询所有板件的视图所需信息
         PageDTO<PlateRespVO> page = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE);
-        IPage<OrderBodyViewPlatesPageDO> viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getOrganId(), true);
+        IPage<OrderBodyViewPlatesPageDO> viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), null, orderItemDO.getOrganId(), true);
         List<OrderBodyViewPlatesPageDO> records = viewPlatesPage.getRecords();
 
         List<OrderBodyViewPlatePageRespVO> resultList = new ArrayList<>();

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

@@ -537,7 +537,7 @@
     <select id="selectBodyViewPlatesPage" resultType="com.cf.imes.module.executor.dal.dataobject.orderItem.OrderBodyViewPlatesPageDO">
         SELECT p.plate_no, p.name, p.width, p.height, p.thickness, g.material, g.color, p.cad_plate_no as customNumber
         <if test="cadView">
-        , p.cad_view_id, p.seal_left, p.seal_down, p.seal_right, p.seal_up
+        , p.id, p.cad_view_id, p.seal_left, p.seal_down, p.seal_right, p.seal_up
         </if>
         FROM order_item i
         LEFT JOIN `order_plate` p ON i.plate_id = p.id
@@ -549,5 +549,8 @@
         <if test="bodyId != null">
             AND i.body_id = #{bodyId}
         </if>
+        <if test="groupId != null">
+            AND i.group_id = #{groupId}
+        </if>
     </select>
 </mapper>