From 98e0fd330fe4a06d5592c36f7e26020652999dce Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 14 Jul 2026 09:28:25 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-14=20=E5=BC=82=E5=B8=B8=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScheduleController.java        | 11 +++-
 .../schedule/mapper/ScheduleMapper.java       |  9 ++++
 .../schedule/service/ScheduleService.java     | 10 ++++
 .../service/impl/ScheduleServiceImpl.java     | 41 +++++++++++----
 .../mapper/schedule/ScheduleMapper.xml        | 51 ++++++++++++++++---
 5 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
index a8cb37c..49cd6e4 100644
--- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
+++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
@@ -101,12 +101,21 @@ public class ScheduleController extends AbstractController {
      **/
     @RequestMapping(value = "getProduceScheduleData")
     public R getProduceScheduleData(@RequestBody SearchScheduleData inData){
+        boolean isExport = "Y".equalsIgnoreCase(inData.getExportFlag());
+        if (!isExport) {
+            // page入参使用页码，查询前转换成offset
+            int page = inData.getPage() > 0 ? inData.getPage() : 1;
+            int limit = inData.getLimit() > 0 ? inData.getLimit() : 20;
+            inData.setPage((page - 1) * limit);
+            inData.setLimit(limit);
+        }
         List<ScheduleData> resultList = scheduleService.getProduceScheduleData(inData);
+        Integer totalCount = isExport ? resultList.size() : scheduleService.countProduceScheduleData(inData);
         return R.ok()
                 .put("code", 200)
                 .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
                 .put("rows", resultList)
-                .put("total", resultList.size());
+                .put("total", totalCount);
     }
 
     /**
diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
index 76de4bd..7063aa0 100644
--- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
+++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
@@ -66,6 +66,15 @@ public interface ScheduleMapper {
      **/
     List<ScheduleData> getProduceScheduleData(SearchScheduleData inData);
 
+    /**
+     * TODO 查询待生产工单总数
+     * @author LR
+     * @date 2026/07/13
+     * @param inData
+     * @return java.lang.Integer
+     **/
+    Integer countProduceScheduleData(SearchScheduleData inData);
+
     /**
      * TODO 获取操作员列表的信息
      * @author LR
diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
index e352733..b97090e 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
@@ -62,6 +62,16 @@ public interface ScheduleService {
      **/
     List<ScheduleData> getProduceScheduleData(SearchScheduleData inData);
 
+    /**
+     * TODO 查询-待生产工单总数
+     *
+     * @param inData
+     * @return java.lang.Integer
+     * @author LR
+     * @date 2026/07/13
+     **/
+    Integer countProduceScheduleData(SearchScheduleData inData);
+
     /**
      * TODO 获取操作员的列表信息
      *
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 6d20496..9639919 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -119,15 +119,38 @@ public class ScheduleServiceImpl implements ScheduleService {
         if (!searchFlag) {
             return new ArrayList<ScheduleData>();
         }
-        //把查询时间结束参数添加一天
-        Date planStartTime2 = inData.getPlanStartTime2();
-        //判断是否是null
-        if (planStartTime2 != null) {
-            planStartTime2 = DateUtils.addDateDays(planStartTime2, 1);
-            //重置参数
-            inData.setPlanStartTime2(planStartTime2);
-        }
-        return scheduleMapper.getProduceScheduleData(inData);
+        Date originalPlanStartTime2 = inData.getPlanStartTime2();
+        try {
+            //把查询时间结束参数添加一天
+            if (originalPlanStartTime2 != null) {
+                inData.setPlanStartTime2(DateUtils.addDateDays(originalPlanStartTime2, 1));
+            }
+            return scheduleMapper.getProduceScheduleData(inData);
+        } finally {
+            // 避免入参被污染，影响后续统计查询
+            inData.setPlanStartTime2(originalPlanStartTime2);
+        }
+    }
+
+    @Override
+    public Integer countProduceScheduleData(SearchScheduleData inData) {
+        //判断是否查询
+        boolean searchFlag = inData.isSearchFlag();
+        if (!searchFlag) {
+            return 0;
+        }
+        Date originalPlanStartTime2 = inData.getPlanStartTime2();
+        try {
+            //把查询时间结束参数添加一天
+            if (originalPlanStartTime2 != null) {
+                inData.setPlanStartTime2(DateUtils.addDateDays(originalPlanStartTime2, 1));
+            }
+            Integer totalCount = scheduleMapper.countProduceScheduleData(inData);
+            return totalCount == null ? 0 : totalCount;
+        } finally {
+            // 避免入参被污染
+            inData.setPlanStartTime2(originalPlanStartTime2);
+        }
     }
 
     @Override
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 737162b..0b5cf7c 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -238,12 +238,14 @@
 
     <!--查询-待生产工单-->
     <select id="getProduceScheduleData" parameterType="SearchScheduleData" resultType="ScheduleData">
-        <if test='exportFlag != null and exportFlag == "N"'>
-            Select TOP 200 T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo,
-        </if>
-        <if test='exportFlag != null and exportFlag == "Y"'>
-            Select T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo,
-        </if>
+        <choose>
+            <when test='exportFlag != null and exportFlag == "Y"'>
+                Select T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo,
+            </when>
+            <otherwise>
+                Select T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, D.OperationDesc itemDesc, D.PartNo partNo,
+            </otherwise>
+        </choose>
         P.PartDescription partDesc,
         P.Spec spec,
         T.SeqNo seqNo,
@@ -320,6 +322,43 @@
             </if>
         </where>
         Order by SO.bu_no, T.S_ResourceID, ISNULL(T.serial_number, 999999) asc
+        <if test='exportFlag == null or exportFlag == "N"'>
+            OFFSET #{page} ROWS FETCH NEXT #{limit} ROWS ONLY
+        </if>
+    </select>
+
+    <!--查询-待生产工单总数-->
+    <select id="countProduceScheduleData" parameterType="SearchScheduleData" resultType="java.lang.Integer">
+        Select COUNT(1)
+        from SOScheduledRouting as T
+        Left Join SOScheduledList as E on E.Site=T.Site and E.LinkedSeqNo=T.SeqNo and T.S_ResourceID = E.ResourceID,
+        SORouting as D,Part as P,ShopOrder as SO
+        <where>
+            T.Site=D.Site and T.OrderNo=D.OrderNo and T.ItemNo=D.ItemNo and D.Site=P.Site and D.PartNo=P.PartNo
+            and T.site in (Select Site from AccessSite where upper(UserID)=#{username})
+            and T.Site=SO.Site and T.OrderNo=SO.OrderNo and T.OrderNo<![CDATA[ <> ]]>'9999'
+            <if test="site != null and site != ''">
+                AND T.Site like '%' + #{site} + '%'
+            </if>
+            <if test="planStartTime1 != null">
+                and T.PlanStartTime<![CDATA[ >= ]]> #{planStartTime1}
+            </if>
+            <if test="planStartTime2 != null">
+                and T.PlanStartTime<![CDATA[ <= ]]> #{planStartTime2}
+            </if>
+            <if test="resourceId != null and resourceId != ''">
+                AND T.S_ResourceID = #{resourceId}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND T.OrderNo like '%' + #{orderNo} + '%'
+            </if>
+            <if test="seqNo != null and seqNo != ''">
+                AND T.SeqNo like '%' + #{seqNo} + '%'
+            </if>
+            <if test='closedFlag != null and closedFlag == "N"'>
+                and T.ClosedFlag = #{closedFlag}
+            </if>
+        </where>
     </select>
 
     <!--查询操作员信息列表-->