From 04d325864925417684bb8d7ef7060b73793e1f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Mon, 19 Oct 2026 20:29:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A2=E5=95=86=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=87=91=E8=9D=B6=E5=B7=B2=E5=AD=98=E5=9C=A8=E6=97=B6=E5=AE=A2?=
 =?UTF-8?q?=E5=95=86=E7=BC=96=E5=8F=B7=E9=87=87=E7=BA=B3=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E5=AE=A2=E5=95=86=E7=BC=96=E7=A0=81=E5=B9=B6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerArchiveServiceImpl.java      | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

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 BaseServiceImpl<CustomerArchiveM
 		after.setKingdeeSyncTime(LocalDateTime.now());
 		BfiCustomerVO kingdeeCustomer = queryKingdeeCustomer(customer.getUnifiedCreditCode());
 		if (kingdeeCustomer != null && BfiConstant.BILL_STATUS_AUDITED.equals(kingdeeCustomer.getStatus())) {
-			// 金蝶已有已审核档案：跳过推送
+			// 金蝶已有已审核档案：跳过推送，客商编号采纳金蝶客商编码
 			after.setKingdeeStatus(KINGDEE_STATUS_EXIST);
 			after.setKingdeeFailReason(null);
-			addChangeRecord(id, "金蝶已存在该客商档案，跳过推送", customer, after);
+			addChangeRecord(id, "金蝶已存在该客商档案，跳过推送" + this.adoptKingdeeCode(customer, after, kingdeeCustomer.getNumber()), customer, after);
 			updateById(after);
 			return after;
 		}
@@ -617,6 +617,31 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		return rows == null || rows.isEmpty() ? null : rows.get(0);
 	}
 
+	/**
+	 * 金蝶已存在档案时，客商编号（customer_code）采纳金蝶客商编码，后续业务接口沿用客商编号即拿到金蝶编码；
+	 * 金蝶编码为空或与当前编号一致时无需处理；同租户下已被其他客商占用时跳过回填，避免违反 uk_customer_archive_code 唯一约束
+	 *
+	 * @param customer 变更前档案
+	 * @param after    变更后档案（编码采纳结果回填其上）
+	 * @param kingdeeNumber A902-1 查询返回的金蝶客商编码
+	 * @return 变更说明后缀，无需处理返回空串
+	 */
+	private String adoptKingdeeCode(CustomerArchive customer, CustomerArchive after, String kingdeeNumber) {
+		if (Func.isEmpty(kingdeeNumber) || kingdeeNumber.equals(customer.getCustomerCode())) {
+			return "";
+		}
+		long occupied = count(Wrappers.<CustomerArchive>lambdaQuery()
+			.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<CustomerArchiveM
 			CustomerArchive after = copyCustomer(customer);
 			after.setKingdeeSyncTime(LocalDateTime.now());
 			if (BfiConstant.BILL_STATUS_AUDITED.equals(kingdeeCustomer.getStatus())) {
-				// 金蝶已存在已审核档案：跳过推送，直接建档
+				// 金蝶已存在已审核档案：跳过推送直接建档，客商编号采纳金蝶客商编码
 				after.setKingdeeStatus(KINGDEE_STATUS_EXIST);
 				after.setKingdeeFailReason(null);
 				existed++;
-				collectChangeRecord(changeRecords, customer.getId(), "金蝶已存在该客商档案，跳过推送", customer, after);
+				collectChangeRecord(changeRecords, customer.getId(), "金蝶已存在该客商档案，跳过推送" + this.adoptKingdeeCode(customer, after, kingdeeCustomer.getNumber()), customer, after);
 			} else {
 				// 金蝶侧暂存/已提交：审核中，置失败待重推
 				after.setKingdeeStatus(KINGDEE_STATUS_FAILED);
@@ -821,6 +846,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 				CustomerArchive after = copyCustomer(customer);
 				after.setKingdeeStatus(KINGDEE_STATUS_EXIST);
 				after.setKingdeeFailReason(null);
+				this.adoptKingdeeCode(customer, after, kingdeeCustomer.getNumber());
 				updateList.add(after);
 				collectChangeRecord(changeRecords, customer.getId(), "金蝶客商已审核，推送最终成功", customer, after);
 				log.info("金蝶客商已审核，推送最终成功并升级为金蝶已有档案，id={}，unifiedCreditCode={}",