From 9d5188376b5c044a57ebca600abe07d7842f1ff1 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 14 May 2024 18:54:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TrunklineAdvanceServiceImpl.java     | 122 +++++++++++-------
 .../impl/TrunklineCarsLoadServiceImpl.java    |  26 ++--
 2 files changed, 86 insertions(+), 62 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index ea028ac24..226cfe139 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -456,8 +456,12 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 			stockArticleEntity.setTypeService("1");//默认商配
 
-			if(!StringUtil.isBlank(waybillNo)){
-				if(!Objects.isNull(waybillEntity)){
+			if(Objects.isNull(waybillEntity)){
+				if(!StringUtil.isBlank(waybillNo)){
+					waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+					if(Objects.isNull(waybillEntity)){
+						throw new CustomerException(405,"运单信息不存在");
+					}
 					Long consigneeId = waybillEntity.getConsigneeId();
 
 					BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId);
@@ -479,45 +483,67 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 					if(!Objects.isNull(basicdataStoreBusinessEntity)){
 						stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
 					}
-				}
-			}else{
-				Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
-				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
-				if(!Objects.isNull(basicdataClientEntity)){
-					String clientType = basicdataClientEntity.getClientType();
-					if("5".equals(clientType)){
-						stockArticleEntity.setStoreId(basicdataClientEntity.getId());
-						stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
-						stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
-						//查询门店的父级商场
-						Long pid = basicdataClientEntity.getPid();
-						BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
-						if(!Objects.isNull(pidEntity)){
-							String pidEntityClientType = pidEntity.getClientType();
-							if("2".equals(pidEntityClientType)){
-								//商城
-								stockArticleEntity.setMallId(pidEntity.getId());
-								stockArticleEntity.setMallName(pidEntity.getClientName());
-								stockArticleEntity.setMallCode(pidEntity.getClientCode());
-
-								BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
-								if(!Objects.isNull(basicdataStoreBusinessEntity)){
-									stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+				}else{
+					Long clientId = basicdataTripartiteMallClient.getClientIdByNameAndBrand(dealerName, advanceEntity.getBrand());
+					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+					if(!Objects.isNull(basicdataClientEntity)){
+						String clientType = basicdataClientEntity.getClientType();
+						if("5".equals(clientType)){
+							stockArticleEntity.setStoreId(basicdataClientEntity.getId());
+							stockArticleEntity.setStoreCode(basicdataClientEntity.getClientCode());
+							stockArticleEntity.setStoreName(basicdataClientEntity.getClientName());
+							//查询门店的父级商场
+							Long pid = basicdataClientEntity.getPid();
+							BasicdataClientEntity pidEntity = basicdataClientClient.findEntityById(pid);
+							if(!Objects.isNull(pidEntity)){
+								String pidEntityClientType = pidEntity.getClientType();
+								if("2".equals(pidEntityClientType)){
+									//商城
+									stockArticleEntity.setMallId(pidEntity.getId());
+									stockArticleEntity.setMallName(pidEntity.getClientName());
+									stockArticleEntity.setMallCode(pidEntity.getClientCode());
+
+									BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(pidEntity.getId(), 3);
+									if(!Objects.isNull(basicdataStoreBusinessEntity)){
+										stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+									}
 								}
 							}
-						}
-					}else if("2".equals(clientType)){
-						//商城
-						stockArticleEntity.setMallId(basicdataClientEntity.getId());
-						stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-						stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
-
-						BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
-						if(!Objects.isNull(basicdataStoreBusinessEntity)){
-							stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+						}else if("2".equals(clientType)){
+							//商城
+							stockArticleEntity.setMallId(basicdataClientEntity.getId());
+							stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
+							stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
+
+							BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(basicdataClientEntity.getId(), 3);
+							if(!Objects.isNull(basicdataStoreBusinessEntity)){
+								stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+							}
 						}
 					}
 				}
+			}else{
+				Long consigneeId = waybillEntity.getConsigneeId();
+
+				BasicdataClientEntity clientEntity = basicdataClientClient.findEntityById(consigneeId);
+				if(!Objects.isNull(clientEntity)){
+					stockArticleEntity.setMallId(clientEntity.getId());
+					stockArticleEntity.setMallName(clientEntity.getClientName());
+					stockArticleEntity.setMallCode(clientEntity.getClientCode());
+				}
+				String consignee = waybillEntity.getConsignee();
+				String consigneeName = waybillEntity.getConsigneeName();
+				String consigneeMobile = waybillEntity.getConsigneeMobile();
+				String consigneeAddress = waybillEntity.getConsigneeAddress();
+				stockArticleEntity.setConsigneeUnit(consignee);
+				stockArticleEntity.setConsigneePerson(consigneeName);
+				stockArticleEntity.setConsigneeMobile(consigneeMobile);
+				stockArticleEntity.setConsigneeAddress(consigneeAddress);
+
+				BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(consigneeId, 3);
+				if(!Objects.isNull(basicdataStoreBusinessEntity)){
+					stockArticleEntity.setTypeService(basicdataStoreBusinessEntity.getMold());
+				}
 			}
 
 			stockArticleEntity.setCustomerName(advanceEntity.getCustomerName());
@@ -564,19 +590,17 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 			parcelList.setWarehouse(warehouseEntity.getName());
 			parcelList.setWarehouseId(warehouseId);
 			String waybillNo = advanceEntity.getWaybillNo();
-			if(StringUtil.isNotBlank(waybillNo)){
-				if(!Objects.isNull(waybillEntity)){
-					Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
-					Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
-					parcelList.setWaybillId(waybillEntity.getId());
-					parcelList.setWaybillNumber(waybillEntity.getWaybillNo());
-					parcelList.setSendWarehouseId(departureWarehouseId);
-					parcelList.setSendWarehouseName(waybillEntity.getDepartureWarehouseName());
-					parcelList.setAcceptWarehouseId(destinationWarehouseId);
-					parcelList.setAcceptWarehouseName(waybillEntity.getDestinationWarehouseName());
-					if(departureWarehouseId.equals(destinationWarehouseId)){
-						parcelList.setIsTransfer(0);
-					}
+			if(!Objects.isNull(waybillEntity)){
+				Long departureWarehouseId = waybillEntity.getDepartureWarehouseId();
+				Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
+				parcelList.setWaybillId(waybillEntity.getId());
+				parcelList.setWaybillNumber(waybillEntity.getWaybillNo());
+				parcelList.setSendWarehouseId(departureWarehouseId);
+				parcelList.setSendWarehouseName(waybillEntity.getDepartureWarehouseName());
+				parcelList.setAcceptWarehouseId(destinationWarehouseId);
+				parcelList.setAcceptWarehouseName(waybillEntity.getDestinationWarehouseName());
+				if(departureWarehouseId.equals(destinationWarehouseId)){
+					parcelList.setIsTransfer(0);
 				}
 			}
 			parcelList.setConditions(1);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 82139f5ab..f49e4c1c5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -2194,7 +2194,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //					log.warn("################loadingScan: 下架及解托包件失败");
 //				}
 
-
 				carsLoadScanEntity.setIsData(1);
 				isData = 1;
 				Long otherPackageId = otherParcelListEntity.getId();
@@ -2243,16 +2242,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			Long packageId = parcelListEntity.getId();
 			waybillNo = parcelListEntity.getWaybillNumber();
 			orderCode = parcelListEntity.getOrderCode();
+			waybillId = parcelListEntity.getWaybillId();
 			fromWarehouseId = parcelListEntity.getWarehouseId();
 			BasicdataWarehouseEntity fromWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(fromWarehouseId);
 			if (!Objects.isNull(fromWarehouseEntity)) {
 				fromWarehouseName = fromWarehouseEntity.getName();
 			}
-			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			if (!Objects.isNull(waybillEntity)) {
-				waybillId = waybillEntity.getId();
-			}
-
 
 			carsLoadScanEntity.setWaybillId(waybillId);
 			carsLoadScanEntity.setWaybillNo(waybillNo);
@@ -5347,15 +5342,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						}
 						Long wid = parcelListEntity.getWarehouseId();
 						String waybillNumber = parcelListEntity.getWaybillNumber();
-						WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
-						Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
-						parcelListEntity.setOrderPackageStatus("20");
-						if (destinationWarehouseId.equals(wid)) {
+						Long waybillId = parcelListEntity.getWaybillId();
+						if(!Objects.isNull(waybillId)){
+							WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 							parcelListEntity.setIsTransfer(0);
-						} else {
-							parcelListEntity.setIsTransfer(1);
+							if(!Objects.isNull(waybillEntity)){
+								Long destinationWarehouseId = waybillEntity.getDestinationWarehouseId();
+								parcelListEntity.setOrderPackageStatus("20");
+								if (destinationWarehouseId.equals(wid)) {
+									parcelListEntity.setIsTransfer(0);
+								} else {
+									parcelListEntity.setIsTransfer(1);
+								}
+							}
 						}
-
 						distributionParcelListClient.update(parcelListEntity);
 						if (StringUtil.isNotBlank(trayCode)) {
 							updownTypeClient.downPackageOrDelTray(scanCode, warehouseId, "包件下架解托");