shiyunteng
2026-10-23 c5ea85558fea4d82b5368073c598a30f905c4bdc
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -43,7 +43,7 @@
   private final ContractSubjectMatterMapper contractSubjectMatterMapper;
   private final PaymentConfirmMapper paymentConfirmMapper;
   private final ContractMapper contractMapper;
   private final ContractPaymentScheduleProcessMapper scheduleProcessMapper;
   private final ProductMapper productMapper;
   private final ContractOutBoundMapper contractOutBoundMapper;
   private final DeliveryOverdueMapper deliveryOverdueMapper;
   private final StringRedisTemplate redisTemplate;
@@ -510,7 +510,8 @@
      for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
         ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
               .eq(ContractSubjectMatter::getContractId, contract.getId())
               .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
               .last("limit 1"));
         outAmount = outAmount.add(outSubjectMatterAddDTO.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
@@ -552,7 +553,8 @@
      addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
         ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
               .eq(ContractSubjectMatter::getContractId, contract.getId())
               .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .ne(ContractSubjectMatter::getDeliveryStatus, 2)
               .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
               .last("limit 1"));
@@ -614,6 +616,22 @@
      outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
      outBound.setSubjectMatterCode(outSubjectMatterAddDTO.getSubjectMatterCode());
      outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
      List<String> smjList = new ArrayList<>();
      smjList.add(smj);
      smjList.add(smjhw);
      if (("" + SecurityUtils.getUser().getCompId()).equals(smj)||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
         Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .in(Product::getCompId, smjList).last("limit 1"));
         if (ObjUtil.isNotNull(product) ) {
            outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
         }
      } else {
         Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
         if (ObjUtil.isNotNull(product) ) {
            outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
         }
      }
      outBound.setOutBoundType("1");
      if (StrUtil.isEmpty(addDTO.getOutBoundType())) {
         outBound.setOutBoundType("0");
@@ -625,6 +643,10 @@
   private R<Contract> vailParam(OutBoundAddDTO addDTO) {
      if (CollUtil.isEmpty(addDTO.getSubjectMatterList())) {
         return R.failed("出库标的物不能为空");
      }
      if (addDTO.getSubjectMatterList().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
            StrUtil.isBlank(contractSubjectMatterAddDTO.getSubjectMatterCode()))){
         return R.failed("标的物的dataId和materialCode不能同时为空");
      }
      // 1. 确定查询用的合同编号字段值
      String targetContractNo = addDTO.getContractNo();
@@ -657,7 +679,8 @@
      for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
         ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
               .eq(ContractSubjectMatter::getContractId, contract.getId())
               .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
               .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
               .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
               .last("limit 1"));
         if (ObjUtil.isNull(subjectMatter)) {
@@ -833,4 +856,25 @@
      baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
      return R.ok();
   }
   @Override
   public R addContractOutSgb(OutBoundAddDTO addDTO) {
      //校验参数
      R<Contract> r = vailParam(addDTO);
      if (!r.isOk()) {
         return r;
      }
      Contract contract = r.getData();
      String batchNumber = genBatchNumber();
      //出库
      handleOutBound(batchNumber,contract, addDTO);
      //保存资金明细
      BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
      //更新合同状态及阶段
      contract.setOutBoundAmout(outBoundAmount);
      updateContractSchedule(contract);
      return R.ok(batchNumber);
   }
}