Browse Source

增加详情装车限制

dist.1.3.0
汤建军 6 months ago
parent
commit
229ea55716
  1. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@ -8806,7 +8806,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
if (!Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
if (!reservationId.equals(distrilbutionloadingscanDTO.getReservationId())) {
return Resp.scanFail("请在"+reservationEntity.getConsignee()+"客户扫描此码", "请在"+reservationEntity.getConsignee()+"客户扫描此码");
}
@ -9018,7 +9018,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
DistributionReservationEntity reservationEntity2 = distributionReservationService.getById(reservationId);
if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
if (!Objects.isNull(distrilbutionloadingscanDTO.getReservationId())){
if (!reservationId.equals(distrilbutionloadingscanDTO.getReservationId())) {
return Resp.scanFail("请在"+reservationEntity2.getConsignee()+"客户扫描此码", "请在"+reservationEntity2.getConsignee()+"客户扫描此码");
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -5434,7 +5434,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
}
//查询是否存在有异常未进行审核的包件
boolean isHaveAbnormalFlag = distributionLoadscanAbnormalService.isHaveAbnormalPackage(reservationEntity.getId(), distributionDeliveryListEntity.getId(), myCurrentWarehouse.getId());
if (isHaveAbnormalFlag) {
if (!isHaveAbnormalFlag) {
return Resp.scanFail("存在异常未处理", "存在异常未处理");
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

Loading…
Cancel
Save