From fa57fe7750c5a3bb953cdc6bcc92355a0b28a6cc Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 13 Aug 2024 15:45:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E5=9B=9E=E6=8E=A8=E8=80=81=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/BusinessData2FactoryHandler.java | 9 +++++--- ...BusinessDataClerkCheck2FactoryHandler.java | 7 ++++++- .../factory/props/MtFactoryProperties.java | 3 +++ .../receiver/HwyOrderStatusHandler.java | 14 ++++++++----- .../receiver/HwyUnloadCarComHandler.java | 8 ++++++- .../factory/receiver/OrderStatusHandler.java | 21 +++++++++++++------ 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessData2FactoryHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessData2FactoryHandler.java index eeaab1ae9..38916fb40 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessData2FactoryHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessData2FactoryHandler.java @@ -1,12 +1,11 @@ package com.logpm.factory.mt.receiver; import com.alibaba.fastjson.JSONObject; -import com.fasterxml.jackson.core.JsonProcessingException; import com.logpm.factory.mt.service.IMtFactoryDataService; +import com.logpm.factory.props.MtFactoryProperties; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; -import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; @@ -30,6 +29,8 @@ public class BusinessData2FactoryHandler { @Autowired private IMtFactoryDataService mtFactoryDataService; + @Autowired + private MtFactoryProperties mtFactoryProperties; @RabbitHandler public void sendOrderPackageScan(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException { @@ -44,7 +45,9 @@ public class BusinessData2FactoryHandler { String destinationWarehouse = object.getString("destinationWarehouse"); try { - mtFactoryDataService.qianshouScanForNewSystem(orderPackageCode, operationTime, distributionContactId, destinationWarehouse); + if(mtFactoryProperties.getSendEnable()){ + mtFactoryDataService.qianshouScanForNewSystem(orderPackageCode, operationTime, distributionContactId, destinationWarehouse); + } } catch (Exception e) { log.error(">>>>>>", e); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessDataClerkCheck2FactoryHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessDataClerkCheck2FactoryHandler.java index b9d1df19f..a12d9f390 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessDataClerkCheck2FactoryHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/receiver/BusinessDataClerkCheck2FactoryHandler.java @@ -3,6 +3,7 @@ package com.logpm.factory.mt.receiver; import com.alibaba.fastjson.JSONObject; import com.logpm.factory.mt.dto.MtReceiveDTO; import com.logpm.factory.mt.service.IMtFactoryDataService; +import com.logpm.factory.props.MtFactoryProperties; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; @@ -29,6 +30,8 @@ public class BusinessDataClerkCheck2FactoryHandler { @Autowired private IMtFactoryDataService mtFactoryDataService; + @Autowired + private MtFactoryProperties mtFactoryProperties; @RabbitHandler public void sendOrderPackageScan(Map map, Message message, Channel channel) throws IOException, NoSuchAlgorithmException { @@ -38,7 +41,9 @@ public class BusinessDataClerkCheck2FactoryHandler { MtReceiveDTO mtReceiveDTO = JSONObject.parseObject(json,MtReceiveDTO.class); try { - mtFactoryDataService.sendReceiveInfoByNewSystem(mtReceiveDTO); + if(mtFactoryProperties.getSendEnable()){ + mtFactoryDataService.sendReceiveInfoByNewSystem(mtReceiveDTO); + } } catch (Exception e) { log.error(">>>>>>", e); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/MtFactoryProperties.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/MtFactoryProperties.java index 6b24adea5..60753cb15 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/MtFactoryProperties.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/props/MtFactoryProperties.java @@ -19,5 +19,8 @@ public class MtFactoryProperties { private String userpwd ; + /** 是否推送梦天 */ + private Boolean sendEnable = true; + } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java index 40b9b481b..466605527 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyOrderStatusHandler.java @@ -6,6 +6,7 @@ import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.oupai.service.IOuPaiFactoryService; import com.logpm.factory.pan.service.IPanFactoryDataService; +import com.logpm.factory.props.MtFactoryProperties; import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.feign.ITrunklineAdvanceClient; import com.rabbitmq.client.Channel; @@ -37,6 +38,7 @@ import java.util.Objects; public class HwyOrderStatusHandler { private final IPanFactoryDataService panFactoryDataService; + private final MtFactoryProperties mtFactoryProperties; private final IMtFactoryDataService mtFactoryDataService; private final IOuPaiFactoryService ouPaiFactoryService; private final ITrunklineAdvanceClient trunklineAdvanceClient; @@ -70,11 +72,13 @@ public class HwyOrderStatusHandler { } break; case FactoryConstant.MENGT: - r = mtFactoryDataService.handleStatusData(orderStatusDTO); - if (r.getCode() == 400 || r.getCode() == 200) { - log.info("TAG {} ##################hwyOrderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.MENGT, orderSelfNum); - } else { - throw new CustomerException(r.getCode(), r.getMsg()); + if(mtFactoryProperties.getSendEnable()){ + r = mtFactoryDataService.handleStatusData(orderStatusDTO); + if (r.getCode() == 400 || r.getCode() == 200) { + log.info("TAG {} ##################hwyOrderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.MENGT, orderSelfNum); + } else { + throw new CustomerException(r.getCode(), r.getMsg()); + } } break; case FactoryConstant.OUPAI: diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java index cdf04f883..563774309 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/HwyUnloadCarComHandler.java @@ -14,6 +14,7 @@ import com.logpm.factory.mt.entity.MtPushData; import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.mt.service.IMtFactoryOrderMainService; import com.logpm.factory.mt.service.IMtPushDataService; +import com.logpm.factory.props.MtFactoryProperties; import com.logpm.factory.snm.vo.MTOrderPackageRelationVO; import com.logpm.factorydata.enums.BrandEnums; import com.logpm.factorydata.vo.NodePushMsg; @@ -61,6 +62,9 @@ public class HwyUnloadCarComHandler { @Autowired private IMtPushDataService mtPushDataService; + @Autowired + private MtFactoryProperties mtFactoryProperties; + @RabbitHandler public void unloadCarComDataHandler(NodePushMsg nodePushMsg, Message message, Channel channel) { @@ -68,7 +72,9 @@ public class HwyUnloadCarComHandler { BrandEnums brand = nodePushMsg.getBrand(); switch (brand) { case MTMM: - pushMentTian(nodePushMsg); + if(mtFactoryProperties.getSendEnable()){ + pushMentTian(nodePushMsg); + } break; } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java index cee58bc3c..cd54d98f5 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java @@ -7,13 +7,18 @@ import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.oupai.service.IOuPaiFactoryService; import com.logpm.factory.pan.service.IPanFactoryDataService; +import com.logpm.factory.props.MtFactoryProperties; import com.logpm.factory.zb.service.IZbFactoryDataService; import com.logpm.oldproject.entity.AdvanceEntity; import com.logpm.oldproject.feign.IAdvanceClient; import com.logpm.oldproject.feign.ITrayClient; import com.logpm.oldproject.feign.ITrayScanClient; import com.logpm.oldproject.feign.ITrayScanDesClient; -import com.logpm.warehouse.feign.*; +import com.logpm.warehouse.feign.IWarehouseTaryAllocationClient; +import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; +import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; +import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; +import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; @@ -50,6 +55,8 @@ public class OrderStatusHandler { private IMtFactoryDataService mtFactoryDataService; @Autowired private IZbFactoryDataService zbFactoryDataService; + @Autowired + private MtFactoryProperties mtFactoryProperties; @Autowired private IOuPaiFactoryService ouPaiFactoryService; @@ -105,11 +112,13 @@ public class OrderStatusHandler { } break; case FactoryConstant.MENGT: - r = mtFactoryDataService.handleStatusData(orderStatusDTO); - if (r.getCode() == 400 || r.getCode() == 200) { - log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.MENGT, orderSelfNum); - } else { - throw new CustomerException(r.getCode(), r.getMsg()); + if(mtFactoryProperties.getSendEnable()){ + r = mtFactoryDataService.handleStatusData(orderStatusDTO); + if (r.getCode() == 400 || r.getCode() == 200) { + log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.MENGT, orderSelfNum); + } else { + throw new CustomerException(r.getCode(), r.getMsg()); + } } break; case FactoryConstant.ZHIBANG: