From 89e3b9af6f034a652cd3aa9ee52c87b88cdda96c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 3 Apr 2025 11:20:52 +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

---
 ...lPackageData.java => AbnormalPackageVO.java} |  2 +-
 .../impl/DistributionSignforServiceImpl.java    | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)
 rename blade-biz-common/src/main/java/org/springblade/common/model/{AbnormalPackageData.java => AbnormalPackageVO.java} (94%)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java b/blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageVO.java
similarity index 94%
rename from blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java
rename to blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageVO.java
index db7df85c0..7f5784cca 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageData.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/model/AbnormalPackageVO.java
@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class AbnormalPackageData implements Serializable {
+public class AbnormalPackageVO implements Serializable {
 
 	/**
 	 * 审核状态 1-未审核 2-已审核   3-已驳回  4-已取消 5 - 拒签
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 a41699a80..8713b4afa 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
@@ -6919,12 +6919,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		nodeFanoutMsg.setWarehouse(reservationEntity.getWarehouseName());
 		nodeFanoutMsg.setWarehouseId(reservationEntity.getWarehouseId());
 		nodeFanoutMsg.setTenantId(AuthUtil.getTenantId());
-		AbnormalPackageData abnormalPackageData = new AbnormalPackageData();
-		abnormalPackageData.setAbnormalType(distributionLoadscanAbnormalEntity.getAbnormalType());
-		abnormalPackageData.setPackageCode(distributionLoadscanAbnormalEntity.getPackageCode());
-		abnormalPackageData.setTrainNumber(distributionLoadscanAbnormalEntity.getTrainNumber());
-		abnormalPackageData.setAuditingTime(distributionLoadscanAbnormalEntity.getAuditingTime());
-		abnormalPackageData.setAuditingStatus(distributionLoadscanAbnormalEntity.getAuditingStatus());
+		AbnormalPackageVO abnormalPackageVO = new AbnormalPackageVO();
+		abnormalPackageVO.setAbnormalType(distributionLoadscanAbnormalEntity.getAbnormalType());
+		abnormalPackageVO.setPackageCode(distributionLoadscanAbnormalEntity.getPackageCode());
+		abnormalPackageVO.setTrainNumber(distributionLoadscanAbnormalEntity.getTrainNumber());
+		abnormalPackageVO.setAuditingTime(distributionLoadscanAbnormalEntity.getAuditingTime());
+		abnormalPackageVO.setAuditingStatus(distributionLoadscanAbnormalEntity.getAuditingStatus());
+		abnormalPackageVO.setAuditingUser(distributionLoadscanAbnormalEntity.getAuditingUser());
 		ReservationVO reservationVO = distributionReservationService.getReservationVO(reservationEntity);
 		List<PackageData> packageDataList = new ArrayList<>();
 		List<DistributionReservationPackageEntity> list = map.get("1");
@@ -6935,9 +6936,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			packageData.setNumber(1);
 			packageDataList.add(packageData);
 		}
-		abnormalPackageData.setReservationVO(reservationVO);
+		abnormalPackageVO.setReservationVO(reservationVO);
 		reservationVO.setPackageDataList(packageDataList);
-		nodeFanoutMsg.setMain(abnormalPackageData);
+		nodeFanoutMsg.setMain(abnormalPackageVO);
 		return nodeFanoutMsg;
 	}