diff --git a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java
index 3cfdae31c166c85556a40ef0047f7bf8683e2f86..594ee57ea9a20acb6e1cf71360902f4518189301 100644
--- a/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java
+++ b/maintain-business/src/main/java/com/maintain/business/domain/bo/ErpWarehouseLocationBo.java
@@ -29,7 +29,6 @@ public class ErpWarehouseLocationBo extends BaseEntity {
     /**
      * 仓库货位部门ID
      */
-    @NotNull(message = "部门ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deptId;
 
     /**
@@ -40,7 +39,6 @@ public class ErpWarehouseLocationBo extends BaseEntity {
     /**
      * 仓库ID
      */
-    @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long warehouseId;
 
     /**
diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java
index 2afd6929571690f0aa63118c0331891f2302b47c..9b14d4d5b49d2fa70e589db7deb4910f302c9637 100644
--- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java
+++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpWarehouseLocationServiceImpl.java
@@ -85,11 +85,15 @@ public class ErpWarehouseLocationServiceImpl implements IErpWarehouseLocationSer
         if (!baseMapper.selectList(queryWrapper).isEmpty()) {
             throw new RuntimeException("仓库货位已存在，请调整后再试");
         }
-        SysDept sysDept = deptMapper.selectVoById(add.getDeptId());
-        add.setDeptName(sysDept.getDeptName());
-        ErpWarehouseVo warehouseVo = warehouseMapper.selectVoById(add.getWarehouseId());
-        add.setWarehouseCode(warehouseVo.getCode());
-        add.setWarehouseName(warehouseVo.getName());
+        if (add.getDeptId() != null) {
+            SysDept sysDept = deptMapper.selectVoById(add.getDeptId());
+            add.setDeptName(sysDept.getDeptName());
+        }
+        if (add.getWarehouseId() != null) {
+            ErpWarehouseVo warehouseVo = warehouseMapper.selectVoById(add.getWarehouseId());
+            add.setWarehouseCode(warehouseVo.getCode());
+            add.setWarehouseName(warehouseVo.getName());
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());