Commit 2f0f698d authored by 温志超's avatar 温志超

更新拆分工序任务计算逻辑

parent 0517b307
......@@ -1116,17 +1116,13 @@ public class ProTaskServiceImpl implements IProTaskService {
ProTaskWorkunit taskWorkunitSplitConst = proTaskVo.getTaskWorkunit();
BigDecimal splitQuantityConst = taskWorkunitSplitConst.getQuantity();
ExceptionUtil.checkTrueThrowException(
splitQuantityConst.doubleValue() > proTask.getQuantityWait().doubleValue(),
splitQuantityConst.doubleValue() > proTask.getQuantity().subtract(proTask.getQuantityProduced()).doubleValue(),
MessageUtils.message("pro.schedule.error.split.quantity.lack"));
ProTaskWorkunit mainTaskWorkunitVal = null;
if (TaskConst.ASSIST_TASK.equals(type)) {
DoubleSummaryStatistics summaryStatistics = proTaskWorkunits.stream().map(x -> x.getQuantity().subtract(x.getQuantityProduced()).doubleValue()).filter(x -> x > 0).collect(Collectors.summarizingDouble(x -> x));
double sum = summaryStatistics.getSum();
AtomicReference<Double> splitQuantity = new AtomicReference<>(splitQuantityConst.doubleValue());
sortDeduction(proTaskWorkunits, splitQuantity, TaskWorkunitStatusEnum.PREPARE.getStatus());
sortDeduction(proTaskWorkunits, splitQuantity, TaskWorkunitStatusEnum.BEGINNING.getStatus());
sortDeduction(proTaskWorkunits, splitQuantity, TaskWorkunitStatusEnum.PAUSE.getStatus());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment