From 46ebadc5e142ecd547b8b7ef6404b4acb1edead0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Nov 2023 10:15:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E5=85=B4=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java index 1530620..49ea45f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardBusiTwoService.java @@ -178,7 +178,7 @@ public class JxCenterWorkingBoardBusiTwoService implements IJxCenterWorkingBoard return new StringJoiner(MesExtConstWords.SINGLE_SLASH).add(getListSizeStr(orderJobList4Complete)).add(getListSizeStr(orderJobList)).toString(); } - private String getListSizeStr(List list) { return CollectionUtils.isEmpty(list) ? "0" : String.valueOf(list.size()); + private String getListSizeStr(List list) { return CollectionUtils.isEmpty(list) ? MesExtConstWords.ZERO_STR : String.valueOf(list.size()); } private Double getListSizeD(List list) { return new Double(CollectionUtils.isEmpty(list) ? MesExtConstWords.ZERO : list.size()); } @@ -217,9 +217,12 @@ public class JxCenterWorkingBoardBusiTwoService implements IJxCenterWorkingBoard } private JxCenterWorkingBoardBusiModel getProductionSchedule(List workOrderList, List outPutStatisticsList, MesWorkCenterExt workCenterExtDb) { + JxCenterWorkingBoardBusiModel psData = new JxCenterWorkingBoardBusiModel().title("生产计划进度"); + List workOrderList2Sort = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> (null != o && (o.getStartTime().contains(workCenterExtDb.getWorkTime()) || MesExtEnumUtil.WORK_ORDER_STATUS.CLOSE.getValue() != o.getWorkOrderStatus()))).sorted(Comparator.comparing(MesWorkOrder::getSeq)).collect(Collectors.toList()); + Set partNoList = new TreeSet<>(); if (!CollectionUtils.isEmpty(outPutStatisticsList)) partNoList.add(outPutStatisticsList.get(0).getPartNo()); if (!CollectionUtils.isEmpty(workOrderList2Sort)) workOrderList2Sort.stream().filter(o -> null != o).forEach(o -> partNoList.add(o.getPartNo())); @@ -240,7 +243,9 @@ public class JxCenterWorkingBoardBusiTwoService implements IJxCenterWorkingBoard psData.addChartData(partNo, statisticsPlanQty(orderList, itemMap2OutPut, workCenterExtDb), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataList()) ? "#ffffff" : "#00ff00"); } + return psData; + } private Double statisticsPlanQty(List orderList, Map> itemMap2OutPut, MesWorkCenterExt workCenterExtDb) {