From 3716415b74536b2aff9b79d4219acc9cef6d6ae2 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 20 Oct 2024 10:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8BU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java  | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 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 f87e7fa63..ca4f978af 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
@@ -6169,7 +6169,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						p.setReservationNum(p.getQuantity());
 						p.setLoadingNub(0);
 						p.setSigningNub(0);
-						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getPackageId, p.getId()));
+						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
+							.eq(DistributionLoadscanEntity::getPackageId, p.getId())
+						);
 						if (Func.isNotEmpty(distributionLoadscanEntity)) {
 							//该包件存在扫描记录
 							String scanStatus = distributionLoadscanEntity.getScanStatus();
@@ -6193,20 +6195,22 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								default:
 									log.info("未知的扫描状态 scanStatus={}", scanStatus);
 							}
-							switch (distributionLoadscanEntity.getSignforType()) {
-								case 1:
-									p.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
-									break;
-								case 2:
-									p.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
-									break;
-								case 3:
-									p.setSignforType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
-									break;
-								default:
-									log.info("未知的签收方式 scanStatus={}", scanStatus);
-							}
 
+							if (!Objects.isNull(distributionLoadscanEntity.getSignforType())){
+								switch (distributionLoadscanEntity.getSignforType()) {
+									case 1:
+										p.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
+										break;
+									case 2:
+										p.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
+										break;
+									case 3:
+										p.setSignforType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
+										break;
+									default:
+										log.info("未知的签收方式 scanStatus={}", scanStatus);
+								}
+//							}
 							p.setLoadingNub(distributionLoadscanEntity.getLoadedNub());
 							p.setSigningNub(distributionLoadscanEntity.getReceivedQuantity());
 							if (Func.isNotEmpty(distributionLoadscanEntity.getSigningTime())) {