| | |
|---|
| | | ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId()); |
|---|
| | | productWorkOrder.setCompleteQuantity(productWorkOrder.getCompleteQuantity().add(productQty)); |
|---|
| | | if (ObjectUtils.isNull(productWorkOrder.getActualStartTime())) { |
|---|
| | | productWorkOrder.setActualStartTime(LocalDate.now());//实际开始时间 |
|---|
| | | productWorkOrder.setActualStartTime(LocalDateTime.now());//实际开始时间 |
|---|
| | | } |
|---|
| | | if (productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) == 0) { |
|---|
| | | productWorkOrder.setActualEndTime(LocalDate.now());//实际结束时间 |
|---|
| | | productWorkOrder.setActualEndTime(LocalDateTime.now());//实际结束时间 |
|---|
| | | } |
|---|
| | | productWorkOrderMapper.updateById(productWorkOrder); |
|---|
| | | //生产订单 |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | productOrderMapper.updateById(productOrder); |
|---|
| | | /*添加生产核算*/ |
|---|
| | | /*添加生产核算 区分工序是计件还是计时*/ |
|---|
| | | BigDecimal workHours = (productProcess.getType() == 1) |
|---|
| | | ? productProcess.getSalaryQuota().multiply(productQty) |
|---|
| | | : productProcess.getSalaryQuota(); |
|---|
| | | |
|---|
| | | SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder() |
|---|
| | | .productMainId(productionProductMain.getId()) |
|---|
| | | .schedulingUserId(user.getUserId()) |
|---|
| | | .schedulingUserName(user.getNickName()) |
|---|
| | | .finishedNum(productQty) |
|---|
| | | .workHours(productProcess.getSalaryQuota()) |
|---|
| | | .workHours(workHours) |
|---|
| | | .process(productProcess.getName()) |
|---|
| | | .schedulingDate(LocalDate.now()) |
|---|
| | | .tenantId(dto.getTenantId()) |
|---|
| | |
|---|
| | | public Boolean removeProductMain(Long id) { |
|---|
| | | //判断该条报工是否不合格处理,如果不合格处理了，则不允许删除 |
|---|
| | | List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(Wrappers.<QualityInspect>lambdaQuery().eq(QualityInspect::getProductMainId, id)); |
|---|
| | | List<QualityUnqualified> qualityUnqualifieds = qualityUnqualifiedMapper.selectList(Wrappers.<QualityUnqualified>lambdaQuery() |
|---|
| | | .in(QualityUnqualified::getInspectId, qualityInspects.stream().map(QualityInspect::getId).collect(Collectors.toList()))); |
|---|
| | | if (qualityUnqualifieds.size() > 0 && qualityUnqualifieds.get(0).getInspectState()==1) { |
|---|
| | | throw new ServiceException("该条报工已经不合格处理了，不允许删除"); |
|---|
| | | if (qualityInspects.size() > 0){ |
|---|
| | | List<QualityUnqualified> qualityUnqualifieds = qualityUnqualifiedMapper.selectList(Wrappers.<QualityUnqualified>lambdaQuery() |
|---|
| | | .in(QualityUnqualified::getInspectId, qualityInspects.stream().map(QualityInspect::getId).collect(Collectors.toList()))); |
|---|
| | | if (qualityUnqualifieds.size() > 0 && qualityUnqualifieds.get(0).getInspectState()==1) { |
|---|
| | | throw new ServiceException("该条报工已经不合格处理了，不允许删除"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | ProductionProductMain productionProductMain = productionProductMainMapper.selectById(id); |
|---|
| | | //该报工对应的工艺路线详情 |
|---|
