diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 3d340533b..18c45dfd5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -4219,57 +4219,56 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl zeroOrderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); - if (Func.isNotEmpty(zeroOrderIds)) { - //查询该客户的零但订单包间 - List zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, zeroOrderIds); - List zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList); - for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) { - if (Func.isNotEmpty(loadingDataMap)) { - DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(parcelListVO.getId()); - if (Func.isNotEmpty(loadscanEntity)) { - if (Func.isNotEmpty(loadscanEntity.getSigningTime())) { - parcelListVO.setSigningTime(loadscanEntity.getSigningTime()); - } - if (Func.isNotEmpty(loadscanEntity.getScanUser())) { - parcelListVO.setScanUser(loadscanEntity.getScanUser()); - } - if (Func.isNotEmpty(loadscanEntity.getDriverName())) { - parcelListVO.setDriverName(loadscanEntity.getDriverName()); - } - if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) { - parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub()); - } - if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { - parcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity()); - } - if (Func.isNotEmpty(loadscanEntity.getScanStatus())) { - switch (loadscanEntity.getScanStatus()) { - case "1": - parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName()); - break; - case "2": - parcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName()); - break; - case "3": - parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName()); - break; - case "4": - parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName()); - break; - case "5": - parcelListVO.setScanStatus(LoadingStatusConstant.buluzhuangche.getName()); - break; - } - parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub()); - } - } - } - distributionParcelListVOS.add(parcelListVO); - } } +// List zeroOrderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.yes.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); +// if (Func.isNotEmpty(zeroOrderIds)) { +// //查询该客户的零但订单包间 +// List zeroParcelListEntityList = baseMapper.getZeroPackageListByDeliveryId(deliveryId, zeroOrderIds); +// List zeroParcelListVOList = DistributionParcelListWrapper.build().listVO(zeroParcelListEntityList); +// for (DistributionParcelListVO parcelListVO : zeroParcelListVOList) { +// if (Func.isNotEmpty(loadingDataMap)) { +// DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(parcelListVO.getId()); +// if (Func.isNotEmpty(loadscanEntity)) { +// if (Func.isNotEmpty(loadscanEntity.getSigningTime())) { +// parcelListVO.setSigningTime(loadscanEntity.getSigningTime()); +// } +// if (Func.isNotEmpty(loadscanEntity.getScanUser())) { +// parcelListVO.setScanUser(loadscanEntity.getScanUser()); +// } +// if (Func.isNotEmpty(loadscanEntity.getDriverName())) { +// parcelListVO.setDriverName(loadscanEntity.getDriverName()); +// } +// if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) { +// parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub()); +// } +// if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { +// parcelListVO.setSigningNub(loadscanEntity.getReceivedQuantity()); +// } +// if (Func.isNotEmpty(loadscanEntity.getScanStatus())) { +// switch (loadscanEntity.getScanStatus()) { +// case "1": +// parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName()); +// break; +// case "2": +// parcelListVO.setScanStatus(LoadingStatusConstant.saomiao.getName()); +// break; +// case "3": +// parcelListVO.setScanStatus(LoadingStatusConstant.quxiao.getName()); +// break; +// case "4": +// parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName()); +// break; +// case "5": +// parcelListVO.setScanStatus(LoadingStatusConstant.buluzhuangche.getName()); +// break; +// } +// parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub()); +// } +// } +// } +// distributionParcelListVOS.add(parcelListVO); +// } +// } } else { //可能出现配送任务下的所有客户都是库存品 log.info("#############此配送任务下无订单信息,deliveryId:{}", deliveryId);