java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

滞留扫描BUG修复

master
汤建军 6 months ago
parent
f11fb22ec1
commit
f69dfb1af1
1 changed files with 23 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

46
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save