From 8b03f63f62aedfbb95235c94d28c6361ed7f2cd8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 17 Jul 2023 19:27:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89client?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8=E6=9C=8D=E5=8A=A1=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/ModuleNameConstant.java | 14 +++++++------- .../org/springblade/common/constant/TenantNum.java | 2 +- .../basic/feign/IBasicDelineMiddleClient.java | 2 +- .../logpm/basic/feign/IBasicMaterialClient.java | 7 +++---- .../basicdata/feign/IBasicdataBasicCostClient.java | 5 +++-- .../feign/IBasicdataBrandCategoryClient.java | 5 +++-- .../basicdata/feign/IBasicdataBrandClient.java | 2 +- .../basicdata/feign/IBasicdataCategoryClient.java | 5 +++-- .../basicdata/feign/IBasicdataClientClient.java | 2 +- .../basicdata/feign/IBasicdataCodeClient.java | 2 +- .../feign/IBasicdataCostCorrelationClient.java | 5 +++-- .../feign/IBasicdataCustomerBaseClient.java | 5 +++-- .../feign/IBasicdataCustomerStoreClient.java | 5 +++-- .../basicdata/feign/IBasicdataFreightClient.java | 5 +++-- .../feign/IBasicdataGoodsAllocationClient.java | 3 ++- .../basicdata/feign/IBasicdataGoodsAreaClient.java | 3 ++- .../feign/IBasicdataGoodsShelfClient.java | 3 ++- .../feign/IBasicdataHistoricalContractClient.java | 5 +++-- .../feign/IBasicdataPriceCorrelationClient.java | 5 +++-- .../basicdata/feign/IBasicdataShopClient.java | 5 +++-- .../feign/IBasicdataStorageServicesClient.java | 5 +++-- .../feign/IBasicdataStoreBrandClient.java | 5 +++-- .../feign/IBasicdataStoreContactClient.java | 2 +- .../feign/IBasicdataSupportValueClient.java | 5 +++-- .../basicdata/feign/IBasicdataTeamGroupClient.java | 5 +++-- .../basicdata/feign/IBasicdataTeamStaffClient.java | 5 +++-- .../basicdata/feign/IBasicdataTrayClient.java | 3 ++- .../feign/IBasicdataTripartiteMallClient.java | 5 +++-- .../basicdata/feign/IBasicdataWarehouseClient.java | 2 +- .../basicdata/feign/IBasicdataZonePriceClient.java | 5 +++-- .../entity/DistributionStockArticleEntity.java | 14 ++++++++++++++ .../feign/IDistributionAddvalueClient.java | 5 +++-- .../feign/IDistributionClientMessageClient.java | 5 +++-- .../feign/IDistributionDeliveryDetailsClient.java | 2 +- .../feign/IDistributionDeliveryInfoClient.java | 5 +++-- .../feign/IDistributionDeliverySelfClient.java | 5 +++-- .../IDistributionDeliveryTripartiteClient.java | 5 +++-- .../feign/IDistributionParcelDetailsClient.java | 2 +- .../feign/IDistributionPrintClient.java | 5 +++-- .../feign/IDistributionReservationClient.java | 3 ++- ...IDistributionReservationStockarticleClient.java | 5 +++-- .../IDistributionReservationStocklistClient.java | 5 +++-- .../feign/IDistributionServiceLogClient.java | 5 +++-- .../feign/IDistributionStockClient.java | 5 +++-- .../feign/IDistributionStockListClient.java | 10 +++++++--- .../feign/IDistributionStockupClient.java | 5 +++-- .../feign/IDistributionStockupInfoClient.java | 3 ++- .../feign/IDistributionUnpackingDetailsClient.java | 5 +++-- .../feign/IDistrilbutionBillLadingClient.java | 5 +++-- .../feign/IDistrilbutionCallDeliveryClient.java | 5 +++-- .../com/logpm/oldproject/feign/IAdvanceClient.java | 3 ++- .../oldproject/feign/IAdvanceDetailClient.java | 3 ++- .../oldproject/feign/IDetailProductClient.java | 3 ++- .../feign/INewDistributionContactClient.java | 3 ++- .../com/logpm/oldproject/feign/IOrderClient.java | 3 ++- .../logpm/oldproject/feign/IOrderDetailClient.java | 3 ++- .../logpm/oldproject/feign/IServiceNumClient.java | 3 ++- .../logpm/oldproject/feign/IWarehouseClient.java | 3 ++- .../com/logpm/oldproject/feign/IWayBillClient.java | 3 ++- .../feign/IWarehouseWarehousingDetailClient.java | 5 +++-- .../feign/IWarehouseWarehousingEntryClient.java | 5 +++-- .../warehouse/feign/IWarehouseWaybillClient.java | 5 +++-- .../service/impl/PanFactoryDataServiceImpl.java | 4 ++++ 63 files changed, 176 insertions(+), 106 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 1021e46c1..2b1e8ccc8 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,37 +8,37 @@ public interface ModuleNameConstant { /** * 工厂对接服务名称 */ - String APPLICATION_FACTORY_NAME = "logpm-factory"; + String APPLICATION_FACTORY_NAME = "logpm-factory"+TenantNum.DEVAUTH; /** * 工厂对接服务名称 */ - String APPLICATION_OLDPROJECT_NAME = "logpm-old-project"; + String APPLICATION_OLDPROJECT_NAME = "logpm-old-project"+TenantNum.DEVAUTH; /** * 基础信息服务名称 */ - String APPLICATION_BASIC_NAME = "logpm-basic"; + String APPLICATION_BASIC_NAME = "logpm-basic"+TenantNum.DEVAUTH; /** * 基础信息data服务名称 */ - String APPLICATION_BASICDATA_NAME = "logpm-basicdata"; + String APPLICATION_BASICDATA_NAME = "logpm-basicdata"+TenantNum.DEVAUTH; /** * 干线服务名称 */ - String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"; + String APPLICATION_TRUNKLINE_NAME = "logpm-trunkline"+TenantNum.DEVAUTH; /** * 仓库服务名称 */ - String APPLICATION_WAREHOUSE_NAME = "logpm-warehouse"; + String APPLICATION_WAREHOUSE_NAME = "logpm-warehouse"+TenantNum.DEVAUTH; /** * 配送签收服务名称 */ - String APPLICATION_DISTRIBUTION_NAME = "logpm-distribution"; + String APPLICATION_DISTRIBUTION_NAME = "logpm-distribution"+TenantNum.DEVAUTH; } diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java b/blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java index 73e7fa003..3de1ec7b2 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java @@ -10,7 +10,7 @@ public class TenantNum {; /** * 如果不需要 "" */ - public static final String DEVAUTH ="-pref"; + public static final String DEVAUTH ="-zhy"; diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicDelineMiddleClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicDelineMiddleClient.java index 64d3ee995..02f5a1fa9 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicDelineMiddleClient.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicDelineMiddleClient.java @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-25 */ @FeignClient( - value = ModuleNameConstant.APPLICATION_BASIC_NAME + value = ModuleNameConstant.APPLICATION_BASIC_NAME ) public interface IBasicDelineMiddleClient { diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java index 2f3e49097..44f0774f9 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java @@ -16,14 +16,13 @@ */ package com.logpm.basic.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basic.entity.BasicMaterialEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; - /** * 物料基础信息 Feign接口类 * @@ -31,7 +30,7 @@ import java.util.List; * @since 2023-05-26 */ @FeignClient( - value = "logpm-basic-cyz" + value = ModuleNameConstant.APPLICATION_BASIC_NAME ) public interface IBasicMaterialClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBasicCostClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBasicCostClient.java index 0786afbfe..51259eae4 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBasicCostClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBasicCostClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataBasicCostEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-08 */ @FeignClient( - value = "blade-basicdataBasicCost" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataBasicCostClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandCategoryClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandCategoryClient.java index 6821afede..dfd68a934 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandCategoryClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandCategoryClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataBrandCategoryEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-08 */ @FeignClient( - value = "blade-basicdataBrandCategory" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataBrandCategoryClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java index 387d36d68..fafc129dd 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataBrand" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataBrandClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java index fb8d7ad64..5f5a4261e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCategoryClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataCategoryEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-02 */ @FeignClient( - value = "blade-basicdataCategory" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataCategoryClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java index 9c787d6be..eceb6bc6a 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "logpm-basicdata-cyz" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataClientClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCodeClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCodeClient.java index 260047254..04ab9332f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCodeClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCodeClient.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @FeignClient( - value = ModuleNameConstant.APPLICATION_BASICDATA_NAME+"-zhy" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataCodeClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java index 7fcf0d853..236b85fa1 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-31 */ @FeignClient( - value = "blade-basicdataCostCorrelation" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataCostCorrelationClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java index 47c8b36a7..8a5215d5e 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerBaseClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataCustomerBaseEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-09 */ @FeignClient( - value = "blade-basicdataCustomerBase" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataCustomerBaseClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java index 43c12baca..ec3876d1b 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCustomerStoreClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataCustomerStoreEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-09 */ @FeignClient( - value = "blade-basicdataCustomerStore" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataCustomerStoreClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java index 8bdf1fe49..3a0bbc52c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataFreightEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-08 */ @FeignClient( - value = "blade-basicdataFreight" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataFreightClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAllocationClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAllocationClient.java index 1e1591447..e2c9544c8 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAllocationClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAllocationClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-19 */ @FeignClient( - value = "blade-BasicdataGoodsAllocation" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataGoodsAllocationClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java index 388e48ea3..f5493cbcf 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-warehouseGoodsArea" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataGoodsAreaClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsShelfClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsShelfClient.java index 57be9c54f..c09cf0420 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsShelfClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsShelfClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-17 */ @FeignClient( - value = "blade-BasicdataGoodsShelf" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataGoodsShelfClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataHistoricalContractClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataHistoricalContractClient.java index 92d294b5b..2f21b3ee1 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataHistoricalContractClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataHistoricalContractClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataHistoricalContract" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataHistoricalContractClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceCorrelationClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceCorrelationClient.java index 9ef9e6e38..02bda1bfd 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceCorrelationClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataPriceCorrelationClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataPriceCorrelationEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-02 */ @FeignClient( - value = "blade-basicdataPriceCorrelation" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataPriceCorrelationClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataShopClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataShopClient.java index e07a9ed13..6896d09f5 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataShopClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataShopClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataShopEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataShop" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataShopClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java index cfcc1afb4..824fee655 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStorageServicesClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataStorageServicesEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataStorageServices" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataStorageServicesClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java index 7382b07a3..f0254091d 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataStoreBrandEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataStoreBrand" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataStoreBrandClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java index f5d2a53a7..4f78a39cb 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreContactClient.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataStoreContact" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataStoreContactClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataSupportValueClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataSupportValueClient.java index b81c672e1..a89852f77 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataSupportValueClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataSupportValueClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataSupportValueEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-26 */ @FeignClient( - value = "blade-basicdataSupportValue" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataSupportValueClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java index ce4a3a030..b8b2a7f7f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamGroupClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataTeamGroupEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-16 */ @FeignClient( - value = "blade-basicdataTeamGroup" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataTeamGroupClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java index e792ba4b2..16fa2cff4 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTeamStaffClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataTeamStaffEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-16 */ @FeignClient( - value = "blade-basicdataTeamStaff" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataTeamStaffClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java index 57a6a4a07..5406f5b6f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.logpm.basicdata.entity.BasicdataTrayEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-25 */ @FeignClient( - value = "blade-BasicdataTray" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataTrayClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java index 86f13565a..39ca56a4c 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-21 */ @FeignClient( - value = "blade-basicdataTripartiteMall" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataTripartiteMallClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java index 6a27fbd71..26db7453a 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-15 */ @FeignClient( - value ="logpm-basicdata-cyz" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataWarehouseClient { diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataZonePriceClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataZonePriceClient.java index d6d113c62..bafdde9cb 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataZonePriceClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataZonePriceClient.java @@ -16,8 +16,9 @@ */ package com.logpm.basicdata.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.basicdata.entity.BasicdataZonePriceEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-16 */ @FeignClient( - value = "blade-basicdataZonePrice" + value = ModuleNameConstant.APPLICATION_BASICDATA_NAME ) public interface IBasicdataZonePriceClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 2a1a235ff..38fd66505 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -243,6 +243,20 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "收货人") private String consigneePerson; + + /** + * 收货人地址 + */ + @ApiModelProperty(value = "收货人地址") + private String consigneeAddress; + + + /** + * 收货人电话 + */ + @ApiModelProperty(value = "收货人电话") + private String consigneeMobile; + /** * 可用数量(在库数-已经预约的包件数) */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java index f7ea59093..8e5b1c224 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionAddvalueClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionAddvalueEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-15 */ @FeignClient( - value = "addvalue" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionAddvalueClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionClientMessageClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionClientMessageClient.java index 2f30854dc..767f47238 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionClientMessageClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionClientMessageClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionClientMessageEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "blade-distributionClientMessage" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionClientMessageClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java index 15f66aba2..1f9374ab2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryDetailsClient.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-28 */ @FeignClient( - value = "blade-distributionDeliveryDetails" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionDeliveryDetailsClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java index 21ee43d52..4829deb15 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryInfoClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionDeliveryInfoEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-16 */ @FeignClient( - value = "deliveryInfo" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionDeliveryInfoClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliverySelfClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliverySelfClient.java index 2b7801220..8ede8b592 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliverySelfClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliverySelfClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionDeliverySelfEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-07-04 */ @FeignClient( - value = "deliverySelf" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionDeliverySelfClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryTripartiteClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryTripartiteClient.java index c822efac0..f63b7fd34 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryTripartiteClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionDeliveryTripartiteClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionDeliveryTripartiteEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-07-04 */ @FeignClient( - value = "deliveryTripartite" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionDeliveryTripartiteClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelDetailsClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelDetailsClient.java index 26a2fcae2..cebaa4eec 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelDetailsClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelDetailsClient.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-30 */ @FeignClient( - value = "blade-distributionParcelDetails" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionParcelDetailsClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPrintClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPrintClient.java index db618e08d..199b4aee9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPrintClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionPrintClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionPrintEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "blade-distributionPrint" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionPrintClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java index 1e2595e0b..0f52814c7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java @@ -17,6 +17,7 @@ package com.logpm.distribution.feign; import com.logpm.distribution.entity.DistributionReservationEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-12 */ @FeignClient( - value = "blade-reservation" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionReservationClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStockarticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStockarticleClient.java index f8158d584..49e26ac46 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStockarticleClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStockarticleClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionReservationStockarticleEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-28 */ @FeignClient( - value = "reservationStockArticle" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionReservationStockarticleClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStocklistClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStocklistClient.java index 5e640e54b..ef88d2d94 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStocklistClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationStocklistClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionReservationStocklistEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-28 */ @FeignClient( - value = "reservationStockList" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionReservationStocklistClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionServiceLogClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionServiceLogClient.java index ed4e34614..5c168fa41 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionServiceLogClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionServiceLogClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionServiceLogEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "blade-distributionServiceLog" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionServiceLogClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockClient.java index dc04dffbe..2a3a2819b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionStockEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-26 */ @FeignClient( - value = "blade-distributionStock" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionStockClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java index b3b05756e..9ac94c211 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java @@ -16,11 +16,15 @@ */ package com.logpm.distribution.feign; +import com.logpm.distribution.entity.DistributionStockListEntity; import com.logpm.distribution.vo.DistributionStockListVO; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; -import com.logpm.distribution.entity.DistributionStockListEntity; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; /** * 库存品管理 Feign接口类 @@ -29,7 +33,7 @@ import org.springframework.web.bind.annotation.*; * @since 2023-06-15 */ @FeignClient( - value = "logpm-distribution-cyz" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionStockListClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java index 5a0305391..d531fa443 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionStockupEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-15 */ @FeignClient( - value = "blade-distributionStockup" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionStockupClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java index 0eec05e3a..fe3ed568c 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockupInfoClient.java @@ -17,6 +17,7 @@ package com.logpm.distribution.feign; import com.logpm.distribution.entity.DistributionStockupInfoEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "reservationStockup" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionStockupInfoClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionUnpackingDetailsClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionUnpackingDetailsClient.java index f6525f130..195267a1e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionUnpackingDetailsClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionUnpackingDetailsClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistributionUnpackingDetailsEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-07-03 */ @FeignClient( - value = "blade-distributionUnpackingDetails" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistributionUnpackingDetailsClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionBillLadingClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionBillLadingClient.java index eb1513293..eaaf6609e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionBillLadingClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionBillLadingClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistrilbutionBillLadingEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "blade-distrilbutionBillLading" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistrilbutionBillLadingClient { diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionCallDeliveryClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionCallDeliveryClient.java index e973a3712..4c405b3cf 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionCallDeliveryClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistrilbutionCallDeliveryClient.java @@ -16,8 +16,9 @@ */ package com.logpm.distribution.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.distribution.entity.DistrilbutionCallDeliveryEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-14 */ @FeignClient( - value = "blade-distrilbutionCallDelivery" + value = ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME ) public interface IDistrilbutionCallDeliveryClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java index 36e99096f..eb370c556 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java @@ -18,6 +18,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.dto.AdvanceDTO; import com.logpm.oldproject.entity.AdvanceEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.GetMapping; @@ -34,7 +35,7 @@ import java.util.List; * @since 2023-05-10 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IAdvanceClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index 115a64580..b125e9752 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -18,6 +18,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.AdvanceDetailEntity; import com.logpm.oldproject.vo.DistributionParcelListEntityVO; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,7 +34,7 @@ import java.util.Map; * @since 2023-05-10 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IAdvanceDetailClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java index d51ae5a8a..f80ead9ae 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.DetailProductEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -30,7 +31,7 @@ import java.util.List; * @since 2023-05-10 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IDetailProductClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/INewDistributionContactClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/INewDistributionContactClient.java index a78c0032c..75c04dfe8 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/INewDistributionContactClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/INewDistributionContactClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.NewDistributionContactEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-29 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface INewDistributionContactClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java index 2725b5fae..84693842f 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.OrderEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,7 +31,7 @@ import java.util.List; * @since 2023-06-24 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IOrderClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java index e277a8562..74515ee9b 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.OrderDetailEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-24 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IOrderDetailClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java index 85739b578..c59e71faf 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.ServiceNumEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -32,7 +33,7 @@ import java.util.List; * @since 2023-05-10 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IServiceNumClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java index 1021caec4..adf849dc9 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWarehouseClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.WarehouseEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-05-10 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IWarehouseClient { diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java index c8ab26947..b6b384ced 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java @@ -17,6 +17,7 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.WayBillEntity; +import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-06-24 */ @FeignClient( - value = "logpm-old-project" + value = ModuleNameConstant.APPLICATION_OLDPROJECT_NAME ) public interface IWayBillClient { diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingDetailClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingDetailClient.java index 797b5861a..1b28ba25b 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingDetailClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingDetailClient.java @@ -16,8 +16,9 @@ */ package com.logpm.warehouse.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-07-10 */ @FeignClient( - value = "blade-warehouseWarehousingDetail" + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME ) public interface IWarehouseWarehousingDetailClient { diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingEntryClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingEntryClient.java index 6e78632de..ee8c2566c 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingEntryClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWarehousingEntryClient.java @@ -16,8 +16,9 @@ */ package com.logpm.warehouse.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-07-10 */ @FeignClient( - value = "blade-warehouseWarehousingEntry" + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME ) public interface IWarehouseWarehousingEntryClient { diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java index 9563716c1..d3178728f 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java @@ -16,8 +16,9 @@ */ package com.logpm.warehouse.feign; -import org.springblade.core.mp.support.BladePage; import com.logpm.warehouse.entity.WarehouseWaybillEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -29,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @since 2023-07-10 */ @FeignClient( - value = "logpm-warehouse" + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME ) public interface IWarehouseWaybillClient { diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index a557d1f93..1d1c4964b 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -414,7 +414,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); distributionStockArticleEntity.setConsigneeUnit(wayBillEntity.getTakeCompany());//收货单位（经销商） distributionStockArticleEntity.setConsigneePerson(wayBillEntity.getTakePerson());//收货人 + distributionStockArticleEntity.setConsigneeAddress(wayBillEntity.getTakeAddress());//收货人地址 + distributionStockArticleEntity.setConsigneeMobile(wayBillEntity.getTakeMobile());//收货人电话 } + distributionStockArticleEntity.setCreateUser(1123598821738675201L); + id = distributionStockArticleClient.addData(distributionStockArticleEntity); if(id == 0){ logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}",orderSelfNum);