From a7468ee86450e81e776ec9a3248cdf160159eabe Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 15 Dec 2023 14:15:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E9=99=90=E5=88=B6=20=E5=88=A4=E6=96=AD=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E7=9B=AE=E5=89=8D=E4=BD=BF=E7=94=A8=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E4=BB=93=E5=BA=93=E6=89=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/OldSystemDataPushConfig.java | 30 +++++++++++++++++++ .../logpm/warehouse/entity/WarehouseLog.java | 3 ++ .../factory/receiver/DealWithDataHandler.java | 6 ++-- .../java/com/logpm/factory/TestService.java | 10 +++++-- .../oldproject/feign/OldWaybillClient.java | 10 +++++++ .../controller/OldSystemPushController.java | 7 ++++- .../impl/WarehouseWaybillServiceImpl.java | 14 ++++----- 7 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java new file mode 100644 index 000000000..c6351e1ae --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -0,0 +1,30 @@ +package org.springblade.common.constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * 老系统仓库 + * 配置允许的仓库ID + */ +public class OldSystemDataPushConfig { + + + private static List warehourseIds = new ArrayList<>(); + + + static { + warehourseIds.add("30"); + warehourseIds.add("38"); + warehourseIds.add("124"); + } + + + public static List getWarehourseIdList(){ + + return warehourseIds; + } + + + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseLog.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseLog.java index 2cab45912..1eb842525 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseLog.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseLog.java @@ -14,6 +14,9 @@ public class WarehouseLog extends BaseEntity { private String args; + /** + * 1 开单数据推送 2 托盘空置 + */ private Integer type; private String brand;//品牌 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index bb4173056..ab9c630d6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -6,6 +6,7 @@ import com.logpm.factory.pan.service.IPanFactoryDataService; import com.logpm.oldproject.feign.IAdvanceDetailClient; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.OldSystemDataPushConfig; import org.springblade.common.constant.RabbitConstant; import org.springblade.common.exception.CustomerException; import org.springblade.core.redis.cache.BladeRedis; @@ -69,9 +70,10 @@ public class DealWithDataHandler { // channel.basicAck(deliveryTag,false); } else { //真正的处理需要的数据 - if ("38".equals(currentWarehouseId) || "124".equals(currentWarehouseId) || "30".equals(currentWarehouseId)) { - try { + if(OldSystemDataPushConfig.getWarehourseIdList().contains(currentWarehouseId)){ + + try { if ("1".equals(status)) { // 始发仓和目的仓入库 diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index 62256ff23..8099f4101 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -36,6 +36,7 @@ import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.OldSystemDataPushConfig; import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.FileLogsUtil; import org.springblade.core.oss.model.BladeFile; @@ -728,9 +729,11 @@ public class TestService { // 获取字典上配置的不 // List htUseOpShops = DictCache.getList("ht_use_op_shops"); // System.out.println(htUseOpShops); - String defaultRoleId = DictBizCache.getValue(DictBizConstant.DEFAULT_MALL_ROLE_ID, DictBizConstant.DEFAULT_MALL_ROLE_ID); +// String defaultRoleId = DictBizCache.getValue(DictBizConstant.DEFAULT_MALL_ROLE_ID, DictBizConstant.DEFAULT_MALL_ROLE_ID); +// +// System.out.println(defaultRoleId); - System.out.println(defaultRoleId); +// System.out.println(OldSystemDataPushConfig.getWarehourseIdList().contains(30+"")); } @@ -781,5 +784,8 @@ public class TestService { } + + + } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OldWaybillClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OldWaybillClient.java index 53730dc2e..2761e9029 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OldWaybillClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OldWaybillClient.java @@ -12,6 +12,8 @@ import com.logpm.oldproject.service.IWayBillService; import jodd.util.StringUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.OldSystemDataPushConfig; +import org.springblade.common.exception.CustomerException; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +46,14 @@ public class OldWaybillClient implements IOldWaybillClient { WayBillEntity byWaybillId = wayBillService.getByWaybillId(Integer.parseInt(waybillId)); + + + // 需要验证当前需要开启的数据推送仓库 + if(!OldSystemDataPushConfig.getWarehourseIdList().contains(byWaybillId.getWarehouseId()+"")){ + log.info(">>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", byWaybillId.getWarehouseId()); + return null; + } + String authCode = oldLogin(byWaybillId.getArriveSiteId() + ""); String url = oldSystemProperties.getUrl() + "openApi/newSystem.WaybillQuery/index?waybillId=" + waybillId; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java index 3d8ce9677..eb7ac9bcb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java @@ -46,6 +46,11 @@ public class OldSystemPushController { // // private final IDistributionStockArticleClient distributionStockArticleClient; + /** + * 该接口需老系统判断这个运单的开单为 当前仓和始发仓为相同才进行推送 + * @param waybillDTOS + * @return + */ @ResponseBody @PostMapping("/sendWaybillData") @ApiOperationSupport(order = 1) @@ -96,7 +101,7 @@ public class OldSystemPushController { WarehouseLog warehouseLog = new WarehouseLog(); warehouseLog.setArgs(JSONObject.toJSONString(map)); warehouseLog.setStatus(1); - warehouseLog.setType(1); + warehouseLog.setType(2); warehouseLogService.save(warehouseLog); //先判断托盘有没有数据 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 7d5e06df6..1c799ccff 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -37,6 +37,7 @@ import com.logpm.warehouse.vo.WarehouseWaybillVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.OldSystemDataPushConfig; import org.springblade.common.constant.TenantNum; import org.springblade.common.constant.order.*; import org.springblade.common.exception.CustomerException; @@ -82,10 +83,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl>>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", wayBillEntity.getWarehouseId()); + throw new CustomerException("当前开单仓库不是目前系统上线运行仓库"); + } String waybillNo = wayBillEntity.getWaybillNo();