From faa7556f7f3fe08da300e58b32e2816a767f44c7 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Wed, 9 Apr 2025 15:05:23 +0800
Subject: [PATCH] =?UTF-8?q?sqp=E4=BF=AE=E6=94=B9-item=E9=85=8D=E4=BB=B6?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=87=8D=E5=A4=8D=E7=BC=BA=E5=B0=91=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/orderParts/OrderPartsMapper.xml    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
index bc35bb0c3..586e5e885 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderParts/OrderPartsMapper.xml
@@ -17,7 +17,7 @@
 
     <select id="selectPartDetail"
             resultType="com.cf.imes.module.executor.controller.admin.orderParts.vo.PartGoodsRespVO">
-        SELECT DISTINCT a.id,
+        SELECT a.id,
                a.goods_id,
                a.name,
                a.material,
@@ -29,7 +29,7 @@
                a.unit,
                a.is_composite,
                a.remark,
-               b.num,
+               SUM(b.num) AS num,
                c.name          as body_name,
                c.id            as body_id,
                c.room_id,
@@ -41,6 +41,23 @@
         WHERE b.order_id = #{orderId}
           and b.organ_id = #{organId}
           and a.deleted = #{deleted}
+        GROUP BY
+            a.id,
+            a.goods_id,
+            a.name,
+            a.material,
+            a.type,
+            a.model,
+            a.spec,
+            a.brand,
+            a.factory,
+            a.unit,
+            a.is_composite,
+            a.remark,
+            c.id,
+            c.name,
+            c.room_id,
+            c.room_name;
     </select>
 
     <select id="selectPartAll"