整单异常装车签收列表呈现修改

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

@@ -1788,6 +1788,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
+						distributionLoadscanEntity.setIsAbnormalLoading(2);
+						distributionLoadscanEntity.setIsAbnormalSigning(2);
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
 						//进行签收数量的修改
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -2306,6 +2308,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						List<Long> abnormalPackageIds = loadscanEntityList.stream().map(DistributionLoadscanEntity::getPackageId).collect(Collectors.toList());
 						List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(abnormalPackageIds);
 						List<DistributionAppParcelListVO> distributionAppParcelListVOS = DistributionParcelListAppWrapper.build().listVO(distributionParcelListEntities);
+						distributionAppParcelListVOS.forEach(p->{
+							p.setIsAbnormalLoading(1);
+							if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
+								p.setIsAbnnormalSigning(1);
+							}
+						});
 						distributionAppStockArticleVO.setDistributionAppParcelListVOS(distributionAppParcelListVOS);
 						//统计装车数和签收数
 						int abnormalLoadingNum = loadscanEntityList.stream().mapToInt(DistributionLoadscanEntity::getLoadedNub).sum();