From 7d430d054c5d995f0732d7cb033382ad204b8dac Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 26 Dec 2025 11:26:56 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-26=20=E8=AE=A2=E5=8D=95=E4=BA=A7?=
 =?UTF-8?q?=E5=87=BA=E6=A0=87=E7=AD=BE=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rollNoReview/data/SFDCRollsOutData.java   | 11 ++++-
 .../shopOrder/ProductionReportMapper.xml      | 42 +++++++++++++------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
index 5bb1c0a..2340a55 100644
--- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
+++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
@@ -69,8 +69,17 @@ public class SFDCRollsOutData {
 	private Integer defectQty;
 	private Integer totalQty;
 	private BigDecimal yieldRate;
+    private String userName;
 
-	public Integer getGoodQty() {
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getGoodQty() {
 		return goodQty;
 	}
 
diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
index b59a197..ba6fe87 100644
--- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
@@ -267,9 +267,6 @@
         a.partNo,
         p.PartDescription AS partDesc,
         p.Spec AS spec ,
-        a.partNo,
-        p.PartDescription,
-        p.Spec,
         ISNULL(R.good_qty, 0) as goodQty,
         ISNULL(R.surface_loss_qty, 0) as surfaceLossQty,
         ISNULL(R.poor_performance_qty, 0) as poorPerformanceQty,
@@ -294,13 +291,14 @@
             from ProductionReport
             GROUP BY Site,order_no,roll_no,seq_no) R on r.Site = a.site and r.roll_no = a.RollNo
         <where>
-             a.CreatedDate >= #{createdDate2}
+            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=" Site != null and Site != ''">
-                AND A.site = #{Site}
-            </if>
             <if test=" OrderNo != null and OrderNo != ''">
                 AND A.OrderNo like '%'+#{OrderNo}+'%'
             </if>
@@ -319,6 +317,15 @@
             <if test=" consumeItemNo != null and consumeItemNo != ''">
                 AND B.ItemNo 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>
         </where>
         ORDER BY A.CreatedDate DESC
         <if test="page != null and limit != null">
@@ -330,15 +337,17 @@
     <select id="searchSfdcRollsReportCount" resultType="int">
         SELECT COUNT(*)
         FROM SFDC_Rolls A
-        LEFT JOIN SFDC_MaterialHist B   ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo
+        LEFT JOIN SFDC_MaterialHist B ON A.Site = B.SITE AND A.OrderNo = B.OrderNo AND A.RollNo = B.StartFromRollNo
+        LEFT JOIN part p ON A.site = p.site AND A.partNo = p.partNo
         <where>
-             a.CreatedDate >= #{createdDate2}
+            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=" Site != null and Site != ''">
-                AND A.site = #{Site}
-            </if>
             <if test=" OrderNo != null and OrderNo != ''">
                 AND A.OrderNo like '%'+#{OrderNo}+'%'
             </if>
@@ -357,6 +366,15 @@
             <if test=" consumeItemNo != null and consumeItemNo != ''">
                 AND B.ItemNo 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>
         </where>
     </select>
 </mapper>
\ No newline at end of file