diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/workNode/AbnormalPackageData.java b/blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java similarity index 93% rename from blade-biz-common/src/main/java/org/springblade/common/model/workNode/AbnormalPackageData.java rename to blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java index 967d10107..db7df85c0 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/workNode/AbnormalPackageData.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java @@ -1,4 +1,4 @@ -package org.springblade.common.model.workNode; +package org.springblade.common.model; import lombok.AllArgsConstructor; import lombok.Builder; @@ -51,5 +51,7 @@ public class AbnormalPackageData implements Serializable { */ private String auditingUser; + private ReservationVO reservationVO; + } diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java index 415a9b777..23396d321 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java @@ -2,7 +2,6 @@ package org.springblade.common.model; import lombok.Data; -import org.springblade.common.model.workNode.AbnormalPackageData; import java.util.Date; import java.util.List; @@ -83,11 +82,6 @@ public class ReservationVO { */ private List packageDataList; - /** - * 预约异常包件列表 - * - */ - private List abnormalPackageDataList; 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 c91d5a413..a41699a80 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 @@ -187,7 +187,7 @@ import org.springblade.common.enums.BizOperationEnums; import org.springblade.common.enums.PackageTypeEnums; import org.springblade.common.exception.CustomerException; import org.springblade.common.model.*; -import org.springblade.common.model.workNode.AbnormalPackageData; +import org.springblade.common.model.AbnormalPackageData; import org.springblade.common.node.BillLadingNode; import org.springblade.common.node.DeliveryNode; import org.springblade.common.node.ReservationNode; @@ -6903,8 +6903,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())){ @@ -6919,6 +6919,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); List list = map.get("1"); @@ -6929,18 +6935,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl abnormalPackageDataList = new ArrayList<>(); - AbnormalPackageData abnormalPackageData = new AbnormalPackageData(); - abnormalPackageData.setAbnormalType(distributionLoadscanAbnormalEntity.getAbnormalType()); - abnormalPackageData.setPackageCode(distributionLoadscanAbnormalEntity.getPackageCode()); - abnormalPackageData.setTrainNumber(distributionLoadscanAbnormalEntity.getTrainNumber()); - abnormalPackageData.setAuditingTime(distributionLoadscanAbnormalEntity.getAuditingTime()); - abnormalPackageData.setAuditingStatus(distributionLoadscanAbnormalEntity.getAuditingStatus()); - if (!abnormalPackageDataList.isEmpty()) { - reservationVO.setAbnormalPackageDataList(abnormalPackageDataList); - } + abnormalPackageData.setReservationVO(reservationVO); reservationVO.setPackageDataList(packageDataList); - nodeFanoutMsg.setMain(reservationVO); + nodeFanoutMsg.setMain(abnormalPackageData); return nodeFanoutMsg; }