diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index bbe37f1de..f774fc89a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -398,22 +398,27 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             JSONObject 浅Attr = attrTab
                     .query("zdepth = '1' and row_num = '"+boxAttr.getString("row_num")+"' and col_num = '" + boxAttr.getString("col_num") + "' and layer_num = '"+boxAttr.getString("layer_num")+"'")
                     .uniqueResult(0);
-            // 判断浅货位是否有木箱
-            if (!ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))) {
-                // 判断是否被锁定
-                if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
-                    // 判断浅货位木箱和深货位木箱是否相同规格
-                    task_group_id = outBoxManageService.createBoxMove(浅Attr);
-                } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
-                    int 浅Task = taskService.count(new QueryWrapper<SchBaseTask>()
-                            .eq("is_delete", "0")
-                            .eq("point_code1", 浅Attr.getString("struct_code"))
-                            .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
-                    if (浅Task == 0){
-                        task_group_id = outBoxManageService.createBoxMove(浅Attr);
+            if (!ObjectUtil.isEmpty(浅Attr)){
+                //判断有没有浅货位入库任务
+                if (ObjectUtil.isEmpty(浅Attr.getString("storagevehicle_code"))){
+                    if (!浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
+                        throw new BadRequestException("木箱货位"+boxAttr.getString("struct_code")+"的浅货位存在正在执行的任务");
                     }
                 }else {
-                    throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code"));
+                    if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
+                        // 判断浅货位木箱和深货位木箱是否相同规格
+                        task_group_id = outBoxManageService.createBoxMove(浅Attr);
+                    } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
+                        int 浅Task = taskService.count(new QueryWrapper<SchBaseTask>()
+                                .eq("is_delete", "0")
+                                .eq("point_code1", 浅Attr.getString("struct_code"))
+                                .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
+                        if (浅Task == 0){
+                            task_group_id = outBoxManageService.createBoxMove(浅Attr);
+                        }
+                    }else {
+                        throw new BadRequestException("当前木箱所在货位"+boxAttr.getString("struct_code")+"对应浅货位存在任务"+浅Attr.getString("task_code"));
+                    }
                 }
             }
         }