diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
index 00611de..53b9cae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -510,19 +510,20 @@ public class PdaServiceImp implements PdaService {
     private void deleteTagTask(TrayCodeMakeSure trayCodeMakeSure, BasWarehouse basWarehouse, MydoJob mydoJob) {
         if ("2".equals(basWarehouse.getWarehouseType()) && "23".equals(mydoJob.getInOrOut())) {
             BasTag basTag = basTagService.selectBasTagByTrayCode(trayCodeMakeSure.getTrayCode());
-            basTag.setTrayCode("");
-            basTag.setSendCompleted("0");
-            basTagService.updateBasTag(basTag);
-            //删除电子标签
-            TagTask param = new TagTask();
-            param.setTagId(basTag.getId());
-            List<TagTask> tagTasks = tagTaskService.selectTagTaskList(param);
-            if (CollUtil.isNotEmpty(tagTasks)) {
-                tagTaskService.deleteTagTaskByIds(tagTasks.stream()
-                        .map(TagTask::getId)
-                        .toArray(Long[]::new));
+            if (ObjUtil.isNotNull(basTag)){
+                basTag.setTrayCode("");
+                basTag.setSendCompleted("0");
+                basTagService.updateBasTag(basTag);
+                //删除电子标签
+                TagTask param = new TagTask();
+                param.setTagId(basTag.getId());
+                List<TagTask> tagTasks = tagTaskService.selectTagTaskList(param);
+                if (CollUtil.isNotEmpty(tagTasks)) {
+                    tagTaskService.deleteTagTaskByIds(tagTasks.stream()
+                            .map(TagTask::getId)
+                            .toArray(Long[]::new));
+                }
             }
-
         }
     }