From 2841dbcb581b79702e91036d6d1a27df686088d0 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 2 Sep 2024 08:37:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrunklineWaybillTrackServiceImpl.java     | 72 +++++++------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java
index 5c734bfb0..f9aa26336 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillTrackServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -50,22 +51,30 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 	@Override
 	public void addSignWaybillLog(WaybillLogDTO waybillLogDTO) {
 
-		String waybillNo = waybillLogDTO.getWaybillNo();
-
-		if(StringUtil.isNotBlank(waybillNo)){
-			WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			Integer waybillType = warehouseWaybillEntity.getWaybillType();
-			Long waybillId = warehouseWaybillEntity.getId();
-			if(waybillType == 1){
-				//订制品运单
-				//加入零担运单签收日志
-				addPackageWaybillTrackLog(waybillLogDTO,waybillId);
-
-			}else if(waybillType == 2){
-				//零担运单
-				addZeroWaybillTrackLog(waybillLogDTO,warehouseWaybillEntity);
-
+		try {
+			String waybillNo = waybillLogDTO.getWaybillNo();
+
+			if(StringUtil.isNotBlank(waybillNo)){
+				WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
+				if(Objects.isNull(warehouseWaybillEntity)){
+					log.warn("未找到运单信息 waybillNo:{}",waybillNo);
+					return;
+				}
+				Integer waybillType = warehouseWaybillEntity.getWaybillType();
+				Long waybillId = warehouseWaybillEntity.getId();
+				if(waybillType == 1){
+					//订制品运单
+					//加入零担运单签收日志
+					addPackageWaybillTrackLog(waybillLogDTO,waybillId);
+
+				}else if(waybillType == 2){
+					//零担运单
+					addZeroWaybillTrackLog(waybillLogDTO,warehouseWaybillEntity);
+
+				}
 			}
+		} catch (Exception e) {
+			log.error("添加签收日志失败",e);
 		}
 	}
 
@@ -116,39 +125,6 @@ public class TrunklineWaybillTrackServiceImpl extends BaseServiceImpl<TrunklineW
 		openOrderAsyncService.saveLog(waybillId,waybillNo,"100",warehouseName+" "+typeStr,operationRemark,nickName,userId,warehouseId,warehouseName);
 
 		trunklineWaybillPackageService.updateWaybillStatus(warehouseWaybillEntity);
-//		if(type != 2){
-//
-//			//需要更新运单的状态
-//			TrunklineWaybillOrderEntity waybillOrderEntity = waybillOrderService.findEntityByWaybillNoAndOrderCode(waybillNo, waybillNo);
-//			if(!Objects.isNull(waybillOrderEntity)){
-//				int waybillStatusInt = Integer.parseInt(warehouseWaybillEntity.getWaybillStatus());
-//				Integer totalCount = warehouseWaybillEntity.getTotalCount();
-//				Integer handleNumber = waybillOrderEntity.getHandleNumber();
-//				int i = handleNumber + num;
-//				if(waybillStatusInt < 90){
-//					if(num == totalCount){
-//						warehouseWaybillEntity.setWaybillStatus("100");
-//						waybillOrderEntity.setHandleNumber(num);
-//					}else{
-//						warehouseWaybillEntity.setWaybillStatus("90");
-//						waybillOrderEntity.setHandleNumber(num);
-//					}
-//					warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
-//					waybillOrderService.updateById(waybillOrderEntity);
-//				}else if(waybillStatusInt == 90){
-//					if(i == totalCount){
-//						warehouseWaybillEntity.setWaybillStatus("100");
-//						waybillOrderEntity.setHandleNumber(i);
-//					}else{
-//						waybillOrderEntity.setHandleNumber(i);
-//					}
-//					warehouseWaybillClient.updateEntity(warehouseWaybillEntity);
-//					waybillOrderService.updateById(waybillOrderEntity);
-//				}
-//			}
-//		}else{
-//			trunklineWaybillPackageService.updateWaybillStatus(warehouseWaybillEntity);
-//		}
 	}
 
 	private void addPackageWaybillTrackLog(WaybillLogDTO waybillLogDTO,Long waybillId) {