|
|
@ -112,7 +112,7 @@ public class SxWorkCellTaktCollectRecordService implements ISxWorkCellTaktCollec
|
|
|
|
List<MesWorkCell> workCellList = prodOrgExtService.getWorkCellListByCenter(model.getOrganizeCode(), model.getWorkCenterCode());
|
|
|
|
List<MesWorkCell> workCellList = prodOrgExtService.getWorkCellListByCenter(model.getOrganizeCode(), model.getWorkCenterCode());
|
|
|
|
workCellList = workCellList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getSeq()))).sorted(Comparator.comparing(MesWorkCell::getSeq).thenComparing(MesWorkCell::getWorkCellCode)).collect(Collectors.toList());
|
|
|
|
workCellList = workCellList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getSeq()))).sorted(Comparator.comparing(MesWorkCell::getSeq).thenComparing(MesWorkCell::getWorkCellCode)).collect(Collectors.toList());
|
|
|
|
for (MesWorkCell workCell : workCellList) {
|
|
|
|
for (MesWorkCell workCell : workCellList) {
|
|
|
|
List<SxWorkCellTaktCollectRecord> recordDbList2Cell = recordDbMap2Cell.get(workCell);
|
|
|
|
List<SxWorkCellTaktCollectRecord> recordDbList2Cell = recordDbMap2Cell.get(workCell.getWorkCellCode());
|
|
|
|
if (CollectionUtils.isEmpty(recordDbList2Cell)) continue;
|
|
|
|
if (CollectionUtils.isEmpty(recordDbList2Cell)) continue;
|
|
|
|
statistics = recordDbList2Cell.stream().filter(o -> null != o).mapToDouble(o -> new Double(o.getWorkTakt())).summaryStatistics();
|
|
|
|
statistics = recordDbList2Cell.stream().filter(o -> null != o).mapToDouble(o -> new Double(o.getWorkTakt())).summaryStatistics();
|
|
|
|
JxCellTaktReportModel result = new JxCellTaktReportModel(model.getOrganizeCode(), model.getWorkCenterCode(), workCell.getWorkCellCode());
|
|
|
|
JxCellTaktReportModel result = new JxCellTaktReportModel(model.getOrganizeCode(), model.getWorkCenterCode(), workCell.getWorkCellCode());
|
|
|
|