cuijian
2025-06-18 a65937bb7d85168af8256f917aad1aa12c0b8c1d
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
@@ -85,6 +85,8 @@
   private OutboundOrderMapper outboundOrderMapper;
   @Autowired
   private OutboundDetailMapper outboundDetailMapper;
   @Autowired
   private OutboundOrderConvert outboundOrderConvert;
   
   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -105,7 +107,7 @@
    @Override
   @Transactional(rollbackFor = Exception.class)
    public void addTotal(OutboundOrderAndDetailDto outboundOrder) {
      OutboundOrder order = OutboundOrderConvert.INSTANCE.convert(outboundOrder);
      OutboundOrder order = outboundOrderConvert.convert(outboundOrder);
      order.setHandler(Objects.requireNonNull(getCurrentUser()).getId());
      order.setOutNum(businessCodeRuleService.generateBusinessCodeSeq("outBoundOrder"));
      order.setOrderStatus(OutBillStatus.DRAFT.getValue());
@@ -157,7 +159,7 @@
      //删除所有明细
      outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>()
            .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));
      OutboundOrder outboundOrderUpdate = OutboundOrderConvert.INSTANCE.convert(outboundOrder);
      OutboundOrder outboundOrderUpdate = outboundOrderConvert.convert(outboundOrder);
      outboundOrderMapper.updateById(outboundOrderUpdate);
      List<OutboundDetail> detailList = CollectionUtil.newArrayList();
      outboundOrder.getOutboundDetailList().forEach(item->{
@@ -386,9 +388,9 @@
      Map<String, BigDecimal> outBoundRequestMap = outBoundRequestList.stream()
            .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, OutBoundRequestDto::getOutboundQuantity));
      Map<String, BigDecimal> ratedLifeMap = outBoundRequestList.stream()
            .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, dto->dto.getRatedLife() != null ? dto.getRatedLife() : null));
            .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, dto->dto.getRatedLife() != null ? dto.getRatedLife() : BigDecimal.ZERO));
      Map<String, BigDecimal> useLifeMap = outBoundRequestList.stream()
            .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, dto->dto.getUseLife() != null ? dto.getUseLife() : null));
            .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, dto->dto.getUseLife() != null ? dto.getUseLife() : BigDecimal.ZERO));
      //处理库存台账及台账明细
      Map<String, ToolLedger> toolLedgerMap = toolLedgerService.list(new LambdaQueryWrapper<ToolLedger>().in(ToolLedger::getToolId, toolIdList)).stream()
            .collect(Collectors.toMap(ToolLedger::getToolId, item -> item, (k1, k2) -> k1));