From cad1d25edc82487986f81e228d848000eca2d04d Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 8 Jul 2026 17:44:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A4=E6=96=AD=E4=BB=A3=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
index cc58db2d7..4bfd025a7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
@@ -221,7 +221,7 @@ public class AutoCallAirShaftTask extends Prun {
                         .collect(Collectors.toList());
                 if (tubeCodes.size() > 0) {
                     // 获取所有dto中的分切计划信息
-                    List<SlitterPlanDistinctDto> filteredListT = getSlitterPlanByTubesDtos(filteredList, papers, tubeCodes);
+                    List<SlitterPlanDistinctDto> filteredListT = getSlitterPlanByTubesDtos(filteredList, papers, tubeCodes, empty.getQzz_generation());
                     if (CollectionUtil.isNotEmpty(filteredListT)) {
                         plans = filteredListT;
                     }
@@ -414,7 +414,8 @@ public class AutoCallAirShaftTask extends Prun {
 
     public List<SlitterPlanDistinctDto> getSlitterPlanByTubesDtos(List<SlitterPlanDistinctDto> filteredList
             , List<MdPbPapervehicle> papers
-            , List<String> tubeCodes) {
+            , List<String> tubeCodes
+            , String qzz_generation) {
         List<SlitterPlanDistinctDto> filteredListT;
         filteredListT = filteredList.stream().filter(dto -> {
             List<PdmBiSlittingproductionplan> checkPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
@@ -437,7 +438,7 @@ public class AutoCallAirShaftTask extends Prun {
             if (CollectionUtil.isEmpty(checkPlans)) {
                 return false;
             }
-            if (dto.getQzz_size().startsWith("3")) {
+            if (dto.getQzz_size().startsWith("3") && qzz_generation.equals(dto.getQzz_generation())) {
                 return true;
             }
             List<String> needTubes = checkPlans.stream().map(p -> {