From b223afe570d06cccdda79a70671c81d559576e0f Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 25 May 2026 17:59:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E6=9C=AA=E6=8E=92=E8=AE=A2=E5=8D=95=E3=80=81=E5=88=86=E5=A0=86?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=94=AF=E6=8C=81=E6=9D=A1=E4=BB=B6=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E4=BD=9C=E7=94=A8=E5=88=B0=E5=AD=90=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/dal/mysql/order/OrderMapper.java |  35 +-
 .../dal/mysql/planitem/PlanItemMapper.java    |  16 +
 .../service/manage/pack/PackServiceImpl.java  |  15 +-
 .../service/order/OrderServiceImpl.java       |  17 +-
 .../service/plan/PlanServiceImpl.java         |   2 +-
 .../resources/mapper/order/OrderMapper.xml    | 442 ++++++++++++++++--
 .../mapper/planitem/PlanItemMapper.xml        | 154 ++++--
 7 files changed, 583 insertions(+), 98 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
index 14c127d97..41db4faeb 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
@@ -103,6 +103,23 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
         return selectPage(reqVO, query);
     }
 
+    /**
+     * 分页查询主单（带子单过滤）
+     *
+     * @param page
+     * @param reqVO
+     * @return
+     */
+    IPage<OrderDO> selectMainPage(@Param("page") IPage<OrderDO> page, @Param("reqVO") OrderPageReqVO reqVO);
+
+    /**
+     * 查询子单列表
+     *
+     * @param reqVO
+     * @param parentIds
+     * @return
+     */
+    List<OrderDO> selectChildList(@Param("reqVO") OrderPageReqVO reqVO, @Param("parentIds") List<Long> parentIds);
 
     IPage<OrderRespVOCopy> selectOrderPage(@Param("page") IPage<OrderRespVOCopy> page, @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
 
@@ -322,8 +339,24 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
     PrintOrderPackRespVO selectOrderPack(@Param("orderNo")Long orderNo, @Param("packageNo") Long packageNo, @Param("organId")  Long organId);
 
 
+    /**
+     * 查询分堆打包订单分页
+     *
+     * @param page
+     * @param pageReqVO
+     * @param organId
+     * @return
+     */
+    IPage<PackRespVO> selectPackOrderList(@Param("page") IPage<PackRespVO> page, @Param("pageReqVO") PackPageReqVO pageReqVO, @Param("organId") Long organId);
 
-    IPage<PackRespVO> selectOrderIdList(@Param("page") IPage<PackRespVO> page, @Param("pageReqVO") PackPageReqVO pageReqVO, @Param("organId") Long organId);
+    /**
+     * 查询分堆打包子单列表
+     *
+     * @param pageReqVO
+     * @param organId
+     * @return
+     */
+    List<PackRespVO> selectPackOrderChildList(@Param("pageReqVO") PackPageReqVO pageReqVO, @Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
 
 
     List<LabelOrderData> selectLabelOrderData(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java
index ed81868aa..447e25ee6 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java
@@ -38,6 +38,22 @@ public interface PlanItemMapper extends BaseMapperX<PlanItemDO> {
                                            @Param("orderGoodsIds") List<Long> orderGoodsIds,
                                            @Param("orderIds") Long... orderIds);
 
+    /**
+     * 未排单子单查询
+     *
+     * @param page
+     * @param wrapper
+     * @param type
+     * @param orderGoodsIds 商品id列表
+     * @param orderIds      父级订单数组
+     * @return
+     */
+    IPage<OrderRespVOCopy> selectOrderChildList(@Param("page") IPage<OrderRespVOCopy> page,
+                                           @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper,
+                                           @Param("type") int type,
+                                           @Param("orderGoodsIds") List<Long> orderGoodsIds,
+                                           @Param("orderIds") Long... orderIds);
+
     /**
      * 查询排单小板
      *
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
index f63e38925..407b99d28 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
@@ -938,7 +938,7 @@ public class PackServiceImpl implements PackService {
 
 
         // 查询主单分页
-        IPage<PackRespVO> packRespVOS = ordersMapper.selectOrderIdList(page, pageReqVO, getUserOrganId());
+        IPage<PackRespVO> packRespVOS = ordersMapper.selectPackOrderList(page, pageReqVO, getUserOrganId());
 
         if (CollUtil.isEmpty(packRespVOS.getRecords())) {
             return new PageResult<>();
@@ -947,17 +947,10 @@ public class PackServiceImpl implements PackService {
         orderIds.addAll(packRespVOS.getRecords().stream().map(PackRespVO::getId).toList());
 
         // 查询分页下子级
-        List<OrderDO> childList = ordersMapper.selectList(
-                new LambdaQueryWrapperX<OrderDO>()
-                        .in(OrderDO::getParentId, orderIds)
-                        .eqIfPresent(OrderDO::getDeleted, DeletedCodeEnum.NOT_DELETED.getStatus())
-                        .ne(OrderDO::getStatus, OrderStatusEnum.EMPTY.getStatus())
-                        .orderByDesc(OrderDO::getId)
-        );
+        List<PackRespVO> childList = ordersMapper.selectPackOrderChildList(pageReqVO, orderIds, getUserOrganId());
+
         if (CollUtil.isNotEmpty(childList)) {
-            for (OrderDO child : childList) {
-                PackRespVO childPackRespVO = BeanUtil.copyProperties(child, PackRespVO.class);
-                childPackRespVO.setTotalPieceCount(child.getPlateNum());
+            for (PackRespVO childPackRespVO : childList) {
                 packRespVOS.getRecords().add(childPackRespVO);
                 orderIds.add(childPackRespVO.getId());
             }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
index 817780eb6..18d8d2630 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
@@ -309,23 +309,20 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public PageResult<OrderDO> getMainOrderPage(OrderPageReqVO pageReqVO) {
-        PageResult<OrderDO> pageResult = orderMapper.selectPage(pageReqVO.setOrganId(getUserOrganId()));
+        IPage<OrderDO> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        IPage<OrderDO> pageResult = orderMapper.selectMainPage(page, pageReqVO);
         Long pageResultTotal = pageResult.getTotal();
         if (pageResultTotal > 0) {
-            List<OrderDO> orderDOS = pageResult.getList();
+            List<OrderDO> orderDOS = pageResult.getRecords();
             // 1、整理所有订单id
             List<Long> orderIds = orderDOS.stream().map(OrderDO::getId).toList();
 
             // 2、查询订单id列表对应的子单
-            List<OrderDO> childList = orderMapper.selectList(
-                    new LambdaQueryWrapperX<OrderDO>()
-                            .in(OrderDO::getParentId, orderIds)
-                            .eqIfPresent(OrderDO::getDeleted, pageReqVO.getDeleted())
-                            .orderByDesc(OrderDO::getId)
-            );
+            List<OrderDO> childList =
+                    orderMapper.selectChildList(pageReqVO, orderIds);
 
             if (CollUtil.isEmpty(childList)) {
-                return pageResult;
+                return new PageResult<>(pageResult.getRecords(), pageResultTotal);
             }
 
             // 3、 按 parentId 分组
@@ -338,7 +335,7 @@ public class OrderServiceImpl implements OrderService {
             }
             return new PageResult<>(orderDOS, pageResultTotal);
         }
-        return pageResult;
+        return new PageResult<>(pageResult.getRecords(), pageResultTotal);
     }
 
     @Override
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
index 6c6c9526a..c6a702790 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
@@ -574,7 +574,7 @@ public class PlanServiceImpl implements PlanService {
             // 主单id列表
             Long[] mainOrderIds = mainOrderList.stream().map(OrderRespVOCopy::getOrderId).toArray(Long[]::new);
             PageDTO<OrderRespVOCopy> childPage = new PageDTO<>(pageReqVO.getPageNo(), PageParam.PAGE_SIZE_NONE);
-            IPage<OrderRespVOCopy> childOrderList = planItemMapper.selectOrderList(childPage, queryWrapperX, type, orderGoodsIds, mainOrderIds);
+            IPage<OrderRespVOCopy> childOrderList = planItemMapper.selectOrderChildList(childPage, queryWrapperX, type, orderGoodsIds, mainOrderIds);
 
             List<OrderRespVOCopy> childList = childOrderList.getRecords();
 
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
index d745c878d..d8862a7c1 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
@@ -28,6 +28,277 @@
     </resultMap>
 
 
+    <select id="selectMainPage" resultType="com.cf.imes.module.executor.dal.dataobject.order.OrderDO">
+        SELECT *
+        FROM orders o
+        WHERE o.parent_id = 0
+        AND o.id IN (
+
+        SELECT DISTINCT
+        CASE
+        WHEN t.parent_id = 0 THEN t.id
+        ELSE t.parent_id
+        END AS root_id
+        FROM orders t
+        WHERE 1 = 1
+
+        <if test="reqVO.id != null and reqVO.id != ''">
+            AND CAST(t.id AS CHAR) LIKE CONCAT('%', #{reqVO.id}, '%')
+        </if>
+
+        <if test="reqVO.parentNo != null">
+            AND t.parent_id = #{reqVO.parentNo}
+        </if>
+
+        <if test="reqVO.apiOrderId != null and reqVO.apiOrderId != ''">
+            AND t.api_order_id = #{reqVO.apiOrderId}
+        </if>
+
+        <if test="reqVO.orderDate != null and reqVO.orderDate.length == 2">
+            AND t.order_date BETWEEN #{reqVO.orderDate[0]} AND #{reqVO.orderDate[1]}
+        </if>
+
+        <if test="reqVO.deliveryDate != null and reqVO.deliveryDate.length == 2">
+            AND t.delivery_date BETWEEN #{reqVO.deliveryDate[0]} AND #{reqVO.deliveryDate[1]}
+        </if>
+
+        <if test="reqVO.orderType != null">
+            AND t.order_type = #{reqVO.orderType}
+        </if>
+
+        <if test="reqVO.orderSort != null">
+            AND t.order_sort = #{reqVO.orderSort}
+        </if>
+
+        <if test="reqVO.dataType != null">
+            AND t.data_type = #{reqVO.dataType}
+        </if>
+
+        <if test="reqVO.status != null">
+            AND t.status = #{reqVO.status}
+        </if>
+
+        <if test="reqVO.customOrderNo != null and reqVO.customOrderNo != ''">
+            AND t.custom_order_no LIKE CONCAT('%', #{reqVO.customOrderNo}, '%')
+        </if>
+
+        <if test="reqVO.customer != null and reqVO.customer != ''">
+            AND t.customer = #{reqVO.customer}
+        </if>
+
+        <if test="reqVO.address != null and reqVO.address != ''">
+            AND t.address LIKE CONCAT('%', #{reqVO.address}, '%')
+        </if>
+
+        <if test="reqVO.phoneNumber != null and reqVO.phoneNumber != ''">
+            AND t.phone_number = #{reqVO.phoneNumber}
+        </if>
+
+        <if test="reqVO.dealer != null and reqVO.dealer != ''">
+            AND t.dealer LIKE CONCAT('%', #{reqVO.dealer}, '%')
+        </if>
+
+        <if test="reqVO.dealerPhoneNumber != null and reqVO.dealerPhoneNumber != ''">
+            AND t.dealer_phone_number = #{reqVO.dealerPhoneNumber}
+        </if>
+
+        <if test="reqVO.salesman != null and reqVO.salesman != ''">
+            AND t.salesman = #{reqVO.salesman}
+        </if>
+
+        <if test="reqVO.splitter != null and reqVO.splitter != ''">
+            AND t.splitter = #{reqVO.splitter}
+        </if>
+
+        <if test="reqVO.remark != null and reqVO.remark != ''">
+            AND t.remark = #{reqVO.remark}
+        </if>
+
+        <if test="reqVO.organId != null">
+            AND t.organ_id = #{reqVO.organId}
+        </if>
+
+        <if test="reqVO.createTime != null and reqVO.createTime.length == 2">
+            AND t.create_time BETWEEN #{reqVO.createTime[0]} AND #{reqVO.createTime[1]}
+        </if>
+
+        AND t.deleted = #{reqVO.deleted}
+
+        )
+
+        <choose>
+
+            <when test="reqVO.order != null and reqVO.order == 'ascend'">
+
+                <choose>
+
+                    <when test="reqVO.field == 'id'">
+                        ORDER BY o.id ASC
+                    </when>
+
+                    <when test="reqVO.field == 'customOrderNo'">
+                        ORDER BY o.custom_order_no ASC
+                    </when>
+
+                    <when test="reqVO.field == 'orderDate'">
+                        ORDER BY o.order_date ASC
+                    </when>
+
+                    <when test="reqVO.field == 'deliveryDate'">
+                        ORDER BY o.delivery_date ASC
+                    </when>
+
+                    <when test="reqVO.field == 'apiOrderId'">
+                        ORDER BY o.api_order_id ASC
+                    </when>
+
+                    <otherwise>
+                        ORDER BY o.id DESC
+                    </otherwise>
+
+                </choose>
+
+            </when>
+
+            <when test="reqVO.order != null and reqVO.order == 'descend'">
+
+                <choose>
+
+                    <when test="reqVO.field == 'id'">
+                        ORDER BY o.id DESC
+                    </when>
+
+                    <when test="reqVO.field == 'customOrderNo'">
+                        ORDER BY o.custom_order_no DESC
+                    </when>
+
+                    <when test="reqVO.field == 'orderDate'">
+                        ORDER BY o.order_date DESC
+                    </when>
+
+                    <when test="reqVO.field == 'deliveryDate'">
+                        ORDER BY o.delivery_date DESC
+                    </when>
+
+                    <when test="reqVO.field == 'apiOrderId'">
+                        ORDER BY o.api_order_id DESC
+                    </when>
+
+                    <otherwise>
+                        ORDER BY o.id DESC
+                    </otherwise>
+
+                </choose>
+
+            </when>
+
+            <otherwise>
+                ORDER BY o.id DESC
+            </otherwise>
+
+        </choose>
+    </select>
+
+    <select id="selectChildList"
+            resultType="com.cf.imes.module.executor.dal.dataobject.order.OrderDO">
+
+        SELECT *
+        FROM orders t
+        WHERE t.parent_id IN
+
+        <foreach collection="parentIds"
+                 item="parentId"
+                 open="("
+                 separator=","
+                 close=")">
+            #{parentId}
+        </foreach>
+
+        <if test="reqVO.id != null and reqVO.id != ''">
+            AND CAST(t.id AS CHAR) LIKE CONCAT('%', #{reqVO.id}, '%')
+        </if>
+
+        <if test="reqVO.parentNo != null">
+            AND t.parent_id = #{reqVO.parentNo}
+        </if>
+
+        <if test="reqVO.apiOrderId != null and reqVO.apiOrderId != ''">
+            AND t.api_order_id = #{reqVO.apiOrderId}
+        </if>
+
+        <if test="reqVO.orderDate != null and reqVO.orderDate.length == 2">
+            AND t.order_date BETWEEN #{reqVO.orderDate[0]} AND #{reqVO.orderDate[1]}
+        </if>
+
+        <if test="reqVO.deliveryDate != null and reqVO.deliveryDate.length == 2">
+            AND t.delivery_date BETWEEN #{reqVO.deliveryDate[0]} AND #{reqVO.deliveryDate[1]}
+        </if>
+
+        <if test="reqVO.orderType != null">
+            AND t.order_type = #{reqVO.orderType}
+        </if>
+
+        <if test="reqVO.orderSort != null">
+            AND t.order_sort = #{reqVO.orderSort}
+        </if>
+
+        <if test="reqVO.dataType != null">
+            AND t.data_type = #{reqVO.dataType}
+        </if>
+
+        <if test="reqVO.status != null">
+            AND t.status = #{reqVO.status}
+        </if>
+
+        <if test="reqVO.customOrderNo != null and reqVO.customOrderNo != ''">
+            AND t.custom_order_no LIKE CONCAT('%', #{reqVO.customOrderNo}, '%')
+        </if>
+
+        <if test="reqVO.customer != null and reqVO.customer != ''">
+            AND t.customer = #{reqVO.customer}
+        </if>
+
+        <if test="reqVO.address != null and reqVO.address != ''">
+            AND t.address LIKE CONCAT('%', #{reqVO.address}, '%')
+        </if>
+
+        <if test="reqVO.phoneNumber != null and reqVO.phoneNumber != ''">
+            AND t.phone_number = #{reqVO.phoneNumber}
+        </if>
+
+        <if test="reqVO.dealer != null and reqVO.dealer != ''">
+            AND t.dealer LIKE CONCAT('%', #{reqVO.dealer}, '%')
+        </if>
+
+        <if test="reqVO.dealerPhoneNumber != null and reqVO.dealerPhoneNumber != ''">
+            AND t.dealer_phone_number = #{reqVO.dealerPhoneNumber}
+        </if>
+
+        <if test="reqVO.salesman != null and reqVO.salesman != ''">
+            AND t.salesman = #{reqVO.salesman}
+        </if>
+
+        <if test="reqVO.splitter != null and reqVO.splitter != ''">
+            AND t.splitter = #{reqVO.splitter}
+        </if>
+
+        <if test="reqVO.remark != null and reqVO.remark != ''">
+            AND t.remark = #{reqVO.remark}
+        </if>
+
+        <if test="reqVO.organId != null">
+            AND t.organ_id = #{reqVO.organId}
+        </if>
+
+        <if test="reqVO.createTime != null and reqVO.createTime.length == 2">
+            AND t.create_time BETWEEN #{reqVO.createTime[0]} AND #{reqVO.createTime[1]}
+        </if>
+
+        AND t.deleted = #{reqVO.deleted}
+
+        ORDER BY t.id DESC
+
+    </select>
 
     <select id="selectOrderPage" resultMap="OrderPageMap">
 
@@ -539,65 +810,158 @@
     </select>
 
 
-    <select id="selectOrderIdList" resultMap="PackMap" parameterType="map">
+    <select id="selectPackOrderList" resultMap="PackMap" parameterType="map">
 
 
-        select
-        id,
-        order_type as orderType,
-        parent_id as parentId,
-        custom_order_no as customOrderNo,
-        dealer as dealer,
-        dealer_phone_number as dealerPhoneNumber,
-        order_date as orderDate,
-        create_time as createTime,
-        delivery_date as deliveryDate,
-        customer as customer,
-        phone_number as phoneNumber,
-        address as address,
-        salesman as salesman,
-        splitter as splitter,
-        packaged as packaged,
-        remark as remark,
-        plate_num as totalPieceCount,
-        packed_plates_count as packedPlatesCount,
-        packed_parts_count as packedPartsCount
+        SELECT
+        o.id,
+        o.order_type AS orderType,
+        o.parent_id AS parentId,
+        o.custom_order_no AS customOrderNo,
+        o.dealer AS dealer,
+        o.dealer_phone_number AS dealerPhoneNumber,
+        o.order_date AS orderDate,
+        o.create_time AS createTime,
+        o.delivery_date AS deliveryDate,
+        o.customer AS customer,
+        o.phone_number AS phoneNumber,
+        o.address AS address,
+        o.salesman AS salesman,
+        o.splitter AS splitter,
+        o.packaged AS packaged,
+        o.remark AS remark,
+        o.plate_num AS totalPieceCount,
+        o.packed_plates_count AS packedPlatesCount,
+        o.packed_parts_count AS packedPartsCount
+
+        FROM orders o
+
+        WHERE o.id IN (
+
+        SELECT DISTINCT
+
+        CASE
+        WHEN x.parent_id = 0 THEN x.id
+        ELSE x.parent_id
+        END
+
+        FROM orders x
 
-        from orders
         <where>
 
-            organ_id =#{organId}
-            and deleted = false
-            and status in (1,2,3,4)
-            and parent_id = 0
+            x.organ_id = #{organId}
 
-            <if test="pageReqVO.orderId !=null">
-                and id like concat('%', #{pageReqVO.orderId},'%')
+            AND x.deleted = false
+
+            AND x.status IN (1,2,3,4)
+
+            <if test="pageReqVO.orderId != null and pageReqVO.orderId != ''">
+                AND CAST(x.id AS CHAR) LIKE CONCAT('%', #{pageReqVO.orderId}, '%')
             </if>
 
-            <if test="pageReqVO.status !=null ">
-                and packaged = #{pageReqVO.status}
+            <if test="pageReqVO.status != null">
+                AND x.packaged = #{pageReqVO.status}
             </if>
 
-            <if test="pageReqVO.customOrderNo !=null">
-                and custom_order_no like concat('%',#{pageReqVO.customOrderNo},'%')
+            <if test="pageReqVO.customOrderNo != null and pageReqVO.customOrderNo != ''">
+                AND x.custom_order_no LIKE CONCAT('%', #{pageReqVO.customOrderNo}, '%')
             </if>
 
-            <if test="pageReqVO.customer !=null">
-                and customer like concat('%', #{pageReqVO.customer},'%')
+            <if test="pageReqVO.customer != null and pageReqVO.customer != ''">
+                AND x.customer LIKE CONCAT('%', #{pageReqVO.customer}, '%')
             </if>
 
-            <if test="pageReqVO.address !=null">
-                and address like concat('%', #{pageReqVO.address},'%')
+            <if test="pageReqVO.address != null and pageReqVO.address != ''">
+                AND x.address LIKE CONCAT('%', #{pageReqVO.address}, '%')
             </if>
 
-            <if test="pageReqVO.dealer !=null">
-                and dealer like concat('%', #{pageReqVO.dealer},'%')
+            <if test="pageReqVO.dealer != null and pageReqVO.dealer != ''">
+                AND x.dealer LIKE CONCAT('%', #{pageReqVO.dealer}, '%')
             </if>
 
         </where>
 
-        order by create_time desc
+        )
+
+        AND o.parent_id = 0
+
+        ORDER BY o.create_time DESC
+
+    </select>
+
+    <select id="selectPackOrderChildList" resultMap="PackMap" parameterType="map">
+
+        SELECT
+        o.id,
+        o.order_type AS orderType,
+        o.parent_id AS parentId,
+        o.custom_order_no AS customOrderNo,
+        o.dealer AS dealer,
+        o.dealer_phone_number AS dealerPhoneNumber,
+        o.order_date AS orderDate,
+        o.create_time AS createTime,
+        o.delivery_date AS deliveryDate,
+        o.customer AS customer,
+        o.phone_number AS phoneNumber,
+        o.address AS address,
+        o.salesman AS salesman,
+        o.splitter AS splitter,
+        o.packaged AS packaged,
+        o.remark AS remark,
+        o.plate_num AS totalPieceCount,
+        o.packed_plates_count AS packedPlatesCount,
+        o.packed_parts_count AS packedPartsCount
+
+        FROM orders o
+
+        <where>
+
+            o.parent_id IN
+
+            <foreach item="orderId"
+                     collection="orderIds"
+                     open="("
+                     separator=","
+                     close=")">
+                #{orderId}
+            </foreach>
+
+            AND o.deleted = false
+
+            AND o.status != 0
+
+            <if test="pageReqVO.orderId != null and pageReqVO.orderId != ''">
+                AND CAST(o.id AS CHAR)
+                LIKE CONCAT('%', #{pageReqVO.orderId}, '%')
+            </if>
+
+            <if test="pageReqVO.status != null">
+                AND o.packaged = #{pageReqVO.status}
+            </if>
+
+            <if test="pageReqVO.customOrderNo != null and pageReqVO.customOrderNo != ''">
+                AND o.custom_order_no
+                LIKE CONCAT('%', #{pageReqVO.customOrderNo}, '%')
+            </if>
+
+            <if test="pageReqVO.customer != null and pageReqVO.customer != ''">
+                AND o.customer
+                LIKE CONCAT('%', #{pageReqVO.customer}, '%')
+            </if>
+
+            <if test="pageReqVO.address != null and pageReqVO.address != ''">
+                AND o.address
+                LIKE CONCAT('%', #{pageReqVO.address}, '%')
+            </if>
+
+            <if test="pageReqVO.dealer != null and pageReqVO.dealer != ''">
+                AND o.dealer
+                LIKE CONCAT('%', #{pageReqVO.dealer}, '%')
+            </if>
+
+        </where>
+
+        ORDER BY o.id DESC
 
     </select>
 
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 11ec81ecc..cf2231311 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
@@ -19,12 +19,12 @@
     </resultMap>
 
     <select id="selectOrderList" resultMap="OrderPageMap">
-        select
-        o.id as orderId,
+        SELECT
+        o.id AS orderId,
 
         <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@ORDER_GROUP.getType()">
-            o.plate_num - o.planned_plate_num as num,
-            o.area - o.planned_plate_area as area,
+            o.plate_num - o.planned_plate_num AS num,
+            o.area - o.planned_plate_area AS area,
         </if>
 
         <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@GOODS_GROUP.getType()">
@@ -32,51 +32,133 @@
             t.area,
         </if>
 
-        o.parent_id as parentId,
-        o.order_type as orderType,
-        o.order_date as orderDate,
-        o.delivery_date as deliveryDate,
-        o.customer as customer,
-        o.address as address,
-        o.custom_order_no as defineId,
-        o.status as status
+        o.parent_id AS parentId,
+        o.order_type AS orderType,
+        o.order_date AS orderDate,
+        o.delivery_date AS deliveryDate,
+        o.customer AS customer,
+        o.address AS address,
+        o.custom_order_no AS defineId,
+        o.status AS status
 
-        from orders o
+        FROM orders o
 
         <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@GOODS_GROUP.getType()">
-            join (
-            select
+
+            JOIN (
+            SELECT
             og.order_id,
-            sum(og.plate_num - og.planned_plate_num) as num,
-            sum(og.area - og.planned_plate_area) as area
-            from order_goods og
-            where og.plate_num - og.planned_plate_num > 0
+            SUM(og.plate_num - og.planned_plate_num) AS num,
+            SUM(og.area - og.planned_plate_area) AS area
+            FROM order_goods og
+            WHERE og.plate_num - og.planned_plate_num > 0
+
             <if test="orderGoodsIds != null and orderGoodsIds.size() > 0">
                 AND og.id IN
-                <foreach item="orderGoodsId" collection="orderGoodsIds" open="(" separator="," close=")">
+                <foreach item="orderGoodsId"
+                         collection="orderGoodsIds"
+                         open="("
+                         separator=","
+                         close=")">
                     #{orderGoodsId}
                 </foreach>
             </if>
-            group by og.order_id
-            ) t on t.order_id = o.id
+
+            GROUP BY og.order_id
+
+            ) t ON t.order_id = o.id
+
         </if>
 
-        ${ew.customSqlSegment}
-        and o.plate_num - o.planned_plate_num > 0
+        WHERE o.id IN (
+
+        SELECT DISTINCT
+
+        CASE
+        WHEN x.parent_id = 0 THEN x.id
+        ELSE x.parent_id
+        END
+
+        FROM orders x
+
+        ${ew.customSqlSegment.replace('o.', 'x.')}
+        and IFNULL(x.plate_num,0) - IFNULL(x.planned_plate_num,0) > 0
+        )
+
+        AND o.parent_id = 0
+
+        AND IFNULL(o.plate_num,0) - IFNULL(o.planned_plate_num,0) > 0
+
+        ORDER BY o.id DESC
+
+    </select>
+
+    <select id="selectOrderChildList" resultMap="OrderPageMap">
+
+        SELECT
+        o.id AS orderId,
+
         <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@ORDER_GROUP.getType()">
-            <choose>
-                <when test="orderIds != null and orderIds.length > 0">
-                    AND o.parent_id IN
-                    <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
-                        #{orderId}
-                    </foreach>
-                </when>
-                <otherwise>
-                    AND o.parent_id = 0
-                </otherwise>
-            </choose>
+            o.plate_num - o.planned_plate_num AS num,
+            o.area - o.planned_plate_area AS area,
         </if>
-        order by o.id desc
+
+        <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@GOODS_GROUP.getType()">
+            t.num,
+            t.area,
+        </if>
+
+        o.parent_id AS parentId,
+        o.order_type AS orderType,
+        o.order_date AS orderDate,
+        o.delivery_date AS deliveryDate,
+        o.customer AS customer,
+        o.address AS address,
+        o.custom_order_no AS defineId,
+        o.status AS status
+
+        FROM orders o
+
+        <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@GOODS_GROUP.getType()">
+
+            JOIN (
+            SELECT
+            og.order_id,
+            SUM(og.plate_num - og.planned_plate_num) AS num,
+            SUM(og.area - og.planned_plate_area) AS area
+            FROM order_goods og
+            WHERE og.plate_num - og.planned_plate_num > 0
+
+            <if test="orderGoodsIds != null and orderGoodsIds.size() > 0">
+                AND og.id IN
+                <foreach item="orderGoodsId"
+                         collection="orderGoodsIds"
+                         open="("
+                         separator=","
+                         close=")">
+                    #{orderGoodsId}
+                </foreach>
+            </if>
+
+            GROUP BY og.order_id
+
+            ) t ON t.order_id = o.id
+
+        </if>
+
+            ${ew.customSqlSegment}
+            AND IFNULL(o.plate_num,0) - IFNULL(o.planned_plate_num,0) > 0
+            AND  o.parent_id IN
+            <foreach item="orderId"
+                     collection="orderIds"
+                     open="("
+                     separator=","
+                     close=")">
+                #{orderId}
+            </foreach>
+
+        ORDER BY o.id DESC
+
     </select>