diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index f4772ebfa..5dfe92b09 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -8069,6 +8069,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 0){ + return Resp.scanFail("当前车次存在签收数据","当前车次存在签收数据"); + } //获取当前用户司机 DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); if (DeliveryStatusConstant.yiwancheng.getValue().equals(distributionDeliveryListEntity.getDeliveryStatus())) { @@ -8134,6 +8139,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() .eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, deliveryId) + .eq(DistributionLoadscanAbnormalEntity::getAbnormalType, LoadingAbnormalTypeConstant.zhuangcheyichang.getValue()) ); } @@ -8713,7 +8719,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListDTOS = distrilbutionloadingscanDTO.getParcelListDTOS(); boolean flag = parcelListDTOS.stream().allMatch(d -> d.getLoadingNum() < 0); if (flag) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 68c8b1272..69edb9dcd 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -7610,7 +7610,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() .eq(DistributionLoadscanAbnormalEntity::getPackageCode, barcode)