From f1bb8a410d1559c95bebecd350c2d0077ac08172 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 21 Apr 2026 18:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=8E=92=E8=AE=A2=E5=8D=95-=E6=9D=BF?=
 =?UTF-8?q?=E6=9D=90=E5=88=86=E7=BB=84=EF=BC=8C=E6=9D=BF=E6=9D=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=A5=E5=85=85=E7=89=87=E6=95=B0=E5=92=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/executor/service/plan/PlanServiceImpl.java  |  4 ++--
 .../main/resources/mapper/planitem/PlanItemMapper.xml  | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

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 52ba7750e..7a593d397 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
@@ -632,7 +632,7 @@ public class PlanServiceImpl implements PlanService {
         statusList.add(OrderStatusEnum.SORTED.getStatus());
 
         QueryWrapperX<PlanItemDO> queryWrapperX = new QueryWrapperX<>();
-        IPage<OrderGoodsResp> orderGoodsResps = new PageDTO<>();
+        IPage<OrderGoodsResp> orderGoodsResps;
 
         Integer type = 0;
         if (CollUtil.isNotEmpty(pageReqVO.getRoomId()) || CollUtil.isNotEmpty(pageReqVO.getBodyId())) {
@@ -687,7 +687,7 @@ public class PlanServiceImpl implements PlanService {
 
         List<OrderGoodsResp> orderGoodsIdList = planItemMapper.selectNoOrderGoodsIdList(queryWrapperX, getUserOrganId(), type);
 
-        mergeOrderGoodsLists(records,orderGoodsIdList);
+        mergeOrderGoodsLists(records, orderGoodsIdList);
 
         return new PageResult<>(orderGoodsResps.getRecords(), orderGoodsResps.getTotal());
 
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 1533759ba..01e2e6356 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
@@ -232,6 +232,8 @@
         <result property="texture" column="texture"/>
         <result property="thickness" column="thickness"/>
         <result property="brand" column="brand"/>
+        <result property="num" column="num"/>
+        <result property="area" column="area"/>
 
         <collection property="orderIds" ofType="com.cf.imes.module.executor.controller.admin.plan.bo.OrderIds" resultMap="orderIdsMap"/>
 
@@ -272,14 +274,15 @@
     <select id="selectNoPlanGoodsList" resultMap="OrderGoodsMap" parameterType="java.lang.Long">
 
 
-            select distinct
-
+            select
             og.color as color,
             og.goods_name as goodsName,
             og.material as material,
             og.thickness as thickness,
             og.brand as brand,
-            og.texture as texture
+            og.texture as texture,
+            sum(og.plate_num - og.planned_plate_num) as num,
+            sum(og.area - og.planned_plate_area)     as area
 
         from orders o
                 join order_goods og on o.id = og.order_id  and og.organ_id = #{organId}
@@ -287,6 +290,7 @@
             ${ew.customSqlSegment}
             and og.plate_num - og.planned_plate_num > 0
             and og.deleted = false
+            group by og.color, og.goods_name, og.material, og.thickness, og.brand, og.texture
         order by thickness desc
     </select>