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 filteredListT = getSlitterPlanByTubesDtos(filteredList, papers, tubeCodes); + List 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 getSlitterPlanByTubesDtos(List filteredList , List papers - , List tubeCodes) { + , List tubeCodes + , String qzz_generation) { List filteredListT; filteredListT = filteredList.stream().filter(dto -> { List checkPlans = slittingproductionplanService.list(new LambdaQueryWrapper() @@ -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 needTubes = checkPlans.stream().map(p -> {