入库打印二维码

cuijian

2025-06-18 a65937bb7d85168af8256f917aad1aa12c0b8c1d

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java

@@ -2,13 +2,13 @@

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +21,6 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
@@ -32,11 +31,10 @@
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.jeecg.modules.tms.enums.OutBoundStatusEnum;
import org.jeecg.modules.tms.enums.OutStorehouseType;
import org.jeecg.modules.tms.enums.ToolCirculationStatus;
import org.jeecg.modules.tms.entity.vo.SelectOutboundToolVo;
import org.jeecg.modules.tms.enums.*;
import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
import org.jeecg.modules.tms.convert.OutboundOrderConvert;
import org.jeecg.modules.tms.mapper.OutboundOrderMapper;
import org.jeecg.modules.tms.service.*;
import org.springframework.stereotype.Service;
@@ -45,6 +43,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;

@@ -69,6 +68,8 @@
   @Autowired
   private IBaseToolsService baseToolsService;
   @Autowired
   private IToolsSharpeningService toolsSharpeningService;
   @Autowired
   private ISysBusinessCodeRuleService businessCodeRuleService;
   @Autowired
   private IFlowDefinitionService flowDefinitionService;
@@ -84,6 +85,8 @@
   private OutboundOrderMapper outboundOrderMapper;
   @Autowired
   private OutboundDetailMapper outboundDetailMapper;
   @Autowired
   private OutboundOrderConvert outboundOrderConvert;
   
   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -104,7 +107,7 @@
    @Override
   @Transactional(rollbackFor = Exception.class)
    public void addTotal(OutboundOrderAndDetailDto outboundOrder) {
      OutboundOrder order = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
      OutboundOrder order = outboundOrderConvert.convert(outboundOrder);
      order.setHandler(Objects.requireNonNull(getCurrentUser()).getId());
      order.setOutNum(businessCodeRuleService.generateBusinessCodeSeq("outBoundOrder"));
      order.setOrderStatus(OutBillStatus.DRAFT.getValue());
@@ -135,7 +138,8 @@
      }
      String[] outStatuses = parameterMap.get("outStatus");
      if (outStatuses != null && outStatuses.length > 0) {
         queryWrapper.eq("t.out_status", outStatuses[0]);
         String[] statusArr = outStatuses[0].split(",");
         queryWrapper.in("t.out_status", statusArr);
      }
      String[] startTimes = parameterMap.get("startTime");
      if (startTimes != null && startTimes.length > 0) {
@@ -155,7 +159,7 @@
      //删除所有明细
      outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>()
            .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));
      OutboundOrder outboundOrderUpdate = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
      OutboundOrder outboundOrderUpdate = outboundOrderConvert.convert(outboundOrder);
      outboundOrderMapper.updateById(outboundOrderUpdate);
      List<OutboundDetail> detailList = CollectionUtil.newArrayList();
      outboundOrder.getOutboundDetailList().forEach(item->{
@@ -166,6 +170,7 @@
   }

    @Override
   @Transactional(rollbackFor = Exception.class)
    public void submit(String id) {
      OutboundOrder outboundOrder = getById(id);
      if (outboundOrder == null) {
@@ -174,12 +179,80 @@
      if (!Objects.equals(outboundOrder.getOrderStatus(), OutBillStatus.DRAFT.getValue())) {
         throw new JeecgBootException("无法提交非草稿状态的出库申请单！");
      }
      if (!OutStorehouseType.PREPARATION_OUTBOUND.getValue().equals(outboundOrder.getOutStorehouseType())) {
         //不是从准备单转入的出库申请，执行锁库
         lockOutboundStock(id);
      }
      //启动流程
      if (triggerProcess(outboundOrder)) {
         outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
         updateById(outboundOrder);
      }
      updateById(outboundOrder);
    }

   private boolean lockOutboundStock(String id) {
      List<OutboundDetail> outboundDetailList = outboundDetailService.list(new LambdaQueryWrapper<OutboundDetail>()
            .eq(OutboundDetail::getOutStorehouseId, id));

      LambdaQueryWrapper<ToolLedgerDetail> queryWrapper = new LambdaQueryWrapper<>();
      for (int i = 0; i < outboundDetailList.size(); i++) {
         if (i > 0) {
            queryWrapper.or();
         }
         OutboundDetail detail = outboundDetailList.get(i);
         queryWrapper.or(wrapper ->
               wrapper.eq(StrUtil.isNotBlank(detail.getToolCode()), ToolLedgerDetail::getToolCode, detail.getToolCode())
                     .eq(StrUtil.isNotBlank(detail.getToolId()), ToolLedgerDetail::getToolId, detail.getToolId()) //如果不管到把，该字段为空
         );
      }
      List<ToolLedgerDetail> toolLedgerDetailList = toolLedgerDetailService.list(queryWrapper);
      List<ToolLedgerDetail> toolLedgerDetailUpdateList = CollectionUtil.newArrayList();
      for (OutboundDetail detail : outboundDetailList) {
         String toolCode = detail.getToolCode();
         List<ToolLedgerDetail> ledgerDetailList = toolLedgerDetailList.stream().filter(item -> Objects.equals(item.getToolCode(), toolCode)
               && Objects.equals(item.getToolId(), detail.getToolId())).collect(Collectors.toList());
         BaseTools tools = baseToolsService.getById(toolCode);
         if (CollectionUtil.isEmpty(ledgerDetailList)) {
            throw new JeecgBootException("编码为【" + tools.getToolCode() + "】的工具，库存不足！");
         } else {
            ToolLedgerDetail toolLedgerDetail = ledgerDetailList.get(0);
            if (toolLedgerDetail.getQuantity().compareTo(detail.getOutboundQuantity()) < 0) {
               throw new JeecgBootException("编码为【" + tools.getToolCode() + "】的工具，库存不足！");
            } else {
               //扣减台账明细中的库存，执行锁库
               if (StrUtil.isBlank(detail.getToolId())) {
                  //管到类的刀具
                  toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().subtract(detail.getOutboundQuantity()));
               } else {
                  //管到把的刀具，数量只有 0和1
                  toolLedgerDetail.setQuantity(BigDecimal.ZERO);
               }
               toolLedgerDetailUpdateList.add(toolLedgerDetail);
            }
         }
      }

      Map<String, BigDecimal> outToolCodeQuantityMap = outboundDetailList.stream().collect(Collectors.groupingBy(OutboundDetail::getToolCode,
            Collectors.mapping(OutboundDetail::getOutboundQuantity, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
      Map<String, ToolLedger> toolLedgerMap = toolLedgerService.list(new LambdaQueryWrapper<ToolLedger>().in(ToolLedger::getToolId, outToolCodeQuantityMap.keySet()))
            .stream().collect(Collectors.toMap(ToolLedger::getToolId, toolLedger -> toolLedger, (k1, k2) -> k1));
      List<ToolLedger> toolLedgerUpdateList = CollectionUtil.newArrayList();
      for (String toolCode : outToolCodeQuantityMap.keySet()) {
         BigDecimal outQuantity = outToolCodeQuantityMap.get(toolCode);
         ToolLedger toolLedger = toolLedgerMap.get(toolCode);
         BaseTools tools = baseToolsService.getById(toolCode);
         if (Objects.isNull(toolLedger) || toolLedger.getAvailableCount().compareTo(outQuantity) < 0) {
            throw new JeecgBootException("编码为【" + tools.getToolCode() + "】的工具，库存不足！");
         } else {
            //扣减台账主表中的可用存库，执行锁库
            toolLedger.setAvailableCount(toolLedger.getAvailableCount().subtract(outQuantity));
            toolLedgerUpdateList.add(toolLedger);
         }
      }
      toolLedgerDetailService.updateBatchById(toolLedgerDetailUpdateList);
      toolLedgerService.updateBatchById(toolLedgerUpdateList);
      return true;
   }

   @Transactional(rollbackFor = Exception.class)
   @Override
@@ -236,11 +309,63 @@
         if (OutBillStatus.REJECTED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
            //如果驳回，审批单状态回到草稿
            outboundOrder.setOrderStatus(OutBillStatus.DRAFT.getValue());
            //释放申请单中锁定的库存
            releaseStock(outboundOrder);
         }
         outboundOrder.setAuditDate(new Date());
         outboundOrder.setApprovalOpinion(outBoundOrderFlowDto.getApprovalOpinion());
         updateById(outboundOrder);
      }
   }

   private void releaseStock(OutboundOrder outboundOrder) {
      List<OutboundDetail> outboundDetailList = outboundDetailService.list(new LambdaQueryWrapper<OutboundDetail>()
            .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));

      LambdaQueryWrapper<ToolLedgerDetail> queryWrapper = new LambdaQueryWrapper<>();
      for (int i = 0; i < outboundDetailList.size(); i++) {
         if (i > 0) {
            queryWrapper.or();
         }
         OutboundDetail detail = outboundDetailList.get(i);
         queryWrapper.or(wrapper ->
               wrapper.eq(StrUtil.isNotBlank(detail.getToolCode()), ToolLedgerDetail::getToolCode, detail.getToolCode())
                     .eq(StrUtil.isNotBlank(detail.getToolId()), ToolLedgerDetail::getToolId, detail.getToolId()) //如果不管到把，该字段为空
         );
      }
      List<ToolLedgerDetail> toolLedgerDetailList = toolLedgerDetailService.list(queryWrapper);
      List<ToolLedgerDetail> toolLedgerDetailUpdateList = CollectionUtil.newArrayList();
      for (OutboundDetail detail : outboundDetailList) {
         Optional<ToolLedgerDetail> optonal = toolLedgerDetailList.stream().filter(item -> Objects.equals(item.getToolCode(), detail.getToolCode())
               && Objects.equals(item.getToolId(), detail.getToolId())).findFirst();
         if (optonal.isPresent()) {
            ToolLedgerDetail toolLedgerDetail = optonal.get();
            if (StrUtil.isBlank(detail.getToolId())) {
               //到类
               toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().add(detail.getOutboundQuantity()));
            } else {
               //到把
               toolLedgerDetail.setQuantity(BigDecimal.ONE);
            }
            toolLedgerDetailUpdateList.add(toolLedgerDetail);
         }
      }

      Map<String, BigDecimal> outToolCodeQuantityMap = outboundDetailList.stream().collect(Collectors.groupingBy(OutboundDetail::getToolCode,
            Collectors.mapping(OutboundDetail::getOutboundQuantity, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add))));
      Map<String, ToolLedger> toolLedgerMap = toolLedgerService.list(new LambdaQueryWrapper<ToolLedger>().in(ToolLedger::getToolId, outToolCodeQuantityMap.keySet()))
            .stream().collect(Collectors.toMap(ToolLedger::getToolId, toolLedger -> toolLedger, (k1, k2) -> k1));
      List<ToolLedger> toolLedgerUpdateList = new ArrayList<>();
      for (String baseToolId : outToolCodeQuantityMap.keySet()) {
         BigDecimal outQuantity = outToolCodeQuantityMap.get(baseToolId);
         ToolLedger toolLedger = toolLedgerMap.get(baseToolId);
         if (Objects.nonNull(toolLedger)) {
            toolLedger.setAvailableCount(toolLedger.getAvailableCount().add(outQuantity));
            toolLedgerUpdateList.add(toolLedger);
         }
      }
      toolLedgerDetailService.updateBatchById(toolLedgerDetailUpdateList);
      toolLedgerService.updateBatchById(toolLedgerUpdateList);
   }

   @Override
