|
@@ -167,7 +167,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
int addProgress = report.getProgress() - lastProgress;
|
|
|
curReportTime = (prodProcedureTeam.getWorkTime() * (addProgress)/100);
|
|
|
//按比例获取本次进度的工钱
|
|
|
- BigDecimal earnMoney = prodProcedureTeam.getJobOfMoney().multiply(new BigDecimal(curReportTime)).divide(new BigDecimal(100));
|
|
|
+ BigDecimal earnMoney = prodProcedureTeam.getJobOfMoney().multiply(new BigDecimal(addProgress)).divide(new BigDecimal(100));
|
|
|
report.setWorkingTime(curReportTime);//本次报工的工时数
|
|
|
report.setCost(earnMoney);//本次报工的成本
|
|
|
report.setDeptId(plan.getStationId());
|