|
@@ -479,9 +479,9 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
dayScl.setValue("1");
|
|
dayScl.setValue("1");
|
|
} else {
|
|
} else {
|
|
if (new BigDecimal(dayScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
|
|
if (new BigDecimal(dayScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
|
|
- report.setValue(produceRecord.getNum().toString());
|
|
|
|
|
|
+ report.setValue(produceRecord.getNum().setScale(2,RoundingMode.HALF_UP).toString());
|
|
} else {
|
|
} else {
|
|
- BigDecimal hyDayValue = new BigDecimal(produceRecord.getNum().toString()).divide(new BigDecimal(dayScl.getValue()), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3 * 1000)).setScale(2);
|
|
|
|
|
|
+ BigDecimal hyDayValue = new BigDecimal(produceRecord.getNum().toString()).divide(new BigDecimal(dayScl.getValue()), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3 * 1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
report.setValue(hyDayValue.toString());
|
|
report.setValue(hyDayValue.toString());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -504,7 +504,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
if (new BigDecimal(monthScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
|
|
if (new BigDecimal(monthScl.getValue()).compareTo(new BigDecimal("0")) == 0) {
|
|
report.setValue(monthVO.getTotalValue());
|
|
report.setValue(monthVO.getTotalValue());
|
|
} else {
|
|
} else {
|
|
- BigDecimal hyDayValue = new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(monthScl.getValue()), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3 * 1000)).setScale(2);
|
|
|
|
|
|
+ BigDecimal hyDayValue = new BigDecimal(monthVO.getTotalValue()).divide(new BigDecimal(monthScl.getValue()), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3 * 1000)).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
report.setValue(hyDayValue.toString());
|
|
report.setValue(hyDayValue.toString());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -658,7 +658,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
dto.setUpdateTime(LocalDateTime.now());
|
|
dto.setUpdateTime(LocalDateTime.now());
|
|
Weekend<ProduceReport> weekend3 = new Weekend<>(ProduceReport.class);
|
|
Weekend<ProduceReport> weekend3 = new Weekend<>(ProduceReport.class);
|
|
WeekendCriteria<ProduceReport, Object> weekendCriteria3 = weekend3.weekendCriteria();
|
|
WeekendCriteria<ProduceReport, Object> weekendCriteria3 = weekend3.weekendCriteria();
|
|
- weekendCriteria3.andEqualTo(ProduceReport::getNo, "hy_" + no + "_stock")
|
|
|
|
|
|
+ weekendCriteria3.andEqualTo(ProduceReport::getNo, "hy_" + no.replace("_hy", "_stock"))
|
|
.andEqualTo(ProduceReport::getYear, date.getYear())
|
|
.andEqualTo(ProduceReport::getYear, date.getYear())
|
|
.andEqualTo(ProduceReport::getMonth, date.getMonthValue())
|
|
.andEqualTo(ProduceReport::getMonth, date.getMonthValue())
|
|
.andEqualTo(ProduceReport::getDay, date.getDayOfMonth())
|
|
.andEqualTo(ProduceReport::getDay, date.getDayOfMonth())
|
|
@@ -1111,7 +1111,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
|
|
if (new BigDecimal("0").compareTo(new BigDecimal(dayScl.getValue())) == 0) {
|
|
if (new BigDecimal("0").compareTo(new BigDecimal(dayScl.getValue())) == 0) {
|
|
dayHy.setValue("0");
|
|
dayHy.setValue("0");
|
|
} else {
|
|
} else {
|
|
- BigDecimal hyDayValue = total.divide(new BigDecimal(dayScl.getValue()), 2).multiply(new BigDecimal(0.3));
|
|
|
|
|
|
+ BigDecimal hyDayValue = total.divide(new BigDecimal(dayScl.getValue()), 2).multiply(new BigDecimal(0.3)).setScale(2,RoundingMode.HALF_UP);
|
|
dayHy.setValue(hyDayValue.toString());
|
|
dayHy.setValue(hyDayValue.toString());
|
|
}
|
|
}
|
|
dayHy.setYear(date.getYear());
|
|
dayHy.setYear(date.getYear());
|