From 25bcc67edbb1b2f02dae298dc617cd1eb031cc0b Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 7 Nov 2025 16:37:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B5=E5=AD=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pda/service/PdaServiceImp.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) 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 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 tagTasks = tagTaskService.selectTagTaskList(param); + if (CollUtil.isNotEmpty(tagTasks)) { + tagTaskService.deleteTagTaskByIds(tagTasks.stream() + .map(TagTask::getId) + .toArray(Long[]::new)); + } } - } }