From 48879dfceab3076d5b0896b3a333eed3d3fb7092 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 11 Dec 2025 09:20:41 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-11=20pda=E7=94=9F=E4=BA=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/productionInbound/ProductionInboundMapper.xml   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml b/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml
index ff17d93..c4693a1 100644
--- a/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml
+++ b/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml
@@ -46,7 +46,7 @@
             SUM(CASE WHEN pr.status = '已入库' THEN 1 ELSE 0 END) AS labelinCount,         -- 已入库标签数
             COUNT(DISTINCT pr.RollNo) AS totalLabels,                                          -- 需入库标签数
             SUM(CASE WHEN pr.status = '已入库' THEN ISNULL(pr.RollQty, 0) ELSE 0 END) AS totalinLabels, -- 已入库物料总数
-            D.required_qty  as labelCount --需入库总数
+            SUM(D.required_qty)  as labelCount --需入库总数
         FROM inbound_notification_head h
                  LEFT JOIN inbound_notification_detail d ON h.site = d.site and h.bu_no = d.bu_no and h.order_no = d.order_no
                  INNER JOIN ShopOrder sh ON d.site = sh.site and d.bu_no = sh.bu_no and  d.related_order_no = sh.OrderNo and d.part_no = sh.PartNo
@@ -55,7 +55,7 @@
             h.site = #{site}
           AND h.bu_no = #{buNo}
           AND h.order_no = #{orderNo} and sh.OrderNo = #{relatedOrderNo}
-        GROUP BY h.site, h.bu_no, h.order_no, h.required_inbound_date,D.required_qty
+        GROUP BY h.site, h.bu_no, h.order_no, h.required_inbound_date
     </select>
 
     <!-- 验证生产标签与入库单是否匹配 -->
@@ -140,7 +140,7 @@
         SELECT 
             a.order_no AS orderNo,
             b.order_qty AS orderQty,
-            b.required_qty AS requiredQty,
+            SUM(b.required_qty) AS requiredQty,
             b.part_no AS partNo,
             b.part_desc AS partDesc,
             c.UMName AS umName,
@@ -159,6 +159,7 @@
             AND a.order_no = #{orderNo} 
             AND a.order_type = '生产入库' 
             AND a.order_status = '待入库'
+        GROUP BY a.order_no,b.part_no,b.part_desc,c.UMName,b.related_order_no,b.related_order_line_no,b.order_qty
     </select>
 
     <!-- 获取已扫描标签列表（从缓存表） -->