Merge branch 'dev' into pre-production

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();