diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java index d1deef8..97d18c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java @@ -361,7 +361,7 @@ public class MydoJobServiceImpl implements IMydoJobService List details = mydoJobDetailService.selectMydoJobDetailByJobId(jobId); if (details.isEmpty()){ log.warn("【任务完成】查不到该作业对应的子单明细,请检查子单状态,任务号:" + jobId); - return AjaxResult.error("查不到该作业对应的子单明细,请检查子单状态"); +// return AjaxResult.error("查不到该作业对应的子单明细,请检查子单状态"); } //生成库存编号 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java index c659592..f58c7ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java @@ -248,6 +248,11 @@ public class MydoJobHandler { inStockinDetail.setStatus(0); inStockinDetailService.updateInStockinDetail(inStockinDetail); } + + InTrayMsg msg = intrayMsgService.selectInTrayMsgByRollerNumber(mydoJobDetail.getRollerNumber()); + if (ObjUtil.isNotNull(msg)){ + intrayMsgService.deleteInTrayMsgByRollerNumber(mydoJobDetail.getRollerNumber()); + } } mydoJobService.insertMydoJobFinish(mydoJob.getJobId());