root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 判断代数

Browse Source
This commit is contained in:
liyongde
2026-07-08 17:44:38 +08:00
parent 5bc0f50715
commit cad1d25edc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
View File

@@ -221,7 +221,7 @@ public class AutoCallAirShaftTask extends Prun {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (tubeCodes.size() > 0) { if (tubeCodes.size() > 0) {
// 获取所有dto中的分切计划信息 // 获取所有dto中的分切计划信息
List<SlitterPlanDistinctDto> filteredListT = getSlitterPlanByTubesDtos(filteredList, papers, tubeCodes); List<SlitterPlanDistinctDto> filteredListT = getSlitterPlanByTubesDtos(filteredList, papers, tubeCodes, empty.getQzz_generation());
if (CollectionUtil.isNotEmpty(filteredListT)) { if (CollectionUtil.isNotEmpty(filteredListT)) {
plans = filteredListT; plans = filteredListT;
} }
@@ -414,7 +414,8 @@ public class AutoCallAirShaftTask extends Prun {
public List<SlitterPlanDistinctDto> getSlitterPlanByTubesDtos(List<SlitterPlanDistinctDto> filteredList public List<SlitterPlanDistinctDto> getSlitterPlanByTubesDtos(List<SlitterPlanDistinctDto> filteredList
, List<MdPbPapervehicle> papers , List<MdPbPapervehicle> papers
, List<String> tubeCodes) { , List<String> tubeCodes
, String qzz_generation) {
List<SlitterPlanDistinctDto> filteredListT; List<SlitterPlanDistinctDto> filteredListT;
filteredListT = filteredList.stream().filter(dto -> { filteredListT = filteredList.stream().filter(dto -> {
List<PdmBiSlittingproductionplan> checkPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>() List<PdmBiSlittingproductionplan> checkPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
@@ -437,7 +438,7 @@ public class AutoCallAirShaftTask extends Prun {
if (CollectionUtil.isEmpty(checkPlans)) { if (CollectionUtil.isEmpty(checkPlans)) {
return false; return false;
} }
if (dto.getQzz_size().startsWith("3")) { if (dto.getQzz_size().startsWith("3") && qzz_generation.equals(dto.getQzz_generation())) {
return true; return true;
} }
List<String> needTubes = checkPlans.stream().map(p -> { List<String> needTubes = checkPlans.stream().map(p -> {