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> getCargoTypes(); + /** + * 获取计量单位档案(金蝶推送按计费单位名称匹配取计量单位编码) + * + * @return 计量单位集合 + */ + @GetMapping(MEASUREMENT_UNITS) + R> 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> getMeasurementUnits() { + return R.fail("获取数据失败"); + } + @Override public R> 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> getMeasurementUnits() { + return R.data(measurementUnitService.list(Wrappers.lambdaQuery() + .eq(MeasurementUnit::getIsDeleted, 0) + .orderByAsc(MeasurementUnit::getUnitCode))); + } + @Override @GetMapping(PERMISSIONS) public R> getPermissions(String roleId) {