|
|
|
@ -6528,21 +6528,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (distributionReservationEntity.getReservationStockListNum() > 0) { |
|
|
|
|
|
|
|
|
|
//查询库存品扫描签收
|
|
|
|
|
List<SignPushDataUnitDTO> loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); |
|
|
|
|
List<SignPushDataUnitDTO> signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); |
|
|
|
|
if (Func.isNotEmpty(loadingPushOldInventory)) { |
|
|
|
|
buildNameAndPhone(loadingPushOldInventory); |
|
|
|
|
signPushDataUnitDTOS.addAll(loadingPushOldInventory); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (Func.isNotEmpty(signingPushOldInventory)) { |
|
|
|
|
buildNameAndPhone(signingPushOldInventory); |
|
|
|
|
signPushDataUnitDTOS.addAll(signingPushOldInventory); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// if (distributionReservationEntity.getReservationStockListNum() > 0) {
|
|
|
|
|
//
|
|
|
|
|
// //查询库存品扫描签收
|
|
|
|
|
// List<SignPushDataUnitDTO> loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
|
|
|
|
|
// List<SignPushDataUnitDTO> signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId());
|
|
|
|
|
// if (Func.isNotEmpty(loadingPushOldInventory)) {
|
|
|
|
|
// buildNameAndPhone(loadingPushOldInventory);
|
|
|
|
|
// signPushDataUnitDTOS.addAll(loadingPushOldInventory);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if (Func.isNotEmpty(signingPushOldInventory)) {
|
|
|
|
|
// buildNameAndPhone(signingPushOldInventory);
|
|
|
|
|
// signPushDataUnitDTOS.addAll(signingPushOldInventory);
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//查询签收图片
|
|
|
|
|
List<DistributionSignPrintVO> distributionSignPrintVOS = distributionSignforMapper.selectSignImgsUrl(distributionReservationEntity.getId()); |
|
|
|
|
|
|
|
|
|