|
|
|
@ -4242,13 +4242,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
IPage<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackage(page, orderIds, distributionDeliveryInfoDTO); |
|
|
|
|
parcelListVOIPage.setTotal(parcelListEntityList.getTotal()); |
|
|
|
|
// List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.getReservationPackageNew(distributionDeliveryInfoDTO);
|
|
|
|
|
log.info(">>>>>> parcelListEntityList {}", parcelListEntityList); |
|
|
|
|
// log.info(">>>>>> parcelListEntityList {}", parcelListEntityList);
|
|
|
|
|
List<DistributionParcelListVO> parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords()); |
|
|
|
|
for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { |
|
|
|
|
log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); |
|
|
|
|
// log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO);
|
|
|
|
|
if (Func.isNotEmpty(loadingDataMap)) { |
|
|
|
|
DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId()); |
|
|
|
|
log.info(">>>>>> loadscanEntity {}", loadscanEntity); |
|
|
|
|
// log.info(">>>>>> loadscanEntity {}", loadscanEntity);
|
|
|
|
|
|
|
|
|
|
if (Func.isNotEmpty(loadscanEntity)) { |
|
|
|
|
if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) { |
|
|
|
@ -4294,7 +4294,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
log.info(">>>>>> distributionParcelListVO2 {}", distributionParcelListVO); |
|
|
|
|
// log.info(">>>>>> distributionParcelListVO2 {}", distributionParcelListVO);
|
|
|
|
|
|
|
|
|
|
distributionParcelListVOS.add(distributionParcelListVO); |
|
|
|
|
} |
|
|
|
|