异常审核推送广播

blade-biz-common/src/main/java/org/springblade/common/model/PackageData.java

@@ -162,8 +162,6 @@ public class PackageData implements Serializable {
 
 	private Long finalNodeId;
 	private String finalNodeName;
-//	0-否 1-是
-	private Integer examine;
 
 
 }

blade-biz-common/src/main/java/org/springblade/common/model/ReservationVO.java

@@ -2,6 +2,7 @@ package org.springblade.common.model;
 
 
 import lombok.Data;
+import org.springblade.common.model.workNode.AbnormalPackageData;
 
 import java.util.Date;
 import java.util.List;
@@ -82,6 +83,12 @@ public class ReservationVO {
 	 */
 	private List<PackageData> packageDataList;
 
+	/**
+	 * 预约异常包件列表
+	 *
+	 */
+	private List<AbnormalPackageData> abnormalPackageDataList;
+
 
 
 

blade-biz-common/src/main/java/org/springblade/common/model/workNode/AbnormalPackageData.java

@@ -0,0 +1,55 @@
+package org.springblade.common.model.workNode;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springblade.common.enums.PackageTypeEnums;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 提送数据
+ *
+ * @author zhaoqiaobo
+ * @create 2024-03-18 0:45
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AbnormalPackageData implements Serializable {
+
+	/**
+	 * 审核状态 1-未审核 2-已审核   3-已驳回  4-已取消 5 - 拒签
+	 */
+	private Integer auditingStatus;
+	/**
+	 * 包条码
+	 */
+	private String packageCode;
+	/**
+	 * 车次号
+	 */
+	private String trainNumber;
+	/**
+	 * 异常类型 1-装车异常(计划内 未装车)
+	 * 2-计划异常(计划外进行装车)
+	 * 3-签收异常(计划外未装车进行签收)
+	 * 4-异常签收失败(满足异常签收但是进行拒签)
+	 * 5-取消异常计划（取消此次配送计划）
+	 */
+	private Integer abnormalType;
+	/**
+	 * 操作时间
+	 */
+	private Date auditingTime;
+	/**
+	 * 审核操作人
+	 */
+	private String auditingUser;
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -187,6 +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.node.BillLadingNode;
 import org.springblade.common.node.DeliveryNode;
 import org.springblade.common.node.ReservationNode;
@@ -6928,6 +6929,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			packageData.setNumber(1);
 			packageDataList.add(packageData);
 		}
+		List<AbnormalPackageData> 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);
+		}
 		reservationVO.setPackageDataList(packageDataList);
 		nodeFanoutMsg.setMain(reservationVO);
 		return nodeFanoutMsg;