shiyunteng
2026-08-24 9c49ede494a10d7e7a322eb2e793afa412ea07e1
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -50,6 +50,12 @@
   @Value("${dept.smj}")
   private String smj;
   @Value("${dept.smjsc}")
   private String smjsc;
   @Value("${dept.smjzt}")
   private String smjzt;
   @Value("${dept.sgb}")
   private String sgb;
@@ -102,7 +108,8 @@
      //出库
      addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
         OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
         if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
         if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
               StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
            outBound.setBatchNumber(generateSMJContractCKNo());
         }
         if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
@@ -398,7 +405,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) {
                  if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                        &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                     //有预付且超过应收 关闭合同状态
                     contract.setContractStatus(3);
                     contractMapper.updateById(contract);
@@ -545,7 +553,8 @@
         contractSubjectMatterMapper.updateById(subjectMatter);
         //
         OutBound outBound = new OutBound();
         if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)){
         if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
               StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
            outBound.setBatchNumber(generateSMJContractCKNo());
         }
         if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
@@ -728,7 +737,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) {
            if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                  &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
               //有预付且超过应收 关闭合同状态
               contract.setContractStatus(3);
               contractMapper.updateById(contract);