From bfb253ee1b1e75a8a07bc75685f30e74acaa4be1 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 27 Apr 2026 14:10:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(aps):=20=E6=8E=92=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将ApsPlanDetailServiceImpl中的IApsPlanSheetService替换为ApsPlanSheetMapper
- 直接通过mapper进行数据查询操作，减少服务层依赖
- 修复计划表合并逻辑中的边界条件判断问题
- 确保数据起始行和结束行的有效性验证
---
 .../com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java  | 6 +++---
 .../com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java
index 405ba8b3..7496d162 100644
--- a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java
+++ b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java
@@ -21,8 +21,8 @@ import com.klp.aps.domain.vo.ApsPlanDetailVo;
 import com.klp.aps.domain.vo.ApsPlanSheetVo;
 import com.klp.aps.domain.entity.ApsPlanDetail;
 import com.klp.aps.mapper.ApsPlanDetailMapper;
+import com.klp.aps.mapper.ApsPlanSheetMapper;
 import com.klp.aps.service.IApsPlanDetailService;
-import com.klp.aps.service.IApsPlanSheetService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
 
     private final ApsPlanDetailMapper baseMapper;
-    private final IApsPlanSheetService apsPlanSheetService;
+    private final ApsPlanSheetMapper planSheetMapper;
     private final WmsCoilContractRelMapper coilContractRelMapper;
     private final IWmsMaterialCoilService materialCoilService;
 
@@ -223,7 +223,7 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
         if (planSheetId == null) {
             return Collections.emptyList();
         }
-        ApsPlanSheetVo planSheet = apsPlanSheetService.queryById(planSheetId);
+        ApsPlanSheetVo planSheet = planSheetMapper.selectVoById(planSheetId);
         if (planSheet == null || planSheet.getPlanDate() == null) {
             return Collections.emptyList();
         }
diff --git a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java
index 960b0f5f..34554651 100644
--- a/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java
+++ b/klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java
@@ -283,7 +283,7 @@ public class ApsPlanSheetServiceImpl implements IApsPlanSheetService {
 
             // ================== 【核心：前7列自动合并】 ==================
             int dataEndRow = r - 1;
-            if (dataStartRow <= dataEndRow) {
+            if (dataStartRow <= dataEndRow && dataEndRow > dataStartRow) {
                 for (int col = 0; col < 7; col++) { // 0~6 共7列
                     CellRangeAddress region = new CellRangeAddress(
                         dataStartRow,