From 34ec60f5178a62474daa54ad00bbbc86e37fde3f Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Tue, 21 Jan 2025 14:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B4=BE=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/shipment/pojo/DefaultShipmentManager.java       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java b/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java
index 3459978..22d4893 100644
--- a/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java
+++ b/src/main/java/com/dev/stms/server/service/shipment/pojo/DefaultShipmentManager.java
@@ -4981,10 +4981,8 @@ ShipmentManager {
 			    //数量
 			    Double quantity=0d;
 			    //承运商
-			    Long carrierId=legs.get(0).getOrder().getCarrier().getId();
-			    if(carrierId==null){
-			    	carrierId=6070L;//默认一个承运商
-			    }
+			    Long carrierId=legs.get(0).getOrder().getCarrier()==null?6070L:legs.get(0).getOrder().getCarrier().getId();
+			
 			    for(Legs leg:legs){
 			    	weight+=leg.getOrder().getWeight();
 			    	quantity+=leg.getOrder().getQuantity();