维护签收异常状态

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

@@ -10088,7 +10088,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				shangpeiFlag = reservationEntityList.stream().allMatch(r -> r.getDeliveryType().equals(DistributionTypeConstant.shangpei.getValue()));
 				if (shangpeiFlag) {
 					//查询是否满足商配异常装车
-					boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
+					boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit())
+						&& r.getMallName().equals(stockArticleEntity.getMallName()));
 					if (flag) {
 						List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee())
 							&& r.getConsignee().equals(stockArticleEntity.getCustomerName())

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

@@ -8649,8 +8649,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	public void maintainIsHaveAbnormalPackage(Long reservationId) {
 		long count = distributionLoadscanAbnormalService.count(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 			.eq(DistributionLoadscanAbnormalEntity::getReservationId, reservationId)
-			.eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, LoadingAbnormalAuditingStatusConstant.daishenhe.getValue())
+			.eq(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.no.getValue()))
-			.eq(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.yes.getValue()))
 		);
 		if (count == 0) {
 			//进行签收的维护