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); }