异常增加日志

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

@@ -581,14 +581,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				throw new CustomerException(403, "预约单已取消");
 			}
 		}
-		List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
-			.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
-		);
 
-		if (!abnormalEntities.isEmpty()) {
-			String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
-			return Resp.scanFail("包件已在"+collect+"存在异常", "包件已存在异常装车或签收");
-		}
 
 //		-----------------------------------2023-09-25  签收调整----------------------------------------------------------------
 //		首先这里需要查看该包件是否属于该配送任务
@@ -598,6 +591,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+		List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
+			.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
+		);
+
+		if (!abnormalEntities.isEmpty()) {
+			String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
+			log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",distributionDeliveryListEntity.getTrainNumber(),collect);
+			return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
+		}
 		//异步确认包条扫描信息
 //		distributionAsyncService.changeOrderSignforStatus(distrilbutionloadingscanDTO.getBarcode());
 		List<Long> packageLockIds = new ArrayList<>();

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

@@ -2459,7 +2459,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			);
 			if (!abnormalEntities.isEmpty()) {
 				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
-				return Resp.scanFail("包件已在"+collect+"存在异常", "包件已存在异常装车或签收");
+				log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect);
+				return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
 			}
 			if (Func.isNotEmpty(list)) {
 				//满足条件此码必定为库存品
@@ -2557,6 +2558,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscanEntity.setIsSignfor(2);
 					distributionLoadscanEntity.setIsInsert(2);
 					distributionLoadscanEntity.setSignforState(2);
+					distributionLoadscanEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
 					distributionLoadscanEntity.setPackageNub(collect.get(0).getQuantity());
 					distributionLoadscanEntity.setOrderId(collect.get(0).getStockArticleId());
 					distributionLoadscanEntity.setLoadedNub(collect.get(0).getQuantity());