@@ -262,31 +387,53 @@

      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() : BigDecimal.ZERO));
      Map<String, BigDecimal> useLifeMap = outBoundRequestList.stream()
            .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));

      LambdaQueryWrapper<ToolLedgerDetail> queryWrapper = new LambdaQueryWrapper<>();
      LambdaQueryWrapper<ToolLedgerDetail> ledgerDetailQueryWrapper = new LambdaQueryWrapper<>();
      LambdaQueryWrapper<ToolSharpening> toolSharpenQueryWrapper = new LambdaQueryWrapper<>();
      for (int i = 0; i < outboundDetailList.size(); i++) {
         if (i > 0) {
            queryWrapper.or();
            ledgerDetailQueryWrapper.or();
            toolSharpenQueryWrapper.or();
         }
         OutboundDetail detail = outboundDetailList.get(i);
         queryWrapper.or(wrapper ->
         ledgerDetailQueryWrapper.or(wrapper ->
               wrapper.eq(ToolLedgerDetail::getToolCode, detail.getToolCode())
                     .eq(ToolLedgerDetail::getToolId, detail.getToolId()) //如果不管到把，该字段为空
         );
         toolSharpenQueryWrapper.or(wrapper ->
               wrapper.eq(ToolSharpening::getToolCode, detail.getToolCode())
                     .eq(ToolSharpening::getToolId, detail.getToolId())
                     .eq(ToolSharpening::getSharpeningStatus, SharpenStatus.PENDING.getValue())
         );
      }
      List<ToolLedgerDetail> toolLedgerDetailList = toolLedgerDetailService.list(queryWrapper);
      List<ToolLedgerDetail> toolLedgerDetailList = toolLedgerDetailService.list(ledgerDetailQueryWrapper);
      List<ToolSharpening> toolSharpeningList = toolsSharpeningService.list(toolSharpenQueryWrapper);

      List<ToolLedger> toolLedgerUpdateList = CollectionUtil.newArrayList();
      List<ToolLedgerDetail> toolLedgerDetailUpdateList = CollectionUtil.newArrayList();
      List<OutStoreDetail> outStoreAddList = CollectionUtil.newArrayList();
      List<OutboundDetail> outboundDetailUpdateList = CollectionUtil.newArrayList();
      List<ToolSharpening> toolSharpeningUpdateList = CollectionUtil.newArrayList();

      for (OutboundDetail detail : outboundDetailList) {
         //更新库存台账
         ToolLedger toolLedger = toolLedgerMap.get(detail.getToolCode());
         BigDecimal outboundQuantity = outBoundRequestMap.get(detail.getId());
         BigDecimal ratedLife = ratedLifeMap.get(detail.getId());
         BigDecimal useLife = useLifeMap.get(detail.getId());
         //唯一编码不为空时（管到把）,计算剩余寿命
         BigDecimal remandLife = null;
         if(StringUtils.isNotBlank(detail.getToolId())){
            ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolId,detail.getToolId()).one();
            remandLife = (ratedLife.multiply(toolLedgerDetail.getRemainingPercentage()).subtract(useLife).max(BigDecimal.ZERO)).divide(ratedLife, 4, RoundingMode.HALF_UP);
         }
         OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(outboundOrder.getOutStorehouseType());
         switch (outStorehouseType) {
            case TOOL_BORROW:
@@ -307,31 +454,48 @@
         toolLedgerUpdateList.add(toolLedger);

         //更新台账明细
         BigDecimal finalRemandLife = remandLife;
         toolLedgerDetailList.stream().filter(item -> item.getToolCode().equals(detail.getToolCode()) && item.getToolId().equals(detail.getToolId()))
               .findFirst().ifPresent(item -> {
                  if (StrUtil.isNotBlank(item.getToolId())) {
                     item.setQuantity(BigDecimal.ZERO);
                     switch (outStorehouseType) {
                        case TOOL_BORROW:
                           item.setStatus(ToolCirculationStatus.BORROWED.getValue());
                           break;
                        case MAINTENANCE_OUTBOUND:
                           item.setStatus(ToolCirculationStatus.REPAIRING.getValue());
                           break;
                        case CALIBRATION_OUTBOUND:
                           item.setStatus(ToolCirculationStatus.INSPECTING.getValue());
                           break;
                        case GRINDING_OUTBOUND:
                           item.setStatus(ToolCirculationStatus.GRINDING.getValue());
                           break;
                        default:
                           throw new JeecgBootException("未知的出库类型！");
                     }
                  } else {
                     item.setQuantity(item.getQuantity().subtract(outboundQuantity));
                  switch (outStorehouseType) {
                     case TOOL_BORROW:
                        item.setStatus(ToolCirculationStatus.BORROWED.getValue());
                        item.setRatedLife(ratedLife);
                        item.setUseLife(useLife);
                        item.setRemainingPercentage(finalRemandLife);
                        break;
                     case MAINTENANCE_OUTBOUND:
                        item.setStatus(ToolCirculationStatus.REPAIRING.getValue());
                        item.setRatedLife(ratedLife);
                        item.setUseLife(useLife);
                        item.setRemainingPercentage(finalRemandLife);
                        break;
                     case CALIBRATION_OUTBOUND:
                        item.setStatus(ToolCirculationStatus.INSPECTING.getValue());
                        item.setRatedLife(ratedLife);
                        item.setUseLife(useLife);
                        item.setRemainingPercentage(finalRemandLife);
                        break;
                     case GRINDING_OUTBOUND:
                        item.setStatus(ToolCirculationStatus.GRINDING.getValue());
                        item.setRatedLife(ratedLife);
                        item.setUseLife(useLife);
                        item.setRemainingPercentage(finalRemandLife);
                        break;
                     default:
                        throw new JeecgBootException("未知的出库类型！");
                  }
                  toolLedgerDetailUpdateList.add(item);
               });

         if (outStorehouseType == OutStorehouseType.GRINDING_OUTBOUND) {
            //更新刃磨单状态
            toolSharpeningList.stream().filter(item -> item.getToolCode().equals(detail.getToolCode()) && item.getToolId().equals(detail.getToolId()))
                  .findFirst().ifPresent(item -> {
                     item.setSharpeningStatus(SharpenStatus.IN_PROGRESS.getValue());
                     toolSharpeningUpdateList.add(item);
                  });
         }

         //记录出库流水
         OutStoreDetail outStoreDetail = new OutStoreDetail()
@@ -341,6 +505,9 @@
               .setGoodsShelvesCode(detail.getOutboundLocation())
               .setOutNumber(outboundQuantity)
               .setOutStorehouseId(outboundOrder.getId())
               .setRatedLife(ratedLife)
               .setUseLife(useLife)
               .setRemainingPercentage(remandLife)
               .setOperateType("1");//1：按申请单
         outStoreAddList.add(outStoreDetail);

@@ -358,6 +525,7 @@
      toolLedgerDetailService.updateBatchById(toolLedgerDetailUpdateList);
      outStoreDetailService.saveBatch(outStoreAddList);
      outboundDetailService.updateBatchById(outboundDetailUpdateList);
      toolsSharpeningService.updateBatchById(toolSharpeningUpdateList);

      //更新申请单
      boolean allMatch = outboundDetailService.list(new LambdaQueryWrapper<OutboundDetail>()
@@ -419,10 +587,15 @@
            .toMap(OutBoundAddDto::getToolLedgerDetailId, item -> item, (k1, k2) -> k1));
      Map<String, ToolLedgerDetail> toolLedgerDetailMap = toolLedgerDetailService.listByIds(boundAddDtoMap.keySet()).stream()
            .collect(Collectors.toMap(ToolLedgerDetail::getId, item -> item, (k1, k2) -> k1));
      List<ToolSharpening> toolSharpeningList = toolsSharpeningService.list(new LambdaQueryWrapper<ToolSharpening>()
            .in(ToolSharpening::getToolCode, toolBoundQuantityMap.keySet()).eq(ToolSharpening::getSharpeningStatus, SharpenStatus.PENDING.getValue()));
      List<ToolLedgerDetail> toolLedgerDetailUpdateList = CollectionUtil.newArrayList();
      List<ToolSharpening> toolSharpeningUpdateList = CollectionUtil.newArrayList();
      for (String toolLedgerDetailId : boundAddDtoMap.keySet()) {
         OutBoundAddDto outBoundAddDto = boundAddDtoMap.get(toolLedgerDetailId);
         BigDecimal outboundQuantity = outBoundAddDto.getOutboundQuantity();
         BigDecimal ratedLife = outBoundAddDto.getRatedLife();
         BigDecimal useLife = outBoundAddDto.getUseLife();
         ToolLedgerDetail toolLedgerDetail = toolLedgerDetailMap.get(toolLedgerDetailId);
         if (Objects.isNull(toolLedgerDetail) || toolLedgerDetail.getQuantity().compareTo(outboundQuantity) < 0) {
            BaseTools tools = baseToolsService.getById(outBoundAddDto.getToolCode());
@@ -434,20 +607,40 @@
               toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().subtract(outboundQuantity));
            } else {
               //有唯一编码，管道把的
               //计算剩余寿命
               BigDecimal remandLife = (ratedLife.multiply(toolLedgerDetail.getRemainingPercentage()).subtract(useLife).max(BigDecimal.ZERO)).divide(ratedLife, 4, RoundingMode.HALF_UP);
               toolLedgerDetail.setQuantity(BigDecimal.ZERO);//数量只会是0和1
               OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(boundAddList.get(0).getOutStorehouseType());
               switch (outStorehouseType) {
                  case TOOL_BORROW:
                     toolLedgerDetail.setStatus(ToolCirculationStatus.BORROWED.getValue());
                     toolLedgerDetail.setRatedLife(ratedLife);
                     toolLedgerDetail.setUseLife(useLife);
                     toolLedgerDetail.setRemainingPercentage(remandLife);
                     break;
                  case MAINTENANCE_OUTBOUND:
                     toolLedgerDetail.setStatus(ToolCirculationStatus.REPAIRING.getValue());
                     toolLedgerDetail.setRatedLife(ratedLife);
                     toolLedgerDetail.setUseLife(useLife);
                     toolLedgerDetail.setRemainingPercentage(remandLife);
                     break;
                  case CALIBRATION_OUTBOUND:
                     toolLedgerDetail.setStatus(ToolCirculationStatus.INSPECTING.getValue());
                     toolLedgerDetail.setRatedLife(ratedLife);
                     toolLedgerDetail.setUseLife(useLife);
                     toolLedgerDetail.setRemainingPercentage(remandLife);
                     break;
                  case GRINDING_OUTBOUND:
                     toolLedgerDetail.setStatus(ToolCirculationStatus.GRINDING.getValue());
                     toolLedgerDetail.setRatedLife(ratedLife);
                     toolLedgerDetail.setUseLife(useLife);
                     toolLedgerDetail.setRemainingPercentage(remandLife);
                     //同时更新刃磨单状态
                     toolSharpeningList.stream().filter(item -> item.getToolCode().equals(outBoundAddDto.getToolCode())
                           && item.getToolId().equals(outBoundAddDto.getToolId())).findFirst().ifPresent(item -> {
                        item.setSharpeningStatus(SharpenStatus.IN_PROGRESS.getValue());
                        toolSharpeningUpdateList.add(item);
                     });
                     break;
                  default:
                     throw new JeecgBootException("未知的出库类型！");
@@ -458,21 +651,74 @@
      }
      toolLedgerService.updateBatchById(toolLedgerUpdateList);
      toolLedgerDetailService.updateBatchById(toolLedgerDetailUpdateList);
      toolsSharpeningService.updateBatchById(toolSharpeningUpdateList);
      //记录出库流水
      List<OutStoreDetail> outStoreAddList = CollectionUtil.newArrayList();
      for (OutBoundAddDto outBoundAddDto : boundAddList) {
         //获取剩余寿命
         ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.getById(outBoundAddDto.getToolLedgerDetailId());
         OutStoreDetail outStoreDetail = new OutStoreDetail()
               .setToolCode(outBoundAddDto.getToolCode())
               .setToolId(outBoundAddDto.getToolId())
               .setOutStorehouseType(outBoundAddDto.getOutStorehouseType())
               .setGoodsShelvesCode(outBoundAddDto.getOutboundLocation())
               .setOutNumber(outBoundAddDto.getOutboundQuantity())
               .setRatedLife(outBoundAddDto.getRatedLife())
               .setUseLife(outBoundAddDto.getUseLife())
               .setRemainingPercentage(toolLedgerDetail.getRemainingPercentage())
               .setOperateType("2");//2：手工操作
         outStoreAddList.add(outStoreDetail);
      }
      outStoreDetailService.saveBatch(outStoreAddList);
   }

   @Override
   public IPage<SelectOutboundToolVo> querySharpenOutboundToolPageList(Page<SelectOutboundToolVo> page, Map<String, String[]> parameterMap) {
      QueryWrapper<SelectOutboundToolVo> queryWrapper = Wrappers.query();
      String[] toolCodes = parameterMap.get("toolCode");
      if (toolCodes != null && toolCodes.length > 0) {
         queryWrapper.like("t3.tool_code", toolCodes[0]);
      }
      String[] classifyIds = parameterMap.get("classifyId");
      if (classifyIds != null && classifyIds.length > 0) {
         queryWrapper.eq("t3.classify_id", classifyIds[0]);
      }
      String[] excludeIds = parameterMap.get("excludeIds");
      if (excludeIds != null && excludeIds.length > 0) {
         String[] idArray = excludeIds[0].split(",");
         queryWrapper.notIn("t1.id", idArray);
      }
      queryWrapper.eq("t1.sharpening_status", SharpenStatus.PENDING.getValue());
      return this.baseMapper.querySharpenOutboundToolPageList(page, queryWrapper);
   }

   @Override
   public IPage<SelectOutboundToolVo> queryBorrowOutboundToolPageList(Page<SelectOutboundToolVo> page, Map<String, String[]> parameterMap) {
      QueryWrapper<SelectOutboundToolVo> queryWrapper = Wrappers.query();
      String[] toolCodes = parameterMap.get("toolCode");
      if (toolCodes != null && toolCodes.length > 0) {
         queryWrapper.like("p.tool_code", toolCodes[0]);
      }
      String[] statuses = parameterMap.get("status");
      if (statuses != null && statuses.length > 0) {
         queryWrapper.eq("t.status", statuses[0]);
      }
      String[] quantities = parameterMap.get("quantity");
      if (quantities != null && quantities.length > 0) {
         queryWrapper.gt("t.quantity", quantities[0]);
      }
      String[] classifyIds = parameterMap.get("classifyId");
      if (classifyIds != null && classifyIds.length > 0) {
         queryWrapper.eq("p.classify_id", classifyIds[0]);
      }
      String[] excludeIds = parameterMap.get("excludeIds");
      if (excludeIds != null && excludeIds.length > 0) {
         String[] idArray = excludeIds[0].split(",");
         queryWrapper.notIn("t.id", idArray);
      }
      return this.baseMapper.queryBorrowOutboundToolPageList(page, queryWrapper);
   }


   private boolean fromOneApply(List<OutBoundRequestDto> outBoundRequestList) {
      long count = outBoundRequestList.stream().map(OutBoundRequestDto::getOutBoundOrderId).distinct().count();