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 new file mode 100644 index 000000000..73e7fa003 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/TenantNum.java @@ -0,0 +1,17 @@ +package org.springblade.common.constant; + +/** + * 数据传输--租户默认对象 + */ +public class TenantNum {; + + public static final String HUITONGCODE ="627683"; + + /** + * 如果不需要 "" + */ + public static final String DEVAUTH ="-pref"; + + + +} diff --git a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java index de1c9485c..fe3231c21 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java @@ -16,6 +16,7 @@ */ package org.springblade.gateway; +import org.springblade.common.constant.TenantNum; import org.springblade.core.launch.BladeApplication; import org.springblade.core.launch.constant.AppConstant; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -33,7 +34,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class GateWayApplication { public static void main(String[] args) { - BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME, GateWayApplication.class, args); + BladeApplication.run(AppConstant.APPLICATION_GATEWAY_NAME.concat(TenantNum.DEVAUTH), GateWayApplication.class, args); } } diff --git a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java index 6e683eb10..037245f5d 100644 --- a/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java +++ b/blade-ops/blade-xxljob-admin/src/main/java/com/xxl/job/admin/JobAdminApplication.java @@ -1,6 +1,7 @@ package com.xxl.job.admin; import org.springblade.common.constant.LauncherConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.launch.BladeApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class JobAdminApplication { public static void main(String[] args) { - BladeApplication.run(LauncherConstant.APPLICATION_XXLJOB_ADMIN_NAME, JobAdminApplication.class, args); + BladeApplication.run(LauncherConstant.APPLICATION_XXLJOB_ADMIN_NAME.concat(TenantNum.DEVAUTH), JobAdminApplication.class, args); } } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java index 59665d0fc..4c054851f 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/BasicApplication.java @@ -3,6 +3,7 @@ package com.logpm.basic; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -15,7 +16,7 @@ import org.springblade.core.launch.BladeApplication; public class BasicApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_BASIC_NAME, BasicApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_BASIC_NAME.concat(TenantNum.DEVAUTH), BasicApplication.class, args); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index c98b3bd15..c571430c9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -2,6 +2,7 @@ package com.logpm.basicdata; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -14,7 +15,7 @@ import org.springblade.core.launch.BladeApplication; public class BasicDataApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat(TenantNum.DEVAUTH), BasicDataApplication.class, args); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java index de58864a3..249ee2d1b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java @@ -17,6 +17,7 @@ package com.logpm.distribution; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -29,7 +30,7 @@ import org.springblade.core.launch.BladeApplication; public class DistributionApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME.concat(TenantNum.DEVAUTH), DistributionApplication.class, args); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java index d5181a390..2b610e6dc 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/FactoryApplication.java @@ -17,6 +17,7 @@ package com.logpm.factory; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -29,7 +30,7 @@ import org.springblade.core.launch.BladeApplication; public class FactoryApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_FACTORY_NAME, FactoryApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_FACTORY_NAME.concat(TenantNum.DEVAUTH), FactoryApplication.class, args); } } 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 f4a76ca62..a557d1f93 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 @@ -41,6 +41,7 @@ import com.logpm.oldproject.vo.DistributionParcelListEntityVO; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springblade.common.constant.TenantNum; import org.springblade.common.exception.CustomerException; import org.springblade.common.utils.CommonUtil; import org.springblade.core.tool.api.R; @@ -366,6 +367,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setWarehouseEntryTime(date); distributionStockArticleEntity.setTotalNumber(total); distributionStockArticleEntity.setHandQuantity(0); + distributionStockArticleEntity.setTenantId(TenantNum.HUITONGCODE);// 对应租户ID +// distributionStockArticleEntity.setWaybillNumber();// 运单号 + // 需要插入部门 ID + // 创建ID + //判断是否齐套 查询该订单自编号下面的包件是都全部都交由汇通了 Integer allNum = advanceDetailClient.getAllNumByOrderNo(orderSelfNum); if(total.equals(allNum)){ diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java index 73e6d3f10..63dc8543e 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/OldProjectApplication.java @@ -18,6 +18,7 @@ package com.logpm.oldproject; import org.springblade.common.constant.LauncherConstant; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -30,7 +31,7 @@ import org.springblade.core.launch.BladeApplication; public class OldProjectApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_OLDPROJECT_NAME, OldProjectApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_OLDPROJECT_NAME.concat(TenantNum.DEVAUTH), OldProjectApplication.class, args); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java index e923afb8f..69ee71549 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java @@ -18,6 +18,7 @@ package com.logpm.trunkline; import org.springblade.common.constant.LauncherConstant; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -30,7 +31,7 @@ import org.springblade.core.launch.BladeApplication; public class TrunkLineApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME, TrunkLineApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_TRUNKLINE_NAME.concat(TenantNum.DEVAUTH), TrunkLineApplication.class, args); } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java index 090f8e865..56d1bb864 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/WarehouseApplication.java @@ -17,6 +17,7 @@ package com.logpm.warehouse; import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.common.constant.TenantNum; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; @@ -29,7 +30,7 @@ import org.springblade.core.launch.BladeApplication; public class WarehouseApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_WAREHOUSE_NAME.concat("-pref"), WarehouseApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_WAREHOUSE_NAME.concat(TenantNum.DEVAUTH), WarehouseApplication.class, args); } }