滞留扫描BUG修复

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

@@ -6065,29 +6065,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					return Resp.scanFail("此包件存在异常未处理", "此包件存在异常未处理");
 				}
 			}
-			//如果均不存在则就该判断该货物是否属于当前的配送任务，如果属于则是未装车，如果不属于则此码无效
-			List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId());
-			boolean flag = false;
-			if (Func.isNotEmpty(distributionParcelListEntities)) {
-				List<DistributionParcelListEntity> isHave = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
-				if (Func.isNotEmpty(isHave)) {
-					flag = isHave.size() == 1;
-					//判断是否存在有待处理的异常
-				}
-			} else {
-				List<DisStockListDetailEntity> disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
-				if (Func.isNotEmpty(disStockListDetailEntities)) {
-					List<DisStockListDetailEntity> isHaveinven = disStockListDetailEntities.stream().filter(inven -> Func.isNotEmpty(inven.getStockPackageCode()) && inven.getStockPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
-					if (Func.isNotEmpty(isHaveinven)) {
-						flag = isHaveinven.size() == 1;
-					}
-				}
-			}
-
-			if (!flag) {
-				//存在该订制品或者库存品包件信息但是未进行装车操作
-				return Resp.scanFail("包件未装车", "包件未装车");
-			}
+//			//如果均不存在则就该判断该货物是否属于当前的配送任务，如果属于则是未装车，如果不属于则此码无效
+//			List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId());
+//			boolean flag = false;
+//			if (Func.isNotEmpty(distributionParcelListEntities)) {
+//				List<DistributionParcelListEntity> isHave = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
+//				if (Func.isNotEmpty(isHave)) {
+//					flag = isHave.size() == 1;
+//					//判断是否存在有待处理的异常
+//				}
+//			} else {
+//				List<DisStockListDetailEntity> disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
+//				if (Func.isNotEmpty(disStockListDetailEntities)) {
+//					List<DisStockListDetailEntity> isHaveinven = disStockListDetailEntities.stream().filter(inven -> Func.isNotEmpty(inven.getStockPackageCode()) && inven.getStockPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
+//					if (Func.isNotEmpty(isHaveinven)) {
+//						flag = isHaveinven.size() == 1;
+//					}
+//				}
+//			}
+//
+//			if (!flag) {
+//				//存在该订制品或者库存品包件信息但是未进行装车操作
+//				return Resp.scanFail("包件未装车", "包件未装车");
+//			}
 		}
 		return R.data(retentionScanVos);
 	}