From 8acbf7f64e0da18f4b43f68fb9b9c69c54f75b60 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Mar 2026 13:34:57 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-10=20=E8=AE=A2=E5=8D=95=E4=BA=A7?=
 =?UTF-8?q?=E5=87=BA=E6=A0=87=E7=AD=BE=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionReportController.java           |  3 +
 .../shopOrder/dao/ProductionReportMapper.java |  2 +
 .../Impl/ProductionReportServiceImpl.java     |  5 ++
 .../service/ProductionReportService.java      |  2 +
 src/main/resources/mapper/pms/QcMapper.xml    |  2 +-
 .../shopOrder/ProductionReportMapper.xml      | 70 +++++++++++++++++++
 6 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
index 3209756..12d1ab2 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
@@ -189,9 +189,12 @@ public class ProductionReportController {
             List<SFDCRollsOutData> result = productionReportService.searchSfdcRollsReport(indata);
             // 查询总数
             int total = productionReportService.searchSfdcRollsReportCount(indata);
+            // 查询汇总数据
+            SFDCRollsOutData summary = productionReportService.searchSfdcRollsReportSummary(indata);
             map.put("success", true);
             map.put("rows", result);
             map.put("total", total);
+            map.put("summary", summary);
         } catch (Exception e) {
             map.put("success", false);
             map.put("msg", e.getMessage());
diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
index 1e38101..7d1047c 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
@@ -148,5 +148,7 @@ public interface ProductionReportMapper {
 
     int searchSfdcRollsReportCount(SFDCRollsOutData indata);
 
+    SFDCRollsOutData searchSfdcRollsReportSummary(SFDCRollsOutData indata);
+
     void updateSfdcRollsAttribute(SFDCRollsOutData data);
 }
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
index 9c9baaf..62ebd39 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ProductionReportServiceImpl.java
@@ -189,6 +189,11 @@ public class ProductionReportServiceImpl implements ProductionReportService {
         return count;
     }
 
+    @Override
+    public SFDCRollsOutData searchSfdcRollsReportSummary(SFDCRollsOutData indata) {
+        return productionReportMapper.searchSfdcRollsReportSummary(indata);
+    }
+
     @Override
     public void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata) {
         for (SFDCRollsOutData data : indata) {
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
index 48a52bf..d09368a 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
@@ -118,6 +118,8 @@ public interface ProductionReportService {
 
     int searchSfdcRollsReportCount(SFDCRollsOutData indata);
 
+    SFDCRollsOutData searchSfdcRollsReportSummary(SFDCRollsOutData indata);
+
     void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata);
 
     /**
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index e720a3f..6710f2c 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3952,7 +3952,7 @@
         <where>
             B.SITE IS NULL
             AND A.status_tb = 0
-            and ISNULL(public_flag,'N') = 'Y'
+            and ISNULL(public_flag,'N') = 'N'
             <if test="params.site != null and params.site != ''">
                 AND A.site = #{params.site}
             </if>
diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
index 7cb53a7..b5e104e 100644
--- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
@@ -445,6 +445,76 @@
         </if>
     </select>
 
+    <!-- 查询订单产出标签汇总数据 -->
+    <select id="searchSfdcRollsReportSummary" resultType="com.gaotao.modules.rollNoReview.data.SFDCRollsOutData">
+        SELECT
+        ISNULL(SUM(A.RollQty), 0) AS rollQty,
+        ISNULL(SUM(ISNULL(R.good_qty, 0)), 0) AS goodQty,
+        ISNULL(SUM(ISNULL(R.surface_loss_qty, 0)), 0) AS surfaceLossQty,
+        ISNULL(SUM(ISNULL(R.poor_performance_qty, 0)), 0) AS poorPerformanceQty,
+        ISNULL(SUM(ISNULL(R.defect_qty, 0)), 0) AS defectQty,
+        ISNULL(SUM(ISNULL(R.total_qty, 0)), 0) AS totalQty
+        FROM SFDC_Rolls A
+        LEFT JOIN (SELECT OrderNo,SeqNo,ItemNo,StartDate, ReportDate,Reportedby,HistType,SITE,StartFromRollNo,RollNo ,ROW_NUMBER() OVER (PARTITION BY SITE, OrderNo, StartFromRollNo ORDER BY ReportDate DESC, SeqNo ASC) AS rn FROM SFDC_MaterialHist) B ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo AND B.rn = 1
+        left join part p on a.site = p.site and a.partNo = p.partNo
+        LEFT JOIN (
+            select
+            site,
+            order_no,
+            roll_no,
+            seq_no,
+            SUM(good_qty) as good_qty,
+            SUM(surface_loss_qty) as surface_loss_qty,
+            SUM(poor_performance_qty) as poor_performance_qty,
+            SUM(defect_qty) as defect_qty,
+            SUM(total_qty) as total_qty
+            from ProductionReport
+            GROUP BY Site,order_no,roll_no,seq_no) R on r.Site = a.site and r.roll_no = a.RollNo
+        <where>
+            ISNULL(A.VirtualNewRollFlag,'Y') = 'N'
+            AND a.site in (select site from AccessSite where userID = #{userName})
+            <if test=" createdDate2 != null">
+                AND CONVERT(varchar(10), a.CreatedDate, 120) >= #{createdDate2}
+            </if>
+            <if test=" createdDate3 != null">
+                AND #{createdDate3} >= CONVERT(varchar(10), a.CreatedDate, 120)
+            </if>
+            <if test=" orderNo != null and orderNo != ''">
+                AND A.OrderNo like '%'+#{orderNo}+'%'
+            </if>
+            <if test=" createdOpsSeqNo != null and createdOpsSeqNo != '' and createdOpsSeqNo != 0">
+                AND CAST(A.CreatedOpsSeqNo AS VARCHAR) like '%'+CAST(#{createdOpsSeqNo} AS VARCHAR)+'%'
+            </if>
+            <if test=" createdOpsItemNo != null and createdOpsItemNo != '' and createdOpsItemNo != 0">
+                AND CAST(A.CreatedOpsItemNo AS VARCHAR) like '%'+CAST(#{createdOpsItemNo} AS VARCHAR)+'%'
+            </if>
+            <if test=" consumeOrderNo != null and consumeOrderNo != ''">
+                AND B.OrderNo like '%'+#{consumeOrderNo}+'%'
+            </if>
+            <if test=" consumeSeqNo != null and consumeSeqNo != ''">
+                AND CAST(B.SeqNo AS VARCHAR) like '%'+#{consumeSeqNo}+'%'
+            </if>
+            <if test=" consumeItemNo != null and consumeItemNo != ''">
+                AND CAST(B.ItemNo AS VARCHAR) like '%'+#{consumeItemNo}+'%'
+            </if>
+            <if test=" partNo != null and partNo != ''">
+                AND A.partNo like '%'+#{partNo}+'%'
+            </if>
+            <if test=" partDesc != null and partDesc != ''">
+                AND p.PartDescription like '%'+#{partDesc}+'%'
+            </if>
+            <if test=" spec != null and spec != ''">
+                AND p.Spec like '%'+#{spec}+'%'
+            </if>
+            <if test=" rollNo != null and rollNo != ''">
+                AND A.RollNo like '%'+#{rollNo}+'%'
+            </if>
+            <if test=" rollType != null and rollType != ''">
+                AND A.RollType = #{rollType}
+            </if>
+        </where>
+    </select>
+
     <!-- 查询订单产出标签总数 -->
     <select id="searchSfdcRollsReportCount" resultType="int">
         SELECT COUNT(*)