|
|
|
@ -2964,17 +2964,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
stockupInfoEntity.setStockUpType("1"); |
|
|
|
|
distributionStockupInfoService.save(stockupInfoEntity); |
|
|
|
|
} else { |
|
|
|
|
//通过配送任务查询该客户的信息是否完成审核,如果审核了则视为一个新客户
|
|
|
|
|
DistributionSignforEntity signforEntity = distributionSignforMapper.selectByDeliveryIdAndMallName(deliveryListEntity.getId(),k); |
|
|
|
|
if (Func.isNotEmpty(signforEntity)){ |
|
|
|
|
if (Func.isNotEmpty(oldClient.get(k)) && signforEntity.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())){ |
|
|
|
|
//拦截
|
|
|
|
|
log.error("###################商配配送对完成复核进行订单追加操作失败"); |
|
|
|
|
log.error("###################配送ID:{}",deliveryListEntity.getId()); |
|
|
|
|
log.error("###################客户名称:{}",k); |
|
|
|
|
throw new RuntimeException(k+"此客户已完成签收"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//根据配送计划和运单号查询出该预约
|
|
|
|
|
// DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomer(deliveryListEntityId, k);
|
|
|
|
|
DistributionReservationEntity reservationEntity = baseMapper.selectReservationByDeliveryListIdAndCustomerUnit(deliveryListEntityId, k); |
|
|
|
|