Merge branch 'dev' into pre-production

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

@@ -1280,6 +1280,9 @@
 
     </select>
     <select id="selectReservationByDeliveryId">
-        SELECT * FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId} AND lds.reservation_status != 40
+        SELECT ldr.* FROM logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id WHERE lds.delivery_id = #{deliveryId}
+        AND ldr.reservation_status != 40
+        AND ldr.is_deleted = 0
+        AND lds.is_ deleted = 0
     </select>
 </mapper>

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

@@ -6764,17 +6764,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId);
 		if (Func.isEmpty(deliveryListEntity)){
 			log.info(method + "参数缺失deliveryId:{}", deliveryId);
-			throw new RuntimeException("服务器正忙!!!");
+			return R.fail("服务器正忙!!!");
 		}
 		List<DistributionReservationEntity> reservationEntities = distributionSignforService.selectReservationByDeliveryId(deliveryId);
 		if (Func.isEmpty(reservationEntities)){
 				log.info(method + "预约查询失败:{}", deliveryId);
-				throw new RuntimeException("服务器正忙!!!");
+			return R.fail("服务器正忙!!!");
 		}
 		String reservationCodes = reservationEntities.stream().filter(f -> !f.getLoadingStatus().equals(ReservationLoadingStatusConstant.daizhuangche.getValue())).map(DistributionReservationEntity::getReservationCode).collect(Collectors.joining(","));
 		if (Func.isNotEmpty(reservationCodes)){
-			log.info(method + "存在装车数据:{}", deliveryId);
+			log.info(method + "存在装车数据:{}", reservationCodes);
-			return R.fail(reservationCodes+"存在装车数据!!!");
+			return R.fail(reservationCodes+"存在装车包件!!!");
 		}
 		//该配送是否存在异常装车或者异常签收数据
 		List<DistributionLoadscanEntity> loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId);