소스 검색

完工率计算错误处理

yzc 1 년 전
부모
커밋
5efddec561
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

+ 2 - 2
hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -280,14 +280,14 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             if (ObjectUtil.isNotEmpty(productionPlanIds)) {
                 //获取计划下的所有任务
                 List<Long> productionTaskIds = productionTaskService.listObject(ProductionTask::getId,
-                        q -> q.in(ProductionTask::getId, productionPlanIds));
+                        q -> q.in(ProductionTask::getProductionPlanId, productionPlanIds));
                 if (ObjectUtil.isNotEmpty(productionTaskIds)) {
                     count = productionTaskDetailService.count(q ->
                             q.in(ProductionTaskDetail::getProductionTaskId, productionTaskIds)
                                     .eq(ProductionTaskDetail::getFinishStatus, 1));
                 }
             }
-            BigDecimal divide = BigDecimal.valueOf(count).divide(workOrderVo.getQuantity(), 2, RoundingMode.HALF_UP);
+            BigDecimal divide = BigDecimal.valueOf(count).divide(workOrderVo.getQuantity(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
             workOrderVo.setCompletionRate(divide);
         }
         return page;