fix:修复打印能打印取消的预约单

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionReservationStockarticleEntity.java

@@ -66,7 +66,7 @@ public class DistributionReservationStockarticleEntity extends TenantEntity {
 	/**
 	 * 订单状态；1-正常、2-取消
 	 */
-	@ApiModelProperty(value = "订单码")
+	@ApiModelProperty(value = "订单状态")
 	private String stockArticleStatus;
 
 

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

@@ -6535,6 +6535,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//先查询预约单对应有哪些订单
 				QueryWrapper<DistributionReservationStockarticleEntity> queryWrapper = new QueryWrapper<>();
 				queryWrapper.eq("reservation_id", reservationId);
+				queryWrapper.ne("stock_article_status", 2);
 				List<DistributionReservationStockarticleEntity> reservationStockarticleList = distributionReservationStockarticleService.list(queryWrapper);
 				List<Map<String, Object>> ls = new ArrayList<>();
 				BigDecimal totalPrice = BigDecimal.ZERO;