|
|
|
@ -7771,15 +7771,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
); |
|
|
|
|
DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity(); |
|
|
|
|
if (!Objects.isNull(loadscanEntity)) { |
|
|
|
|
if (deliveryListEntity.getKind().equals("1")){ |
|
|
|
|
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) { |
|
|
|
|
//校验司机是否一致
|
|
|
|
|
if (!loadscanEntity.getDriverName().equals(distributionDeliverySelfEntity.getDriverName()) || |
|
|
|
|
!loadscanEntity.getDriverId().equals(distributionDeliverySelfEntity.getDriverId()) || |
|
|
|
|
!loadscanEntity.getVehicleName().equals(distributionDeliverySelfEntity.getVehicleNub()) |
|
|
|
|
) { |
|
|
|
|
return Resp.scanFail("当前司机无签收权限!!!","当前司机无签收权限"); |
|
|
|
|
} |
|
|
|
|
if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == isStrictLoading) { |
|
|
|
|
//校验司机是否一致
|
|
|
|
|
if (!loadscanEntity.getDriverName().equals(distributionDeliverySelfEntity.getDriverName()) || |
|
|
|
|
!loadscanEntity.getDriverId().equals(distributionDeliverySelfEntity.getDriverId()) || |
|
|
|
|
!loadscanEntity.getVehicleName().equals(distributionDeliverySelfEntity.getVehicleNub()) |
|
|
|
|
) { |
|
|
|
|
return Resp.scanFail("当前操作人无此包件签收权限!!!","当前操作人无此包件签收权限"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
distributionLoadscanEntity = updateSignDistributionLoadscanEntity(loadscanEntity, user, parcelListEntity); |
|
|
|
|