diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
index 8f8bf24a6..56587ca4a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
@@ -17,6 +17,7 @@
 package com.logpm.distribution.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -487,14 +488,18 @@ public class DistributionDeliveryListController extends BladeController {
 			List<String> packageCodes = (List<String>) r.getData();
 			log.info("#############signforPC:"+time+" 处理下架的包件 packageCodes={}",packageCodes);
 			String orderPackageCodes = null;
-			for (String packageCode : packageCodes) {
-				if(StringUtils.isBlank(orderPackageCodes)){
-					orderPackageCodes = packageCode;
-				}else{
-					orderPackageCodes = orderPackageCodes + "," + packageCode;
+
+			if(ObjectUtils.isNotNull(packageCodes)){
+				for (String packageCode : packageCodes) {
+					if(StringUtils.isBlank(orderPackageCodes)){
+						orderPackageCodes = packageCode;
+					}else{
+						orderPackageCodes = orderPackageCodes + "," + packageCode;
+					}
 				}
+				warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
 			}
-			warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId());
+
 		}catch (Exception e){
 			log.error("#############signforPC:"+time+" 下架失败",e);
 		}
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/SyncWarehouseDataToNew.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/SyncWarehouseDataToNew.java
index d903072c8..71614f706 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/SyncWarehouseDataToNew.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/SyncWarehouseDataToNew.java
@@ -255,7 +255,7 @@ public class SyncWarehouseDataToNew {
 			newEntity.setLinkman(oldWarehouse.getContactName());//仓库联系人
 			newEntity.setContactNumber(oldWarehouse.getPhone());//联系人电话
 			newEntity.setBusinessLine("");//事业线
-			newEntity.setFunctionType(typeMapping.get(oldWarehouse.getIsBase()));//仓库类型
+			newEntity.setFunctionType(String.valueOf(typeMapping.get(oldWarehouse.getIsBase())));//仓库类型
 			newEntity.setRemarks(oldWarehouse.getRemark());//备注
 			newEntity.setWarehouseAddress(oldWarehouse.getAddress());//仓库地址
 			newEntity.setLongitude(StringUtil.isBlank(oldWarehouse.getLng())?null:new BigDecimal(oldWarehouse.getLng()));//经度