|
@@ -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;
|