diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java index a8444ebf..ab5f19fb 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java @@ -515,10 +515,10 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpllambdaQuery() + .eq(CustomerArchive::getCustomerCode, kingdeeNumber) + .ne(CustomerArchive::getId, customer.getId())); + if (occupied > 0) { + log.warn("金蝶客商编码 {} 已被其他客商占用,跳过采纳客商编号,id={},customerCode={}", + kingdeeNumber, customer.getId(), customer.getCustomerCode()); + return ",金蝶客商编码 " + kingdeeNumber + " 已被占用未同步"; + } + after.setCustomerCode(kingdeeNumber); + return ",客商编号已同步为金蝶客商编码:" + kingdeeNumber; + } + private BfiBillSaveResultItemVO firstSaveItem(BfiBillSaveResultVO result) { if (result == null || result.getResult() == null || result.getResult().isEmpty()) { return null; @@ -739,11 +764,11 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl