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 ab5f19fb..bb762f25 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
@@ -277,7 +277,8 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		boolean created = Func.isEmpty(customer.getId());
 		CustomerArchive before = created ? null : ensureCustomerAccessible(customer.getId());
 		if (created) {
-			customer.setCustomerCode(nextCustomerCode());
+			// 新增时金蝶已有客商，前端回填金蝶客商编码，建档直接沿用；未回填则自动生成
+			customer.setCustomerCode(Func.isEmpty(customer.getCustomerCode()) ? this.nextCustomerCode() : customer.getCustomerCode());
 		}
 		CustomerArchive entity = Objects.requireNonNull(BeanUtil.copyProperties(customer, CustomerArchive.class));
 		boolean result = saveOrUpdate(entity);
@@ -979,6 +980,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 	}
 
 	private void prepare(CustomerArchiveVO customer) {
+		customer.setCustomerCode(trimToNull(customer.getCustomerCode()));
 		customer.setShortName(trimToNull(customer.getShortName()));
 		customer.setFullName(trimToEmpty(customer.getFullName()));
 		customer.setCustomerKind(normalizeCustomerKind(customer.getCustomerKind()));
@@ -1048,6 +1050,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 			throw new ServiceException("固定营业期限必须填写营业期限截止日");
 		}
 		validateLength(customer.getShortName(), 20, "客商简称最多20个汉字");
+		validateLength(customer.getCustomerCode(), 20, "客商编号最多20个字符");
 		validateLength(customer.getFullName(), 100, "客商全称最多100个字符");
 		validateLength(customer.getLegalPerson(), 10, "法人/负责人最多10个汉字");
 		validateLength(customer.getContactPhone(), 11, "联系电话必须为11位手机号");