From e23d45f50b7c0b58f252d59a2328c1d9403d4783 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Fri, 12 Jan 2024 01:04:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/vo/DistributionBillOrderVO.java     |  4 ++++
 .../impl/DistrilbutionBillLadingServiceImpl.java     |  5 +++++
 .../impl/DistrilbutionBillStockServiceImpl.java      | 12 +++++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java
index dc5ff35d2..e4141de2b 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java
@@ -43,4 +43,8 @@ public class DistributionBillOrderVO {
 	 * 提货状态
 	 */
 	private String conditions;
+	/**
+	 * 提货状态名稱
+	 */
+	private String conditionsName;
 }
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 f095b5d5d..b6be06ac7 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
@@ -1792,6 +1792,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				parcelListEntity.setId(i.getParceListId());
 				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 				distributionParcelListService.updateById(parcelListEntity);
+				//修改订单状态
+				DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+				stockArticleEntity.setId(i.getStockArticleId());
+				stockArticleEntity.setOrderReceiveStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+				distributionStockArticleService.updateById(stockArticleEntity);
 //				DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
 //				billLadingScan.setMaterialType("2");
 //				billLadingScan.setScanType(2);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java
index 1f9f8a339..c1826e081 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java
@@ -71,6 +71,9 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			if(StringUtils.isNotBlank(i.getStockupStatus())){
 				i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus()));
 			}
+			if(ObjectUtils.isNotNull(i.getConditions())){
+				i.setConditionsName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS,i.getConditions()));
+			}
 		});
 		return billOrderDetail;
 	}
@@ -90,10 +93,13 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 		DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class);
 		IPage<DistributionBillOrderPackVO> billOrderPack = baseMapper.getBillOrderPack(page, billStock);
 		billOrderPack.getRecords().forEach(i -> {
-			R<User> userR = userClient.userInfoById(Long.valueOf(i.getStockupCreateUser()));
-			if(userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){
-				i.setStockupCreateUser(userR.getData().getRealName());
+			if(ObjectUtils.isNotNull(i.getStockupCreateUser())){
+				R<User> userR = userClient.userInfoById(Long.valueOf(i.getStockupCreateUser()));
+				if(userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){
+					i.setStockupCreateUser(userR.getData().getRealName());
+				}
 			}
+
 		});
 		return billOrderPack;
 	}