From 792965c822d00dfd4735c32f72b5407a25452bd9 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Sat, 15 Aug 2026 11:14:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/sql/头程数据库统一增量-MySQL8.sql | 2 +- .../com/baiyue/warehouse/service/PartnerImportService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql index fa38bde52..a7b7349cb 100644 --- a/deploy/sql/头程数据库统一增量-MySQL8.sql +++ b/deploy/sql/头程数据库统一增量-MySQL8.sql @@ -13873,7 +13873,7 @@ CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'district', '区县' CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'id', '往来单位ID(雪花ID)'); CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'partner_code', '平台内唯一往来单位编码'); CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'partner_name', '往来单位名称'); -CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'partner_type', '往来单位类型:CUSTOMER、CARRIER、SHIPPER或CONSIGNEE'); +CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'partner_type', '往来单位类型:CARRIER、SHIPPER或CONSIGNEE'); CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'postal_code', '邮政编码'); CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'province', '省或州'); CALL queue_column_comment('baiyue_warehouse', 'wh_partner', 'remark', '备注'); diff --git a/warehouse/src/main/java/com/baiyue/warehouse/service/PartnerImportService.java b/warehouse/src/main/java/com/baiyue/warehouse/service/PartnerImportService.java index 2ea72dd28..2069c48ac 100644 --- a/warehouse/src/main/java/com/baiyue/warehouse/service/PartnerImportService.java +++ b/warehouse/src/main/java/com/baiyue/warehouse/service/PartnerImportService.java @@ -34,7 +34,7 @@ public class PartnerImportService { private static final int MAX_ROWS = 1000; private static final String TEMPLATE_VERSION = "1"; private static final Set ALLOWED_TYPES = Set.of( - "CUSTOMER", "CARRIER", "SHIPPER", "CONSIGNEE"); + "CARRIER", "SHIPPER", "CONSIGNEE"); private static final Pattern EMAIL = Pattern.compile("^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$"); private static final String[] HEADERS = { "单位编码*", "单位名称*", "单位类型*", "联系人*", "联系电话*", "联系邮箱", @@ -53,7 +53,7 @@ public class PartnerImportService { Row instruction = sheet.createRow(1); instruction.createCell(0).setCellValue("说明"); instruction.createCell(1).setCellValue( - "仅新增;类型可用中文逗号或英文逗号分隔:CUSTOMER、CARRIER、SHIPPER、CONSIGNEE;供应商与报关代理请在供应商中心维护;状态为 ACTIVE 或 INACTIVE"); + "仅新增;类型可用中文逗号或英文逗号分隔:CARRIER、SHIPPER、CONSIGNEE;客户来自认证企业,供应商与报关代理请在供应商中心维护;状态为 ACTIVE 或 INACTIVE"); Row header = sheet.createRow(2); for (int i = 0; i < HEADERS.length; i++) { header.createCell(i).setCellValue(HEADERS[i]);