From 57a2c2b2fc5db022303ab0d299acc77aa6261cac Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 17 Nov 2025 11:36:12 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-17=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=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rollNoReview/data/SFDCRollsOutData.java   | 20 ++++++++++
 .../ProductionReportController.java           |  4 +-
 .../shopOrder/dao/ProductionReportMapper.java |  2 +
 .../Impl/ProductionReportServiceImpl.java     |  6 +++
 .../service/ProductionReportService.java      |  2 +
 .../shopOrder/ProductionReportMapper.xml      | 38 +++++++++++++++++++
 6 files changed, 71 insertions(+), 1 deletion(-)

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 10c3807..23bcce0 100644
--- a/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
+++ b/src/main/java/com/gaotao/modules/rollNoReview/data/SFDCRollsOutData.java
@@ -56,6 +56,26 @@ public class SFDCRollsOutData {
 	private String parentRollType;
 	private String finalStatus;
 	private String batchNo;
+	// 分页参数
+	private Integer page;
+	private Integer limit;
+	
+	public Integer getPage() {
+		return page;
+	}
+	
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+	
+	public Integer getLimit() {
+		return limit;
+	}
+	
+	public void setLimit(Integer limit) {
+		this.limit = limit;
+	}
+	
 	public Date getCreatedDate3() {
 		return createdDate3;
 	}
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 5a6186f..765ba2a 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ProductionReportController.java
@@ -173,9 +173,11 @@ public class ProductionReportController {
         Map<String, Object> map = new HashMap<>();
         try {
             List<SFDCRollsOutData> result = productionReportService.searchSfdcRollsReport(indata);
+            // 查询总数
+            int total = productionReportService.searchSfdcRollsReportCount(indata);
             map.put("success", true);
             map.put("rows", result);
-            map.put("total", result.size());
+            map.put("total", total);
         } 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 9151c24..5ce89d7 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ProductionReportMapper.java
@@ -144,5 +144,7 @@ public interface ProductionReportMapper {
 
     List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata);
 
+    int searchSfdcRollsReportCount(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 5a6767d..8302493 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
@@ -178,6 +178,12 @@ public class ProductionReportServiceImpl implements ProductionReportService {
         return result;
     }
 
+    @Override
+    public int searchSfdcRollsReportCount(SFDCRollsOutData indata) {
+        int count = productionReportMapper.searchSfdcRollsReportCount(indata);
+        return count;
+    }
+
     @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 53e91e4..9fae322 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/ProductionReportService.java
@@ -114,5 +114,7 @@ public interface ProductionReportService {
 
     List<SFDCRollsOutData> searchSfdcRollsReport(SFDCRollsOutData indata);
 
+    int searchSfdcRollsReportCount(SFDCRollsOutData indata);
+
     void updateSfdcRollsAttribute(List<SFDCRollsOutData> indata);
 }
diff --git a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
index e4ab005..1f78db1 100644
--- a/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ProductionReportMapper.xml
@@ -293,5 +293,43 @@
                 AND B.ItemNo like '%'+#{consumeItemNo}+'%'
             </if>
         </where>
+        ORDER BY A.CreatedDate DESC
+        <if test="page != null and limit != null">
+            OFFSET #{page} ROWS FETCH NEXT #{limit} ROWS ONLY
+        </if>
+    </select>
+
+    <!-- 查询订单产出标签总数 -->
+    <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
+        <where>
+             a.CreatedDate >= #{createdDate2}
+            <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>
+            <if test=" CreatedOpsSeqNo != 0">
+                AND A.CreatedOpsSeqNo = #{CreatedOpsSeqNo}
+            </if>
+            <if test=" CreatedOpsItemNo != 0">
+                AND A.CreatedOpsItemNo = #{CreatedOpsItemNo}
+            </if>
+            <if test=" consumeOrderNo != null and consumeOrderNo != ''">
+                AND B.OrderNo like '%'+#{consumeOrderNo}+'%'
+            </if>
+            <if test=" consumeSeqNo != null and consumeSeqNo != ''">
+                AND B.SeqNo like '%'+#{consumeSeqNo}+'%'
+            </if>
+            <if test=" consumeItemNo != null and consumeItemNo != ''">
+                AND B.ItemNo like '%'+#{consumeItemNo}+'%'
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file