1.合并代码

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

@@ -6538,7 +6538,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
-	public R loadingAbnormalPackageListTurnDown(String ids) {
+	public R loadingAbnormalPackageListTurnDown(String ids, boolean yesOrNo) {
+
 		//异常驳回进行异常信息的删除,对于装车记录的清理,对于已装车和签收的数量扣减
 		String method = "####################异常驳回loadingAbnormalPackageListTurnDown";
 		if (Func.isEmpty(ids)) {
@@ -6580,7 +6581,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//进行异常列表的清理
 				for (DistributionLoadscanAbnormalEntity abnormalEntity : abnormalEntities) {
 					//存在异常操作为进行审核操作才可进行驳回
-					if (Objects.isNull(abnormalEntity.getAuditingStatus())) {
+					if (!Objects.isNull(abnormalEntity.getAuditingStatus()) && LoadingAbnormalAuditingStatusConstant.daishenhe.getValue().equals(abnormalEntity.getAuditingStatus())) {
 						//驳回视为进行审核,审核结果为驳回
 						abnormalEntity.setAuditingStatus(3);
 						abnormalEntity.setAuditingUser(AuthUtil.getNickName());
@@ -6606,24 +6607,32 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					}
 
 				}
+				if (!updateList.isEmpty()) {
+					distributionLoadscanAbnormalService.updateBatchById(updateList);
+				}
 			}
 			//进行装车记录的统计
 		}
+
 		//扣减装车和签收数
 		distributionSignforMapper.deductionLoadingAndSignforPacjageNum(reservationId, deliveryId, loadingNum, signforNum);
-		//恢复包件数据
-		distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
-			.in(DistributionParcelListEntity::getId, packageIdList)
-			.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
-			.set(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue())
-			.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue())
-			.set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue())
-		);
+		if (yesOrNo) {
+			//恢复包件数据
+			distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+				.in(DistributionParcelListEntity::getId, packageIdList)
+				.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
+				.set(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.weizhuancghe.getValue())
+				.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiruku.getValue())
+				.set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.daibeihuo.getValue())
+			);
+		}
 		//维护相关的订单信息
 		distributionStockArticleService.maintenanceOrderInfoByIds(orderIds);
 		return R.success("异常驳回成功");
+
 	}
 
+
 	private void buildNameAndPhone(List<SignPushDataUnitDTO> pushOldPackageSigning) {
 		for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) {
 			User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getAdministratorsId());