零担批量签收

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -5394,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()) {
@@ -7718,7 +7720,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//配置项
 		DistributionDeliverySelfEntity distributionDeliverySelfEntity = this.getDriver(deliveryListEntity,user,distributionDeliveryListService.judgeIsDriver(user));
 		if (Objects.isNull(distributionDeliverySelfEntity)){
-			return Resp.scanFail("无操作权限!!!","无操作权限!!!");
+			return Resp.scanFail("当前操作人无此包件签收权限!!!","当前操作人无此包件签收权限!!!");
 		}
 		switch (type) {
 			case 1:
@@ -9019,6 +9021,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 +9074,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 +9087,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;
 	}