From f03f0c941c73dd223669ae2728cfb3901762c108 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 15 Jan 2025 18:40:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(all):=20=E7=B4=A2=E8=8F=B2=E4=BA=9A?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 增加华之韵物流对接
---
 .../suofeiya/service/impl/DeliveryNoteServiceImpl.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
index e5b1bcc02..4fcf56d6d 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/DeliveryNoteServiceImpl.java
@@ -254,7 +254,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 	public FactoryAuthVO findFactoryAuth(String companyCode) {
 		// redis 缓存数据 缓存时间 1天
 		if (StrUtil.isNotBlank(companyCode)) {
-			String key = StrUtil.format("factory-data:suofeiya:", companyCode);
+			String key = "factory-data:suofeiya:" + companyCode;
 			String json = bladeRedis.get(key);
 			if (StrUtil.isNotBlank(json)) {
 				return JSONUtil.toBean(json, FactoryAuthVO.class);
@@ -274,7 +274,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 	public FactoryAuthVO findFactoryAuthByTenantCode(String tenantId) {
 		// redis 缓存数据 缓存时间 1天
 		if (StrUtil.isNotBlank(tenantId)) {
-			String key = StrUtil.format("factory-data:suofeiya:tenant-code:", tenantId);
+			String key = "factory-data:suofeiya:tenant-code:" + tenantId;
 			String json = bladeRedis.get(key);
 			if (StrUtil.isNotBlank(json)) {
 				return JSONUtil.toBean(json, FactoryAuthVO.class);

From 0f96080fd3a44b3aa2c47fd73d80e13ff4de02f1 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 15 Jan 2025 22:27:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TrunklineCarsLoadServiceImpl.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 d95e375b8..fa76b69b5 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
@@ -1598,11 +1598,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					List<TrunklineCarsOrderDTO> lineCarsOrderList = carsLoadLineDTO.getAddList();
 					//把lineCarsOrderList中的所有运单号合并成一个集合
 					List<String> waybillNos = lineCarsOrderList.stream().map(TrunklineCarsOrderDTO::getWaybillNo).collect(Collectors.toList());
-					List<WarehouseWaybillEntity> freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos);
-					if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) {
-						log.warn("##########saveNew: 运单有变动，请重新做计划");
-						throw new CustomerException(400, "运单有变动，请重新做计划");
+					if(!waybillNos.isEmpty()){
+						List<WarehouseWaybillEntity> freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos);
+						if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) {
+							log.warn("##########saveNew: 运单有变动，请重新做计划");
+							throw new CustomerException(400, "运单有变动，请重新做计划");
+						}
 					}
+
 					for (TrunklineCarsOrderDTO carsOrderDTO : lineCarsOrderList) {
 						Integer planNum = carsOrderDTO.getPlanNum();
 						String orderCode = carsOrderDTO.getOrderCode();