配送异常装车、签收语音提示修改

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

@@ -600,9 +600,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		);
 
 		if (!abnormalEntities.isEmpty()) {
+			//判断异常是否属于自身
+			boolean flag = abnormalEntities.stream().allMatch(a -> distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) );
+			if (flag){
+				return Resp.scanFail("包件已存在异常", "包件已存在异常");
+			}
 			String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
 			log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",distributionDeliveryListEntity.getTrainNumber(),collect);
-			return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");
+			return Resp.scanFail("包件在其他车次存在异常", "包件在其他车次存在异常");
 		}
 		//异步确认包条扫描信息
 //		distributionAsyncService.changeOrderSignforStatus(distrilbutionloadingscanDTO.getBarcode());

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

@@ -724,7 +724,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					BladeUser user = AuthUtil.getUser();
 					if (Func.isNotEmpty(loadscaninvnEntity)) {
 						if (loadscaninvnEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
-							log.error(method + "库存品：" + s + "已经签收，无需重复签收");
+							log.info(method + "库存品：" + s + "已经签收，无需重复签收");
 							throw new RuntimeException("库存品：" + s + "已经签收，无需重复签收");
 						}
 						//存在装车数据，进行状态变更即可
@@ -2458,6 +2458,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode())
 			);
 			if (!abnormalEntities.isEmpty()) {
+				boolean flag = abnormalEntities.stream().allMatch(a -> distributionDeliveryListEntity.getId().equals(a.getDeliveryListId()) );
+				if (flag){
+					return Resp.scanFail("包件已存在异常", "包件已存在异常");
+				}
 				String collect = abnormalEntities.stream().map(DistributionLoadscanAbnormalEntity::getTrainNumber).collect(Collectors.joining(","));
 				log.info("包件已在其他车次存在异常 >>>>当前车次:{},其他车次:{}",deliveryListEntity.getTrainNumber(),collect);
 				return Resp.scanFail("包件已在其他车次存在异常", "包件已在其他车次存在异常");