From 852008a8ea30af31ac7b477735f4a26598cc551b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 27 Sep 2024 18:07:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=B8=8D=E4=B8=80=E8=87=B4=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) 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 de864b57c..94de394a9 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 @@ -3706,12 +3706,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN); @@ -5764,6 +5760,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl pushList = new ArrayList<>(); List pushInventoryList = new ArrayList<>(); //配置项 - DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO(); - if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) { - distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper().lambda() - .eq(DistributionDeliverySelfEntity::getIsMaster, ServiceConstant.IS_MASTER_YES) - .eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) - ); - } else { - DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper().lambda() - .eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())); - BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity); + DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity,user,distributionDeliveryListService.judgeIsDriver(user)); + if (Objects.isNull(distributionDeliverySelfEntity)){ + return Resp.scanFail("无操作权限!!!","无操作权限!!!"); } switch (type) { case 1: @@ -7780,6 +7771,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Fri, 27 Sep 2024 18:16:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=B8=8D=E4=B8=80=E8=87=B4=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 94de394a9..c61dcc4b6 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 @@ -7771,15 +7771,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Fri, 27 Sep 2024 18:44:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E7=AD=BE=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionSignforServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) 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 c61dcc4b6..82849fbba 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 @@ -5394,12 +5394,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl inventoryLoadingData = distributionLoadscaninvnService.list(Wrappers.query().lambda() .eq(DistributionLoadscaninvnEntity::getReservationId, reservationEntity.getId()) .eq(DistributionLoadscaninvnEntity::getDriverName, deliverySelfEntity.getDriverName()) .eq(DistributionLoadscaninvnEntity::getVehicleName, deliverySelfEntity.getVehicleNub()) + .eq(DistributionLoadscaninvnEntity::getSignforState, LoadScanSigningStatusConstant.weiqianshou.getValue()) .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); if (packageLoadingData.isEmpty() && inventoryLoadingData.isEmpty()) { @@ -7718,7 +7720,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Fri, 27 Sep 2024 18:48:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87BUG=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 82849fbba..81c999756 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 @@ -8831,16 +8831,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>user:{}",user.getNickName()); + log.info("driver>>>>>>>>>>>>>user:{}",driver); + if (deliveryListEntity.getKind().equals("1")) { if (!driver) { return Resp.scanFail("当前操作需由司机完成", "当前操作需由司机完成"); } DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, driver); - if (deliverySelfEntity == null) { + log.info("driverName>>>>>>>>>>>>>:{}",deliverySelfEntity.getDriverName()); + + if (Objects.isNull(deliverySelfEntity)) { + return Resp.scanFail("当前人无操作权限", "当前人无操作权限"); } - this.getDriver(deliveryListEntity, AuthUtil.getUser(), driver); //针对之前该司机上传的图片进行全部删除 //查询该司机已有的图片信息 List list = iDistributionSignPrintService.list(Wrappers.query().lambda() @@ -8905,6 +8910,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>:{}",user.getNickName()); signforEntity.setSigneeId(user.getUserId()); return R.data(this.updateById(signforEntity)); }