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 33a44465e..fcb007f2d 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 @@ -530,6 +530,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 0) { for (DistributionLoadscaninvnEntity distributionLoadscanEntity : distributionLoadscanvnEntitiesopen) { //查询是否重复扫码 - List distributionLoadscanEntitiesflag = distributionLoadscaninvnMapper.selectList(new QueryWrapper().lambda() + List distributionLoadscaninvnEntitiesflag = distributionLoadscaninvnMapper.selectList(new QueryWrapper().lambda() .eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId()) .eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode()) .ne(DistributionLoadscaninvnEntity::getScanStatus, 1) .eq(DistributionLoadscaninvnEntity::getSignforState,2) ); + if (distributionLoadscaninvnEntitiesflag.size() > 0) { + // 修改该记录 + for (DistributionLoadscaninvnEntity loadscanEntity : distributionLoadscaninvnEntitiesflag) { + if (loadscanEntity.getSignforState() ==2)break; + distributionLoadscaninvnService.update(new UpdateWrapper().lambda() + .eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionLoadscanEntity.getDeliveryId()) + .eq(DistributionLoadscaninvnEntity::getOrderPackageCode, distributionLoadscanEntity.getOrderPackageCode()) + .set(DistributionLoadscaninvnEntity::getSigningTime,simpleDateFormat.format(new Date())) + .set(DistributionLoadscaninvnEntity::getSignforState,2) + .set(DistributionLoadscaninvnEntity::getReceivedQuantity,1) + ); + //更新签收表的签收数量和装车数量 + Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(),loadscanEntity.getReservationId(), loadscanEntity.getPackageNub()); + } +// distributionLoadscanService.update() + continue; + } //依次插入该装车记录,设置车辆 if (null != distributionDeliverySelfEntity.getDriverId()) { distributionLoadscanEntity.setDriverId(distributionDeliverySelfEntity.getDriverId()); @@ -571,6 +589,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl