1.修改所有client的调用服务名

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;
 
 }

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";
 
 
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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;
+
 	/**
 	 * 可用数量(在库数-已经预约的包件数)
 	 */

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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);