From 5a73f6e3d1a7726446986ee7305cc02b23eae397 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 20 Dec 2023 12:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E4=BF=9D=E5=AD=98=E5=8C=85?= =?UTF-8?q?=E4=BB=B6=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=96=B9=E6=B3=95=20=E5=A2=9E=E5=8A=A0=E5=88=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...IOrderPackageStatusPushFailLogService.java | 12 +++++ .../impl/FactoryCommonServiceImpl.java | 46 +++++-------------- ...erPackageStatusPushFailLogServiceImpl.java | 45 ++++++++++++++++++ 3 files changed, 68 insertions(+), 35 deletions(-) create mode 100644 blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IOrderPackageStatusPushFailLogService.java create mode 100644 blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IOrderPackageStatusPushFailLogService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IOrderPackageStatusPushFailLogService.java new file mode 100644 index 000000000..60883995b --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IOrderPackageStatusPushFailLogService.java @@ -0,0 +1,12 @@ +package com.logpm.factory.comfac.service; + +import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity; +import com.logpm.factory.snm.entity.OrderStatusLog; +import org.springblade.core.mp.base.BaseService; + +public interface IOrderPackageStatusPushFailLogService extends BaseService { + + + void saveOrderPackageStatusFaleLog(String unitNo, String currentWarehouseId, String status,String operationTime, Integer trayId); + +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java index cf0cfb8e5..ae93cc605 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java @@ -8,6 +8,7 @@ import com.logpm.basicdata.feign.IBasicdataTrayClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.factory.comfac.mapper.OrderPackageStatusPushFailLogMapper; import com.logpm.factory.comfac.service.IFactoryCommonService; +import com.logpm.factory.comfac.service.IOrderPackageStatusPushFailLogService; import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity; import com.logpm.factory.pan.service.IPanFactoryDataService; import com.logpm.oldproject.entity.TrayEntity; @@ -41,7 +42,8 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService { private final IAdvanceDetailClient advanceDetailClient; private final IPanFactoryDataService panFactoryDataService; - private final OrderPackageStatusPushFailLogMapper orderPackageStatusPushFailLogMapper; + + private final IOrderPackageStatusPushFailLogService orderPackageStatusPushFailLogService; private final ITrayClient trayClient; private final ITrayScanClient trayScanClient; @@ -135,7 +137,9 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService { //查询destinationWarehouse logiBillNo plantId数据 Map supplyData = advanceDetailClient.getSupplyData(unitNo); - log.info(">>>>>>>>>>>>>>> extracted supplyData {}",supplyData); + log.info(">>>>>>>>>>>>>>> extracted supplyData {}", supplyData); + + if (supplyData != null && !supplyData.isEmpty()) { String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id @@ -150,53 +154,25 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService { //真正的处理需要的数据 if (OldSystemDataPushConfig.getWarehourseIdList().contains(currentWarehouseId)) { try { - if ("1".equals(status)) { - + if ("1".equals(status) || "4".equals(status)) { // 始发仓和目的仓入库 panFactoryDataService.handleDataToPlatform(unitNo, operationTime); - bladeRedis.setEx("tray-" + unitNo, trayId, 30L); - - } else if ("4".equals(status)) { - panFactoryDataService.handleDataToPlatform(unitNo, operationTime); - } else if ("2".equals(status)) { - bladeRedis.setEx("tray-" + unitNo, trayId, 30L); } else { log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>> 错误的状态"); } - //同步打托数据 // syncTrayTypeData(unitNo, trayId, currentWarehouseId); } catch (Exception e) { - log.error(e.getMessage()); + log.error(">>>> 数据推送异常", e); + orderPackageStatusPushFailLogService.saveOrderPackageStatusFaleLog(unitNo, currentWarehouseId, status, operationTime, trayId); + log.error(">>>> 保存到错误数据推送记录 {}", unitNo); } } } } } else { - log.info("##############dealWithDataHandler: unitNo={} 没有查询到数据 保存到待处理数据库", unitNo); - - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("unit_no", unitNo); - queryWrapper.eq("warehouse_id", currentWarehouseId); - - List list = orderPackageStatusPushFailLogMapper.selectList(queryWrapper); - - if (list == null || list.isEmpty()) { - OrderPackageStatusPushFailLogEntity orderPackageStatusPushFailLogEntity = new OrderPackageStatusPushFailLogEntity(); - orderPackageStatusPushFailLogEntity.setOrderPackageStatus(status); - orderPackageStatusPushFailLogEntity.setUnitNo(unitNo); - orderPackageStatusPushFailLogEntity.setWarehouseId(currentWarehouseId); - orderPackageStatusPushFailLogEntity.setOperationTime(operationTime); - orderPackageStatusPushFailLogEntity.setTrayId(trayId); - orderPackageStatusPushFailLogEntity.setDataStatus(0); - - // 插入之前判断这条数据是否存在系统中 - log.info(">>>>>>>>>>>>>>>> 保存到定时任务队列"); - orderPackageStatusPushFailLogMapper.insert(orderPackageStatusPushFailLogEntity); - }else{ - throw new CustomerException(405, "失败的包件数据状态记录已存在"); - } + orderPackageStatusPushFailLogService.saveOrderPackageStatusFaleLog(unitNo, currentWarehouseId, status, operationTime, trayId); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java new file mode 100644 index 000000000..468d82169 --- /dev/null +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/OrderPackageStatusPushFailLogServiceImpl.java @@ -0,0 +1,45 @@ +package com.logpm.factory.comfac.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.logpm.factory.comfac.mapper.OrderPackageStatusPushFailLogMapper; +import com.logpm.factory.comfac.service.IOrderPackageStatusPushFailLogService; +import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; +import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +public class OrderPackageStatusPushFailLogServiceImpl extends BaseServiceImpl implements IOrderPackageStatusPushFailLogService { + + @Override + public void saveOrderPackageStatusFaleLog(String unitNo, String currentWarehouseId, String status,String operationTime, Integer trayId) { + log.info("##############dealWithDataHandler: unitNo={} 没有查询到数据 保存到待处理数据库", unitNo); + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("unit_no", unitNo); + queryWrapper.eq("warehouse_id", currentWarehouseId); + + List list = baseMapper.selectList(queryWrapper); + + if (list == null || list.isEmpty()) { + OrderPackageStatusPushFailLogEntity orderPackageStatusPushFailLogEntity = new OrderPackageStatusPushFailLogEntity(); + orderPackageStatusPushFailLogEntity.setOrderPackageStatus(status); + orderPackageStatusPushFailLogEntity.setUnitNo(unitNo); + orderPackageStatusPushFailLogEntity.setWarehouseId(currentWarehouseId); + orderPackageStatusPushFailLogEntity.setOperationTime(operationTime); + orderPackageStatusPushFailLogEntity.setTrayId(trayId); + orderPackageStatusPushFailLogEntity.setDataStatus(0); + + // 插入之前判断这条数据是否存在系统中 + log.info(">>>>>>>>>>>>>>>> 保存到定时任务队列"); + baseMapper.insert(orderPackageStatusPushFailLogEntity); + }else{ + throw new CustomerException(405, "失败的包件数据状态记录已存在"); + } + } +}