|
|
@@ -4842,27 +4842,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
System.out.println("测试001==="+integrated);
|
|
|
}
|
|
|
integratedSteelNums.add(steelNum);
|
|
|
- List<ReportSteelNum> newReportSteelNums=new ArrayList<>();
|
|
|
- //作为完整的钢印号直接去掉
|
|
|
- for (int i = 0; i < reportSteelNums.size(); i++) {
|
|
|
- if(reportSteelNums.get(i).getSteelNum().equals(steelNum)){
|
|
|
- continue;
|
|
|
- }
|
|
|
- newReportSteelNums.add(reportSteelNums.get(i));
|
|
|
- }
|
|
|
- reportSteelNums=newReportSteelNums;
|
|
|
- List<String> newSteelNums=new ArrayList<>();
|
|
|
- for (int i = 0; i < steelNums.size(); i++) {
|
|
|
- if(steelNums.get(i).equals(steelNum)){
|
|
|
- continue;
|
|
|
- }
|
|
|
- newSteelNums.add(steelNums.get(i));
|
|
|
- }
|
|
|
- steelNums=newSteelNums;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //以钢印号为基准，进行计算，剔除完整件数的钢印号 //这个在上面已经去过了
|
|
|
+ //以钢印号为基准，进行计算，剔除完整件数的钢印号
|
|
|
List<String> noCompleteSteelNums = steelNums.stream().filter(s->!integratedSteelNums.contains(s)).collect(Collectors.toList());
|
|
|
|
|
|
//列出每一道工序上的钢印号集合
|
Min