1.修改线上报错

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -644,7 +644,7 @@
                               and ldrs.stock_list_status in (1, 3)
                         ) inventoryNub
         from logpm_distribution_reservation ldr
-                 LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND AND ldsi.stock_status != 4
+                 LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND  ldsi.stock_status != 4
                  LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
                  LEFT JOIN logpm_distribution_reservation_stockarticle ldrs
                  on ldrs.reservation_id = ldr.id and ldrs.stock_article_status in (1, 3)

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

@@ -1765,8 +1765,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				builder.append(orderCodes);
 
 				log.info(">>>>>> updatePackageDeliveryStatus,{}, {}", reservationId, packageIds);
-				//完成对该客户下此包件任务的取消
-				int row = distributionReservationMapper.updatePackageDeliveryStatus(reservationId, packageIds);
+				if(!packageIds.isEmpty() && reservationId!=null){
+					//完成对该客户下此包件任务的取消
+					int row = distributionReservationMapper.updatePackageDeliveryStatus(reservationId, packageIds);
+				}
+
 				//维护预约订单状态
 			}
 			List<DistributionParcelNumberDTO> distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId);