|
@@ -782,6 +782,8 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 生成某一天的生产量
|
|
|
* 生产报表每日统计:每天凌晨1点统计
|
|
@@ -814,7 +816,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(total.toString());
|
|
|
+ report.setValue(new BigDecimal(total.toString()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -830,7 +832,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport yearReport = BeanConverterUtil.copyObjectProperties(yearData, ProduceReport.class);
|
|
|
yearReport.setDate(date);
|
|
|
yearReport.setDataId(yearData.getId());
|
|
|
- yearReport.setValue(yearVO.getTotalValue());
|
|
|
+ yearReport.setValue(new BigDecimal(yearVO.getTotalValue()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
yearReport.setYear(date.getYear());
|
|
|
yearReport.setMonth(date.getMonthValue());
|
|
|
yearReport.setDay(date.getDayOfMonth());
|
|
@@ -844,7 +846,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport monthReport = BeanConverterUtil.copyObjectProperties(monthData, ProduceReport.class);
|
|
|
monthReport.setDate(date);
|
|
|
monthReport.setDataId(monthData.getId());
|
|
|
- monthReport.setValue(monthVO.getTotalValue());
|
|
|
+ monthReport.setValue(new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
monthReport.setYear(date.getYear());
|
|
|
monthReport.setMonth(date.getMonthValue());
|
|
|
monthReport.setDay(date.getDayOfMonth());
|
|
@@ -915,7 +917,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport monthReport = BeanConverterUtil.copyObjectProperties(data, ProduceReport.class);
|
|
|
monthReport.setDate(date);
|
|
|
monthReport.setDataId(data.getId());
|
|
|
- monthReport.setValue(total.toString());
|
|
|
+ monthReport.setValue(new BigDecimal(total.toString()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
monthReport.setYear(date.getYear());
|
|
|
monthReport.setMonth(date.getMonthValue());
|
|
|
monthReport.setDay(date.getDayOfMonth());
|
|
@@ -960,7 +962,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(total.toString());
|
|
|
+ report.setValue(new BigDecimal(total.toString()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -1005,7 +1007,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
|
|
|
report.setDate(date);
|
|
|
report.setDataId(produceData.getId());
|
|
|
- report.setValue(total.toString());
|
|
|
+ report.setValue(new BigDecimal(total.toString()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
report.setYear(date.getYear());
|
|
|
report.setMonth(date.getMonthValue());
|
|
|
report.setDay(date.getDayOfMonth());
|
|
@@ -1021,7 +1023,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport yearReport = BeanConverterUtil.copyObjectProperties(yearData, ProduceReport.class);
|
|
|
yearReport.setDate(date);
|
|
|
yearReport.setDataId(yearData.getId());
|
|
|
- yearReport.setValue(yearVO.getTotalValue());
|
|
|
+ yearReport.setValue(new BigDecimal(yearVO.getTotalValue()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
yearReport.setYear(date.getYear());
|
|
|
yearReport.setMonth(date.getMonthValue());
|
|
|
yearReport.setDay(date.getDayOfMonth());
|
|
@@ -1035,7 +1037,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
ProduceReport monthReport = BeanConverterUtil.copyObjectProperties(monthData, ProduceReport.class);
|
|
|
monthReport.setDate(date);
|
|
|
monthReport.setDataId(monthData.getId());
|
|
|
- monthReport.setValue(monthVO.getTotalValue());
|
|
|
+ monthReport.setValue(new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
monthReport.setYear(date.getYear());
|
|
|
monthReport.setMonth(date.getMonthValue());
|
|
|
monthReport.setDay(date.getDayOfMonth());
|
|
@@ -1114,13 +1116,13 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
|
public List<ProduceReportVO> selectList(ProduceReportDTO dto) {
|
|
|
// 统计某日数据,计算kg-吨的转化
|
|
|
List<ProduceReportVO> list = mapper.selectList(dto);
|
|
|
- for (ProduceReportVO item : list) {// 计算吨
|
|
|
+ /*for (ProduceReportVO item : list) {// 计算吨
|
|
|
if (item.getNo().startsWith("scl_") || item.getNo().startsWith("stock_") || item.getNo().startsWith("xiaoshou") || item.getNo().startsWith("ck_")) {
|
|
|
if (!"0".equals(item.getValue())) {
|
|
|
item.setValue(BigDecimalUtil.valueOf(item.getValue()).divide(new BigDecimal("1000")).toString());
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
return list;
|
|
|
}
|
|
|
|