From 6d0dc9a24a22069b741bde6bdac188ace1a9ad06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 24 Sep 2026 19:41:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E6=9F=A5=E8=AF=A2=20Feign=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/springblade/system/feign/ISysClient.java    | 9 +++++++++
 .../org/springblade/system/feign/ISysClientFallback.java | 5 +++++
 .../java/org/springblade/system/feign/SysClient.java     | 9 +++++++++
 3 files changed, 23 insertions(+)

diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
index 93510a64..c1ebf5b5 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
@@ -73,6 +73,7 @@ public interface ISysClient {
 	String REGION = API_PREFIX + "/region";
 	String FEE_ITEMS = API_PREFIX + "/fee-items";
 	String CARGO_TYPES = API_PREFIX + "/cargo-types";
+	String MEASUREMENT_UNITS = API_PREFIX + "/measurement-units";
 	String PERMISSIONS = API_PREFIX + "/permissions";
 	String INVOICE_ITEMS = API_PREFIX + "/invoice-items";
 
@@ -318,6 +319,14 @@ public interface ISysClient {
 	@GetMapping(CARGO_TYPES)
 	R<List<CargoType>> getCargoTypes();
 
+	/**
+	 * 获取计量单位档案（金蝶推送按计费单位名称匹配取计量单位编码）
+	 *
+	 * @return 计量单位集合
+	 */
+	@GetMapping(MEASUREMENT_UNITS)
+	R<List<MeasurementUnit>> getMeasurementUnits();
+
 	/**
 	 * 获取角色权限标识集合（按钮编号）
 	 *
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
index a750235c..b7704b68 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
@@ -174,6 +174,11 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}
 
+	@Override
+	public R<List<MeasurementUnit>> getMeasurementUnits() {
+		return R.fail("获取数据失败");
+	}
+
 	@Override
 	public R<List<String>> getPermissions(String roleId) {
 		return R.fail("获取数据失败");
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
index 07e04660..edacf506 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
@@ -66,6 +66,7 @@ public class SysClient implements ISysClient {
 
 	private final IFeeItemService feeItemService;
 	private final ICargoTypeService cargoTypeService;
+	private final IMeasurementUnitService measurementUnitService;
 	private final IInvoiceItemService invoiceItemService;
 
 	@Override
@@ -232,6 +233,14 @@ public class SysClient implements ISysClient {
 			.orderByAsc(CargoType::getCargoCode)));
 	}
 
+	@Override
+	@GetMapping(MEASUREMENT_UNITS)
+	public R<List<MeasurementUnit>> getMeasurementUnits() {
+		return R.data(measurementUnitService.list(Wrappers.<MeasurementUnit>lambdaQuery()
+			.eq(MeasurementUnit::getIsDeleted, 0)
+			.orderByAsc(MeasurementUnit::getUnitCode)));
+	}
+
 	@Override
 	@GetMapping(PERMISSIONS)
 	public R<List<String>> getPermissions(String roleId) {