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..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
@@ -3706,12 +3706,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							pushList.add(distributionLoadscanEntity);
 							loadingId = distributionLoadscanEntity.getId();
-							Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						} else {
 							loadingId = distributionLoadscanEntity.getId();
 							content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getSigningUser() + "扫描异常签收,装车方式:扫描装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 							distributionLoadscanService.updateById(distributionLoadscanEntity);
-							distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						}
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
 						aaa.add(trunklinePackageTrackLog);
@@ -3784,12 +3782,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							loadingId = distributionLoadscanEntity.getId();
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							pushList.add(distributionLoadscanEntity);
-							Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						} else {
 							loadingId = distributionLoadscanEntity.getId();
 							content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntity.getScanUser() + "扫描异常签收,装车方式:扫描装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 							distributionLoadscanService.updateById(distributionLoadscanEntity);
-							distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						}
 						//修改包件装车、签收状态
 						packageLockIds.add(distributionLoadscanEntity.getPackageId());
@@ -3875,7 +3871,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				}
 			}
 
-
+			distributionSignforMapper.autoDpdateSignfor(signforEntity.getReservationId());
 			// 作业节点数据推送
 			NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildDistributionSignforVO(distributionDeliveryListEntity, reservationEntity, pushList, OperatModeConstant.SCAN);
 
@@ -5398,12 +5394,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanEntity::getReservationId, reservationEntity.getId())
 				.eq(DistributionLoadscanEntity::getDriverName, deliverySelfEntity.getDriverName())
 				.eq(DistributionLoadscanEntity::getVehicleName, deliverySelfEntity.getVehicleNub())
+				.eq(DistributionLoadscanEntity::getSignforState, LoadScanSigningStatusConstant.weiqianshou.getValue())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 			);
 			List<DistributionLoadscaninvnEntity> inventoryLoadingData = distributionLoadscaninvnService.list(Wrappers.<DistributionLoadscaninvnEntity>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()) {
@@ -5764,6 +5762,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							loadscanEntity.setMsg("司机一键签收数据补录");
 						}
 						distributionLoadscanService.save(loadscanEntity);
+						distributionLoadscanEntityLists.add(loadscanEntity);
 						packageLockIds.add(loadscanEntity.getPackageId());
 						JSONObject jsonObject = new JSONObject();
 						jsonObject.put("code", parcelListEntity.getOrderPackageCode());
@@ -5791,6 +5790,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity());
 							loadscanEntities.setSigningTime(signingTime);
 							distributionLoadscanService.updateById(loadscanEntities);
+							distributionLoadscanEntityLists.add(loadscanEntities);
 							packageLockIds.add(loadscanEntities.getPackageId());
 							content = "包件在" + myCurrentWarehouse.getName() + "由" + loadscanEntities.getSigningUser() + "司机批量签收,装车方式:补录装车,配送车次号:" + distributionDeliveryListEntity.getTrainNumber() + "预约任务号:" + reservationEntity.getReservationCode();
 							trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
@@ -7718,16 +7718,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		List<DistributionLoadscanEntity> pushList = new ArrayList<>();
 		List<DistributionLoadscaninvnEntity> pushInventoryList = new ArrayList<>();
 		//配置项
-		DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO();
-		if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
-			distributionDeliverySelfEntity = distributionDeliverySelfMapper.selectOne(new QueryWrapper<DistributionDeliverySelfEntity>().lambda()
-				.eq(DistributionDeliverySelfEntity::getIsMaster, ServiceConstant.IS_MASTER_YES)
-				.eq(DistributionDeliverySelfEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
-			);
-		} else {
-			DistributionDeliveryTripartiteEntity distributionDeliveryTripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(new QueryWrapper<DistributionDeliveryTripartiteEntity>().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 +7773,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					);
 					DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
 					if (!Objects.isNull(loadscanEntity)) {
+						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);
 						distributionLoadscanService.updateById(distributionLoadscanEntity);
 						//缺少一个异步维护包件签收的方法
@@ -8829,16 +8831,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//查询当前操作司机
 		BladeUser user = AuthUtil.getUser();
 		Boolean driver = distributionDeliveryListService.judgeIsDriver(user);
+		log.info("username>>>>>>>>>>>>>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<DistributionSignPrintEntity> list = iDistributionSignPrintService.list(Wrappers.<DistributionSignPrintEntity>query().lambda()
@@ -8903,6 +8910,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		signforEntity.setSjsigningTime(sdf.format(new Date()));
 		signforEntity.setDriverSigning(SignforDriverSigningStatusConstant.yiqianshou.getValue());
 		signforEntity.setSigneeName(user.getNickName());
+		log.info("driverName>>>>>>>>>>>>>:{}",user.getNickName());
 		signforEntity.setSigneeId(user.getUserId());
 		return R.data(this.updateById(signforEntity));
 	}
@@ -9019,6 +9027,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		loadscanEntity.setSigningUser(user.getNickName());
 		loadscanEntity.setSigningUserId(user.getUserId());
 		loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
+		loadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
+		if (!loadscanEntity.getLoadedNub().equals(loadscanEntity.getReceivedQuantity())) {
+			loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
+		}
+
 		return loadscanEntity;
 
 	}
@@ -9067,7 +9080,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setReservationId(reservationEntity.getId());
 		distributionLoadscanEntity.setIsSignfor(2);
 		distributionLoadscanEntity.setIsInsert(2);
-		distributionLoadscanEntity.setSignforState(2);
 		distributionLoadscanEntity.setOneClick(1);
 		distributionLoadscanEntity.setOneQclick(1);
 		distributionLoadscanEntity.setIsInsert(2);
@@ -9081,6 +9093,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 		distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
+		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
+		if (!distributionLoadscanEntity.getLoadedNub().equals(distributionLoadscanEntity.getReceivedQuantity())) {
+			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
+		}
 		return distributionLoadscanEntity;
 	}