From 62a96cb530922686535c5873cd467233492d6807 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sun, 24 Dec 2023 08:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E4=BA=BA=E7=9A=84=E5=88=A4=E6=96=AD=20?=
 =?UTF-8?q?=E5=92=8C=E7=8A=B6=E6=80=81=E5=8F=98=E6=8D=A2=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionParcelListServiceImpl.java    | 16 ++++++++++++++--
 .../impl/DistributionSignforServiceImpl.java  | 19 +++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 2eb9132ae..af7adcbb2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -183,8 +183,12 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			.eq("is_deleted",0);
 		DistributionParcelListEntity parcelListEntity = baseMapper.selectOne(queryWrapper);
 		parcelListEntity.setOrderPackageGroundingStatus(groundingStatus);
-		int i = baseMapper.updateById(parcelListEntity);
-		if (i == 1){
+//		int i = baseMapper.updateById(parcelListEntity);
+
+		try{
+			// 更新状态
+			baseMapper.updateOrderPackageCodeById(parcelListEntity.getId(),groundingStatus);
+
 			String orderCode = parcelListEntity.getOrderCode();
 
 			QueryWrapper<DistributionStockArticleEntity> stockArticleEntityQueryWrapper = new QueryWrapper<>();
@@ -210,7 +214,15 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				//更新订单上架状态
 				baseMapper.updateOrderGroundingStatus(orderCode,"20",warehouseId);
 			}
+
+		}catch (Exception e){
+
+			// 更新状态报错
+			log.error(">>>>>> updateGroundingStatus 异常信息",e);
 		}
+
+
+
 	}
 
 	/**
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 d6853a19e..914c443e2 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
@@ -704,8 +704,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				loadscanEntity.setSigningTime(signingTime);
 				loadscanEntity.setSignforState(2);
 				loadscanEntity.setReceivedQuantity(loadscanEntity.getLoadedNub());
-				loadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
-				loadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
+
+				String nickName = AuthUtil.getNickName();
+				Long userId = AuthUtil.getUserId();
+
+				try{
+
+					 nickName = AuthUtil.getNickName();
+					 userId = AuthUtil.getUserId();
+				}catch (Exception e){
+					log.error(">>>>> 签收异常报错",e);
+					throw new CustomerException("当前登录信息不已失效，请重新登录");
+				}
+
+				loadscanEntity.setSigningUser(nickName);
+				loadscanEntity.setSigningUserId(userId);
+
+
 				distributionLoadscanService.updateById(loadscanEntity);
 				//缺少一个异步维护包件签收的方法
 //				distributionAsyncService.changeOrderSignforStatus(collect.get(0));