platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -18,6 +18,7 @@
import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -35,6 +36,7 @@
 * @author syt
 * @date 2026-04-29 11:32:05
 */
@Slf4j
@Service
@RequiredArgsConstructor
public class OutBoundServiceImpl extends ServiceImpl<OutBoundMapper, OutBound> implements OutBoundService {
@@ -43,7 +45,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;
@@ -400,7 +402,8 @@
                  PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                        .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                  if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                        && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
                        && contract.getBillingAmout().compareTo(contract.getAmount()) == 0&&
                        StrUtil.isBlank(contract.getNextScheduleName())) {
                     //有预付且超过应收 关闭合同状态
                     contract.setContractStatus(3);
                     contractMapper.updateById(contract);
@@ -429,6 +432,7 @@
      contractOutBound.setLineNo(subjectMatter.getLineNo());
      contractOutBound.setInvoiceStatus("0");
      contractOutBound.setInvoiceNum(new BigDecimal("0"));
      contractOutBound.setUnitPrice(subjectMatter.getUnitPrice());
      contractOutBoundMapper.insert(contractOutBound);
      if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
         // 1. 确定用于比较的基准日期(优先级:计划交货日期 > 合同到期日期)
@@ -575,6 +579,9 @@
         if (subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) == 0) {
            subjectMatter.setDeliveryStatus(2);
         }
         if (StrUtil.isBlank(subjectMatter.getMaterialCode())){
            subjectMatter.setMaterialCode(outSubjectMatterAddDTO.getSubjectMatterCode());
         }
         subjectMatter.setActualDeliveryDate(addDTO.getOutBoundTime());
         contractSubjectMatterMapper.updateById(subjectMatter);
         //保存erp出库
@@ -616,6 +623,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");
@@ -843,13 +866,21 @@
   @Override
   public R addContractOutSgb(OutBoundAddDTO addDTO) {
      String batchNumber = "";
      if (StrUtil.isNotBlank(addDTO.getOutBoundCode())){
         batchNumber = addDTO.getOutBoundCode();
      }else {
         batchNumber = genBatchNumber();
      }
      log.info("出库单号:{}",batchNumber);
      //校验参数
      R<Contract> r = vailParam(addDTO);
      if (!r.isOk()) {
         return r;
      }
      Contract contract = r.getData();
      String batchNumber = genBatchNumber();
      //出库
      handleOutBound(batchNumber,contract, addDTO);