From ed6b9f706196397c784acb840735f5dc9f731a48 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 3 Apr 2025 11:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IDistributionNodeWorkService.java | 2 +- .../impl/DistributionNodeWorkServiceImpl.java | 13 ++----------- .../impl/DistributionSignforServiceImpl.java | 6 +++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java index fbdfd7030..b238e9736 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionNodeWorkService.java @@ -148,6 +148,6 @@ public interface IDistributionNodeWorkService { /** * 异常签收 */ - void abnormalDeliveryAbnormalReview(NodeFanoutMsg nodeFanoutMsg, BladeUser user); + void abnormalDeliveryAbnormalReview(NodeFanoutMsg nodeFanoutMsg, BladeUser user); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java index 1abb8e02c..b01707bd7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java @@ -12,16 +12,7 @@ import com.logpm.factorydata.vo.PushData; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.WorkNodeEnums; import org.springblade.common.constant.broadcast.FanoutConstants; -import org.springblade.common.model.CarStartVO; -import org.springblade.common.model.ConsigneeArriveVO; -import org.springblade.common.model.DistributionLoadVO; -import org.springblade.common.model.DistributionReCheckSignVO; -import org.springblade.common.model.DistributionSignforVO; -import org.springblade.common.model.DistributionTaskVO; -import org.springblade.common.model.FanoutMsg; -import org.springblade.common.model.NodeFanoutMsg; -import org.springblade.common.model.ReservationVO; -import org.springblade.common.model.StockUpVO; +import org.springblade.common.model.*; import org.springblade.common.model.workNode.DeliveryOfPickupPlanVO; import org.springblade.common.model.workNode.FinishDistributionTrainVO; import org.springblade.common.model.workNode.PickUpByReCheckVO; @@ -276,7 +267,7 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer } @Override - public void abnormalDeliveryAbnormalReview(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { + public void abnormalDeliveryAbnormalReview(NodeFanoutMsg nodeFanoutMsg, BladeUser user) { try { if (distributionProperties.getSendFanoutMsg()) { rabbitTemplate.convertAndSend(FanoutConstants.distribution.DeliveryAbnormalReview.EXCHANGE, null, com.alibaba.fastjson.JSONObject.toJSONString(nodeFanoutMsg)); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 690002f84..118ff9ef8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -6881,7 +6881,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("1", Collections.singletonList(reservationPackageEntity)); - NodeFanoutMsg nodeFanoutMsg = buildNodeFanoutMsgByAbnormalPackage(reservationEntity, map,distributionLoadscanAbnormalEntity); + NodeFanoutMsg nodeFanoutMsg = buildNodeFanoutMsgByAbnormalPackage(reservationEntity, map,distributionLoadscanAbnormalEntity); distributionNodeWorkService.abnormalDeliveryAbnormalReview(nodeFanoutMsg,AuthUtil.getUser()); //维护包件的预约状态 DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId()); @@ -6902,8 +6902,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl buildNodeFanoutMsgByAbnormalPackage(DistributionReservationEntity reservationEntity, Map map,DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) { - NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); + private NodeFanoutMsg buildNodeFanoutMsgByAbnormalPackage(DistributionReservationEntity reservationEntity, Map map,DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity) { + NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg(); if (LoadingAbnormalTypeConstant.jihuayichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){ nodeFanoutMsg.setNode(WorkNodeEnums.DISTRIBUTION_ABNORMAL_LOADING); }else if (LoadingAbnormalTypeConstant.qianshouyichang.getValue().equals(distributionLoadscanAbnormalEntity.getAbnormalType())){