|
|
@@ -458,7 +458,10 @@ public class IotRyDailyReportController {
|
|
|
.divide(BigDecimal.valueOf(1), 2, RoundingMode.HALF_UP);
|
|
|
reportVO.setDailyFuel(fuel);
|
|
|
}
|
|
|
-
|
|
|
+ // 将 ‘生产配合’ 的值赋值给 ‘其他非生产时间’
|
|
|
+ if (reportVO.getRelocationTime().compareTo(BigDecimal.ZERO) > 0) {
|
|
|
+ reportVO.setOtherProductionTime(reportVO.getRelocationTime());
|
|
|
+ }
|
|
|
// 计算非生产时效
|
|
|
BigDecimal sumNpt = calculateNonProductTime(reportVO);
|
|
|
reportVO.setNonProductionRate(sumNpt.divide(BigDecimal.valueOf(24), 4, RoundingMode.HALF_UP ));
|