1.开单加上品牌id和收货单位id

blade-biz-common/src/main/java/org/springblade/common/constant/carsload/CarsLoadLogTypeConstant.java

@@ -21,7 +21,10 @@ public enum CarsLoadLogTypeConstant {
 	CANCEL_NET_START_CARS_LOAD("网点取消发车",12),
 	END_ARRIVE_CARS_LOAD("终点到达",13),
 	CANCEL_END_ARRIVE_CARS_LOAD("终点取消到达",14),
-	END_UNLOAD_CARS_LOAD("终点卸车",15);
+	END_UNLOAD_CARS_LOAD("终点卸车",15),
+	TRIPARTITE_TRANSFER_SIGN("三方中转签收",16),
+	TRIPARTITE_TRANSFER_SETTLEMENT("三方中转结算",17),
+	SEND_DIRECTLY_SIGN("直发商家签收",18);
 
 	/**
 	 * 描述

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillFanoutListener.java

@@ -51,6 +51,8 @@ public class WaybillFanoutListener {
 		String waybillNo = jsonObject.getStr("waybillNo");
 		String typeService = jsonObject.getStr("typeService");//服务类型
 		Integer waybillType = jsonObject.getInt("waybillType");
+		Long brandId = jsonObject.getLong("brandId");
+		Long consigneeId = jsonObject.getLong("consigneeId");
 
 		List<StatisticsTrunklinePackageEntity> statisticsTrunklinePackageEntities = new ArrayList<>();
 		List<StatisticsWarehousePackageEntity> statisticsWarehousePackageEntities = new ArrayList<>();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java

@@ -359,6 +359,8 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
 		jsonObject.put("waybillId",waybillEntity.getId());
 		jsonObject.put("waybillNo",waybillNo);
 		jsonObject.put("waybillType",waybillType);
+		jsonObject.put("brandId",waybillEntity.getBrandId());
+		jsonObject.put("consigneeId",waybillEntity.getConsigneeId());
 		Long consigneeId = waybillEntity.getConsigneeId();
 		BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
 		if(Objects.isNull(basicdataClientEntity)){