Merge remote-tracking branch 'origin/master'

k94314517

2023-08-18 0eb8b0635a2e50ff1f82bbea890804e73aae59af

 server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java

@@ -1619,7 +1619,7 @@
        Integer produceNum = workorderList.stream().map(s -> s.getPlanNum()).reduce(Constants.ZERO, Integer::sum);
        Integer surplusNum = plans.getNum() - produceNum;
        if(num.compareTo(BigDecimal.valueOf(surplusNum))>0){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"参数错误：超出工单剩余可分配数量");
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"超出当前工序计划可报工数量");
        }
        Workorder param = new Workorder();
        param.setPlanId(autoWorkReportDTO.getPlansId());