From 2e7cf645f9783a40d168ad060230683cb94b9d1d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 12 Dec 2023 11:22:31 +0800 Subject: [PATCH] =?UTF-8?q?mes=20=E7=94=9F=E4=BA=A7=E7=BA=BF=E8=BF=90?= =?UTF-8?q?=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/JxCenterWorkingBoardCenterTwoService.java | 2 +- .../busi/jx/JxCenterWorkingBoardProxyWorkingStatusService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java index 1dcb29c..4119ed4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterTwoService.java @@ -206,7 +206,7 @@ public class JxCenterWorkingBoardCenterTwoService extends JxCenterWorkingBoardCo Map> itemMap2OutPut = getOutPutStatisticsMapByOrderNo(outPutList); - psData.addChartData2ChartDataLists(5, partNo, statisticsPlanQty(orderList, itemMap2OutPut, workCenterExtDb), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataList()) ? "#ffffff" : "#00ff00"); + psData.addChartData2ChartDataLists(5, partNo, statisticsPlanQty(orderList, itemMap2OutPut, workCenterExtDb), getOutPutStatisticsList2AmountQty(outPutList), !CollectionUtils.isEmpty(psData.getChartDataLists()) ? "#ffffff" : "#008000"); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyWorkingStatusService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyWorkingStatusService.java index 3d1ee61..54a4cb5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyWorkingStatusService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardProxyWorkingStatusService.java @@ -61,7 +61,7 @@ public class JxCenterWorkingBoardProxyWorkingStatusService implements IJxCenterW NO_WORKING(0, "无生产", "无生产", "#808080", "gray"), NORMAL_STOP_CENTER(10, "常规停机", "常规停机", "#808080", "gray"), UNNORMAL_STOP_CENTER(20, "非常规停机", "异常停机", "#ff0000", "red"), - NORMAL_PROD(30, "常规生产", "正常生产", "#00ff00", "green"), + NORMAL_PROD(30, "常规生产", "正常生产", "#008000", "green"), UNNORMAL_PROD(40, "非常规生产", "加班生产", "#ff0000", "red"); private int value;