diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanAbnormalEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanAbnormalEntity.java index af42437a0..754e25106 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanAbnormalEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanAbnormalEntity.java @@ -105,7 +105,13 @@ public class DistributionLoadscanAbnormalEntity extends TenantEntity { * 仓库Id */ @ApiModelProperty(value = "仓库Id") - private String warehouseId; + private Long warehouseId; + + /** + * 扫描记录ID + */ + @ApiModelProperty(value = "扫描记录ID") + private Long loadingId; /** * 仓库名称 */ 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 8485d572d..bc9f67cab 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 @@ -5464,7 +5464,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationIds = signforEntityList.stream().map(DistributionSignforEntity::getReservationId).collect(Collectors.toList()); List reservationPackageEntityList = distributionReservationPackageService.list(Wrappers.query().lambda() @@ -7727,6 +7729,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl list = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, deliveryId) + .eq(DistributionLoadscanAbnormalEntity::getPackageCode, orderPackageCode) + .eq(DistributionLoadscanAbnormalEntity::getWarehouseId, warehouseId) + .eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, LoadingAbnormalAuditingStatusConstant.yichang.getValue()) + ); + if (!list.isEmpty()) { + if (list.size() == 1){ + distributionLoadscanAbnormalService.removeById(list.get(0)); + }else { + log.info("查询包件驳回数据存在多个deliveryId:{},orderPackageCode:{},warehouseId:{}",deliveryId,orderPackageCode,warehouseId); + } + } + } @Override 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 53ea8196b..a07bb70ca 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 @@ -3320,6 +3320,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl