|
|
|
@ -3620,7 +3620,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
List<DistributionLoadscanAbnormalEntity> loadscanAbnormalEntityList = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda() |
|
|
|
|
.eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, distrilbutionloadingscanDTO.getDeliveryId()) |
|
|
|
|
.eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode()) |
|
|
|
@ -3643,7 +3642,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
reservationEntity = reservationEntityMap.get(stockArticleEntity.getConsigneeUnit()); |
|
|
|
|
//查询是否已经异常装车了
|
|
|
|
|
//构建异常装车数据
|
|
|
|
|
|
|
|
|
|
//完成对该客户的异常装车数据和数量维护
|
|
|
|
|
break; |
|
|
|
|
case "2": |
|
|
|
@ -3653,9 +3651,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
if (Func.isEmpty(distributionReservationEntity)){ |
|
|
|
|
return Resp.scanFail("操作失败","配送任务无该客户"); |
|
|
|
|
} |
|
|
|
|
if (distributionReservationEntity.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) |
|
|
|
|
|| stockArticleEntity.getCustomerTelephone().equals(distributionReservationEntity.getDeliveryPhone()) |
|
|
|
|
|| distributionReservationEntity.getMallName().equals(stockArticleEntity.getMallName())){ |
|
|
|
|
if (!distributionReservationEntity.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) |
|
|
|
|
|| !stockArticleEntity.getCustomerTelephone().equals(distributionReservationEntity.getDeliveryPhone()) |
|
|
|
|
|| !distributionReservationEntity.getMallName().equals(stockArticleEntity.getMallName())){ |
|
|
|
|
return Resp.scanFail("操作失败","配送任务无该客户"); |
|
|
|
|
} |
|
|
|
|
reservationEntity = distributionReservationEntity; |
|
|
|
|