2026-04-14

优化

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -3,6 +3,7 @@ package com.gaotao.modules.schedule.controller;
 import com.gaotao.common.annotation.RepeatSubmit;
 import com.gaotao.common.constant.SysMsgConstant;
 import com.gaotao.common.exception.XJException;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
@@ -2160,6 +2161,8 @@ public class ScheduleController extends AbstractController {
             String site = (String) params.get("site");
             String orderNo = (String) params.get("orderNo");
             String partNo = (String) params.get("partNo");
+            Integer page = params.get("page") != null ? Integer.valueOf(params.get("page").toString()) : 1;
+            Integer limit = params.get("limit") != null ? Integer.valueOf(params.get("limit").toString()) : 20;
             
             if (site == null || site.isEmpty()) {
                 return R.error("站点不能为空").put("code", 400);
@@ -2171,12 +2174,11 @@ public class ScheduleController extends AbstractController {
                 return R.error("物料编码不能为空").put("code", 400);
             }
             
-            List<Map<String, Object>> resultList = scheduleService.getMaterialRecordList(site, orderNo, partNo);
+            PageUtils pageUtils = scheduleService.getMaterialRecordList(site, orderNo, partNo, page, limit);
             return R.ok()
                     .put("code", 0)
                     .put("msg", "success")
-                    .put("rows", resultList)
-                    .put("total", resultList.size());
+                    .put("page", pageUtils);
         } catch (Exception e) {
             logger.error("获取领料记录失败", e);
             return R.error("获取领料记录失败: " + e.getMessage())

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -1,5 +1,6 @@
 package com.gaotao.modules.schedule.service;
 
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
@@ -1301,9 +1302,11 @@ public interface ScheduleService {
      * @param site 站点
      * @param orderNo 工单号
      * @param partNo 物料编码
-     * @return 领料记录列表
+     * @param page 当前页
+     * @param limit 每页记录数
+     * @return 领料记录分页数据
      */
-    List<Map<String, Object>> getMaterialRecordList(String site, String orderNo, String partNo);
+    PageUtils getMaterialRecordList(String site, String orderNo, String partNo, int page, int limit);
 
     /**
      * @description: 打开材料卷（重新激活已完成的材料）

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -6,6 +6,7 @@ import com.gaotao.common.constant.SysMsgConstant;
 import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.DateUtil;
 import com.gaotao.common.utils.DateUtils;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.inboundNotification.service.impl.InboundNotificationServiceImpl;
 import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
@@ -5698,8 +5699,10 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
-    public List<Map<String, Object>> getMaterialRecordList(String site, String orderNo, String partNo) {
-        return scheduleMapper.getMaterialRecordList(site, orderNo, partNo);
+    public PageUtils getMaterialRecordList(String site, String orderNo, String partNo, int page, int limit) {
+        com.github.pagehelper.Page<Map<String, Object>> pageInfo = com.github.pagehelper.PageHelper.startPage(page, limit);
+        List<Map<String, Object>> list = scheduleMapper.getMaterialRecordList(site, orderNo, partNo);
+        return new PageUtils(list, (int)pageInfo.getTotal(), limit, page);
     }
 
     /**