From 6dce4c632e74e2b8b4d2f6563764789e06976b76 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Dec 2023 14:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=BA=BA=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java  | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

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 a6a91c1b3..d5d199fbe 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
@@ -2857,28 +2857,34 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//这里就需要进行该客户的异常包件列表进行查询
 		List<DistributionLoadscanAbnormalVO> loadscanAbnormalVOS = baseMapper.selectAbnormalPackageList(signforEntity.getReservationId(), signforEntity.getDeliveryId());
 		loadscanAbnormalVOS.forEach(p -> {
-			switch (p.getOrderPackageStatus()) {
-				case "10":
-					p.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName());
-					break;
-				case "20":
-					p.setOrderPackageStatusName(OrderPackageStatusConstant.yiruku.getName());
-					break;
-				case "30":
-					p.setOrderPackageStatusName(OrderPackageStatusConstant.zhongzhuanruku.getName());
-					break;
-				case "40":
-					p.setOrderPackageStatusName(OrderPackageStatusConstant.zhiliu.getName());
-					break;
-//				case "50":
+//			switch (p.getOrderPackageStatus()) {
+//				case "10":
+//					p.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName());
+//					break;
+//				case "20":
+//					p.setOrderPackageStatusName(OrderPackageStatusConstant.yiruku.getName());
+//					break;
+//				case "30":
+//					p.setOrderPackageStatusName(OrderPackageStatusConstant.zhongzhuanruku.getName());
+//					break;
+//				case "40":
+//					p.setOrderPackageStatusName(OrderPackageStatusConstant.zhiliu.getName());
+//					break;
+////				case "50":
+////					p.setOrderPackageStatusName(OrderPackageStatusConstant.yichuku.getName());
+////					break;
+//				case "60":
 //					p.setOrderPackageStatusName(OrderPackageStatusConstant.yichuku.getName());
 //					break;
-				case "60":
-					p.setOrderPackageStatusName(OrderPackageStatusConstant.yichuku.getName());
-					break;
-				case "70":
-					p.setOrderPackageStatusName(OrderPackageStatusConstant.yiqianshou.getName());
-					break;
+//				case "70":
+//					p.setOrderPackageStatusName(OrderPackageStatusConstant.yiqianshou.getName());
+//					break;
+//			}
+
+			if (p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
+				p.setOrderPackageStatusName(OrderPackageStatusConstant.yiqianshou.getName());
+			}else {
+				p.setOrderPackageStatusName("未签收");
 			}
 			switch (p.getOrderPackageFreezeStatus()) {
 				case "10":
@@ -2980,7 +2986,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionParcelListService.updateById(parcelListEntity);
 				distributionLoadscanAbnormalEntity.setAuditingStatus(2);
 				distributionLoadscanAbnormalEntity.setAuditingTime(new Date());
-				distributionLoadscanAbnormalEntity.setAuditingUser(AuthUtil.getUser().getUserName());
+				distributionLoadscanAbnormalEntity.setAuditingUser(AuthUtil.getUser().getNickName());
 				distributionLoadscanAbnormalService.updateById(distributionLoadscanAbnormalEntity);
 				reservationEntity.setReservationNum(reservationEntity.getReservationNum() + distributionLoadscanAbnormalEntity.getLoadingQuantity());
 				distributionReservationMapper.updateById(reservationEntity);