1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdProcedureServiceImpl.java

@@ -137,6 +137,12 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
                                     BigDecimal totalWorkingHours=new BigDecimal(String.valueOf(first.get().getWorkingTime()));
                                     totalWorkingHours=totalWorkingHours.multiply(new BigDecimal(plan.get().getNum()));
                                     planProcedureTotal.setTotalWorkingHours(totalWorkingHours.doubleValue());
+                                    if(planProcedureTotal.getTotalProgress()!=0){
+                                        BigDecimal decimal = new BigDecimal(planProcedureTotal.getTotalProgress());
+                                        decimal = decimal.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+                                        BigDecimal multiply = decimal.multiply(new BigDecimal(planProcedureTotal.getTotalWorkingHours()));
+                                        planProcedureTotal.setTotalFillTime(multiply.doubleValue());
+                                    }
                                     //todo:找到用到当前工序的prod_procedure_team (计划分配表) 更新 单价相关数据
                                     List<ProdProcedureTeam> prodProcedureTeams =allProdProcedureTeams.stream().filter(a->a.getPlanProcedureId().equals(planProcedureTotal.getId())).collect(Collectors.toList());
                                     prodProcedureTeams = prodProcedureTeams.stream().sorted(Comparator.comparing(ProdProcedureTeam::getId)).collect(Collectors.toList());