小程序 部件查询配件优化、速度优化

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java

@@ -1068,7 +1068,7 @@ public class PackServiceImpl implements PackService {
             PlateDO plate = plateService.getPlateByNo(id, ArrayUtil.toArray(orderIds, Long.class));
             AssertUtils.notEmpty(plate, PLATE_NOT_EXISTS);
             // 查询关联部件id
-            itemDOS = orderItemService.getPlateItemCompId(plate.getId());
+            itemDOS = orderItemService.getPlateItemCompId(plate.getOrderId(), plate.getId());
         } else {
             Long partsId = Long.valueOf(id);
             // 配件

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemService.java

@@ -18,7 +18,7 @@ public interface OrderItemService {
      * @param plateId
      * @return
      */
-    List<OrderItemDO> getPlateItemCompId(Long plateId);
+    List<OrderItemDO> getPlateItemCompId(Long orderId, Long plateId);
 
     /**
      * 查询配件订单明细关联的部件id

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/orderitem/OrderItemServiceImpl.java

@@ -22,9 +22,10 @@ public class OrderItemServiceImpl implements OrderItemService {
     private OrderItemMapper orderItemMapper;
 
     @Override
-    public List<OrderItemDO> getPlateItemCompId(Long id) {
+    public List<OrderItemDO> getPlateItemCompId(Long orderId, Long id) {
         List<OrderItemDO> plateItemDOS = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>()
                 .eq(OrderItemDO::getPlateId, id)
+                .eq(OrderItemDO::getOrderId, orderId)
                 .select(OrderItemDO::getCompId, OrderItemDO::getGroupId, OrderItemDO::getBodyId));
         if (CollUtil.isNotEmpty(plateItemDOS)) {
             return plateItemDOS;

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

@@ -1431,7 +1431,7 @@ public class PlateServiceImpl implements PlateService {
         if (CollUtil.isNotEmpty(bodyIds)) {
             detailReqVO.setBodyIds(bodyIds);
         } else {
-            List<OrderItemDO> plateItems = orderItemService.getPlateItemCompId(plateDO.getId());
+            List<OrderItemDO> plateItems = orderItemService.getPlateItemCompId(plateDO.getOrderId(), plateDO.getId());
             if (CollUtil.isEmpty(plateItems)) {
                 throw new ServiceException(PLATE_NOT_EXISTS);
             }

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

@@ -889,25 +889,30 @@
             SELECT parts_id,
             body_id,
             cad_view_id,
-            SUM(num) AS num
-            <if test="componentIds != null and componentIds.size() > 0">
-                , MIN(comp_id) AS comp_id
-            </if>
-            FROM order_item
-            WHERE order_id = #{orderId} and parts_id != 0 and source_id = 0
-            and ((group_id is null and comp_id is null) or group_id = 0)
+            <choose>
+                <when test="componentIds != null and componentIds.size() > 0">
+                    MIN(num) AS num,
+                    MIN(comp_id) AS comp_id
+                    FROM order_item
+                    WHERE order_id = #{orderId} and parts_id != 0 and source_id = 0
+                    AND comp_id IN
+                    <foreach item="componentId" collection="componentIds" open="(" separator="," close=")">
+                        #{componentId}
+                    </foreach>
+                </when>
+                <otherwise>
+                    SUM(num) AS num
+                    FROM order_item
+                    WHERE order_id = #{orderId} and parts_id != 0 and source_id = 0
+                    and ((group_id is null and comp_id is null) or group_id = 0)
+                </otherwise>
+            </choose>
             <if test="bodyIds != null and bodyIds.size() > 0">
                 AND body_id IN
                 <foreach item="bodyId" collection="bodyIds" open="(" separator="," close=")">
                     #{bodyId}
                 </foreach>
             </if>
-            <if test="componentIds != null and componentIds.size() > 0">
-                AND comp_id IN
-                <foreach item="componentId" collection="componentIds" open="(" separator="," close=")">
-                    #{componentId}
-                </foreach>
-            </if>
             GROUP BY body_id, parts_id, cad_view_id
         ) t ON t.parts_id = op.id
         JOIN order_body ob ON ob.order_id = op.order_id and ob.id = t.body_id