From b5b02e6f86bec1d7dac3ddd74c5816db212449be Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 23 Aug 2024 10:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E9=A2=84=E7=BA=A6=E3=80=81=E5=A4=87=E8=B4=A7=E3=80=81?=
 =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E7=9A=84=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListServiceImpl.java  |  4 +--
 .../DistributionReservationServiceImpl.java   | 27 ++++++-------------
 .../impl/DistributionStockupServiceImpl.java  |  2 +-
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 394b5a279..875a1a233 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -7410,7 +7410,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -7435,7 +7435,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = warehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index a6ef6010d..cf8b7687c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -523,9 +523,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			log.error("参数错误+{" + distributionReservationDTO + "}");
 			return R.status(false);
 		}
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) {
 			// 获取商场的仓库
-			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 			distributionReservationDTO.setWarehouseId(myCurrentWarehouse.getId());
 			distributionReservationDTO.setWarehouseName(myCurrentWarehouse.getName());
 			if (Func.isEmpty(distributionReservationDTO.getWarehouseId())) {
@@ -534,19 +534,6 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			}
 
 		}
-
-
-		//
-
-//		if (Func.isEmpty(distributionReservationDTO.getWarehouseName())){
-//			log.error("WarehouseName参数错误+{" + distributionReservationDTO.getWarehouseName() + "}");
-//			return R.status(false);
-//		}
-//		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-//		if (Func.isEmpty(myCurrentWarehouse)) {
-//			return R.fail("无仓库信息!!!");
-//		}
-
 		//构建预约单
 		DistributionReservationEntity reservationEntity = new DistributionReservationEntity();
 		Func.copy(distributionReservationDTO, reservationEntity);
@@ -958,7 +945,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -982,7 +969,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -1007,7 +994,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -1031,7 +1018,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		BladeUser user = AuthUtil.getUser();
 		SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
 		String format1 = format.format(new Date());
-		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getWarehouseByDepartment(user.getDeptId());
+		BasicdataWarehouseEntity warehouseByDepartment = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (ObjectUtil.isNotEmpty(warehouseByDepartment)) {
 			sb.append(warehouseByDepartment.getWarehouseCode());
 			sb.append(format1);
@@ -1328,7 +1315,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 				stockupInfoEntity.setStockUpType(StockupTypeConstant.shipei.getValue());
 				stockupInfoEntity.setReservationId(ids.get(i));
-				stockupInfoEntity.setStockupId(stockupEntity.getId());
+				if(stockupEntity!=null){
+					stockupInfoEntity.setStockupId(stockupEntity.getId());
+				}
 				distributionStockupInfoService.save(stockupInfoEntity);
 				reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 			}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index c6910f8ec..161e6908a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -1760,7 +1760,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}
 
 		String deptId = AuthUtil.getDeptId();
-		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByDepartment(deptId);
+		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getMyCurrentWarehouse();
 
 		List<String> ls = new ArrayList<>();
 		for (int i = 0; i < packageNum; i++) {