From d70c927c078f73d6c14b69dcfe32ee613e258dfc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Nov 2023 10:38:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E5=85=B4=20=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BA=A7=E9=87=8F=20=E6=98=AF=E8=A6=81?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=95=BF=E5=BA=A6=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/jx/JxCenterWorkingBoardCenterThreeService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java index 238cb5b..861b948 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardCenterThreeService.java @@ -164,9 +164,14 @@ public class JxCenterWorkingBoardCenterThreeService extends JxCenterWorkingBoard } private Double getAmountPlanQty(MesTimeSegmentStatistics timeSegmentStatistics, MesWorkCenterExt workCenterExtDb) { + if (StringUtils.isEmpty(workCenterExtDb.getWorkTakt()) || MathOperation.compareTo(workCenterExtDb.getWorkTakt(), new Double(0)) == 0) return new Double(0); + return MathOperation.mul(new Double(getTimeLength(timeSegmentStatistics, workCenterExtDb.getWorkTime())), workCenterExtDb.getWorkTakt()); + } + + private Double getTimeLength(MesTimeSegmentStatistics timeSegmentStatistics, String workTime) { try { - if (StringUtils.isEmpty(workCenterExtDb.getWorkTakt()) || MathOperation.compareTo(workCenterExtDb.getWorkTakt(), new Double(0)) == 0) return new Double(0); - return MathOperation.mul(new Double(TimeTool.getSecoundsBetweenTime(2, appendWorkTime(timeSegmentStatistics.getStartTime(), workCenterExtDb.getWorkTime()), appendWorkTime(timeSegmentStatistics.getEndTime(), workCenterExtDb.getWorkTime()))), workCenterExtDb.getWorkTakt()); + if (!StringUtils.isEmpty(timeSegmentStatistics.getTimeLength())) return new Double(timeSegmentStatistics.getTimeLength()); + return new Double(TimeTool.getSecoundsBetweenTime(2, appendWorkTime(timeSegmentStatistics.getStartTime(), workTime), appendWorkTime(timeSegmentStatistics.getEndTime(), workTime))); } catch (ParseException e) { return new Double(0); }