From d9cd2fc34c094437b196f6091169c844262b6644 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 15 Jan 2024 11:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=8D=95=E5=BC=82=E5=B8=B8=E8=A3=85?=
 =?UTF-8?q?=E8=BD=A6=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8=E5=91=88=E7=8E=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

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 810a73c4b..6282cff1c 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
@@ -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();