From 2e1c5bbae3e0c2aae56ef9682623e1e4e30ed7f9 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 21 Aug 2024 15:11:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=A6=81=E6=8C=87=E5=AE=9A=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistrilbutionBillLadingServiceImpl.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 08521dbb7..1345e11a2 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -3353,6 +3353,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				//查询订单包件数量签收的信息
 				DistributionStockArticleEntity one = distributionStockArticleEntityList.stream().filter(s -> s.getId().equals(so.getStockArticleId())).findFirst().orElse(null);
 
+				DistributionStockArticleEntity upObj =new DistributionStockArticleEntity();
+				upObj.setId(so.getStockArticleId());
+
 
 				List<DistributionBillLadingScanEntity> list2 = new ArrayList<>();
 				for (DistributionBillLadingScanEntity distributionBillLadingScanEntity : distributionBillLadingScanEntities) {
@@ -3361,7 +3364,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					}
 				}
 
-				one.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
+				upObj.setOrderStatus(OrderStatusConstant.bufenqianshou.getValue());
 
 				//判断当前签收数 修改订单和备货订单状态
 				if (one.getTotalNumber().equals(list2.size() + 1)) {
@@ -3378,19 +3381,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					if (one1 != null) {
 						distributionAsyncService.updateBillStock(one1.getId());
 					}
-					one.setOrderStatus(OrderStatusConstant.qianshou.getValue());
+					upObj.setOrderStatus(OrderStatusConstant.qianshou.getValue());
 
 				}
 				//修改在库数量
 				if (ObjectUtils.isNotNull(one.getHandQuantity()) && one.getHandQuantity() > 0) {
 					int i = one.getHandQuantity() - 1;
 					int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1;
-					one.setHandQuantity(i);
-					one.setSigninQuantity(i2);
+					upObj.setHandQuantity(i);
+					upObj.setSigninQuantity(i2);
 				}
 
 				// 修改订单状态
-				distributionStockArticleService.updateById(one);
+				distributionStockArticleService.updateById(upObj);
 
 				//修改包件状态
 				distributionAsyncService.getSelfPickup(distributionParcelListEntity.getId());