异常审核推送广播

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 - 拒签

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;
 	}