diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/KingdeeReceiptFlowMapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/KingdeeReceiptFlowMapper.java index 7d69772c..0e6b654d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/KingdeeReceiptFlowMapper.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/KingdeeReceiptFlowMapper.java @@ -27,8 +27,11 @@ package org.springblade.transport.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import org.springblade.transport.pojo.entity.KingdeeReceiptFlow; +import java.util.List; + /** * 金蝶收款流水镜像 Mapper 接口 * @@ -36,4 +39,13 @@ import org.springblade.transport.pojo.entity.KingdeeReceiptFlow; */ @Mapper public interface KingdeeReceiptFlowMapper extends BaseMapper { + + /** + * 组织管理(blade_dept)中的平台公司金蝶组织编码列表(是否平台公司=是 且 已维护金蝶编码) + * + * @return 平台公司金蝶组织编码 + */ + @Select("SELECT kingdee_dept_code FROM blade_dept WHERE is_platform_company = 1 " + + "AND kingdee_dept_code IS NOT NULL AND kingdee_dept_code != '' AND is_deleted = 0") + List selectPlatformOrgNumbers(); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java index 040907c7..a55ca6de 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java @@ -466,6 +466,13 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl orgNumbers = baseMapper.selectPlatformOrgNumbers(); + if (Func.isEmpty(orgNumbers)) { + throw new ServiceException("组织管理中未维护平台公司金蝶编码,无法同步金蝶收款流水,请先检查组织数据"); + } + queryDTO.setOrgNumber(orgNumbers); + log.info("收款流水同步按组织过滤,组织编码:{}", orgNumbers); // 待入库缓冲:累计满 SYNC_BATCH_SIZE 即入库一批并清空 List pending = new ArrayList<>(); Set batchSerials = new HashSet<>();