From f73767e95c39b9ebb097ba8084a33bf11f2b2123 Mon Sep 17 00:00:00 2001 From: FT577-Server Date: Fri, 16 Oct 2026 10:31:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=BF=90=E8=A1=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/service/impl/MydoJobServiceImpl.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) 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 f199342..a8263f2 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 @@ -252,6 +252,7 @@ public class MydoJobServiceImpl implements IMydoJobService //任务状态标记为【作废】 mydoJob.setStatus(TaskStatusEnum.CANCEL.getCode()); + mydoJob.setFinishTime(DateUtil.now()); updateMydoJob(mydoJob); log.warn("【手动作废】执行成功，当前作业已标记为<手动作废>，作业号:{}", jobId); @@ -316,6 +317,7 @@ public class MydoJobServiceImpl implements IMydoJobService //任务状态标记为【手动完成】 mydoJob.setStatus(TaskStatusEnum.MANUAL_FINISHED.getCode()); + mydoJob.setFinishTime(DateUtil.now()); updateMydoJob(mydoJob); log.warn("【手动操作】执行成功，当前作业已标记为<手动完成>，作业号:{}", jobId); @@ -341,7 +343,6 @@ public class MydoJobServiceImpl implements IMydoJobService return AjaxResult.error("查不到该作业，请检查作业状态"); } - //--------------------处理库存信息-------------------- //>>>>>>>>>>>>>>>>>>>>>>>常规入库<<<<<<<<<<<<<<<<<<<<<<<< //>>>>>>>>>>>>>>>>>>>>>>>常规入库<<<<<<<<<<<<<<<<<<<<<<<< @@ -452,8 +453,9 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态并移除作业 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); - mydoJobMapper.updateMydoJob(mydoJob); - mydoJobMapper.insertMydoJobFinish(mydoJob.getJobId()); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); + insertMydoJobFinish(mydoJob.getJobId()); deleteMydoJobByJobId(jobId); //2.移除所有子作业，任务子表插入历史 @@ -511,6 +513,9 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); + //2.不需要处理子任务，等待手持机确认出库 log.info("【账务处理】出库完成，等待确认，作业号:{}，托盘号:{}", jobId, mydoJob.getTrayCode()); @@ -545,7 +550,8 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态并移除作业 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); - mydoJobMapper.updateMydoJob(mydoJob); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); deleteMydoJobByJobId(jobId); //2.并移除所有子作业 @@ -599,6 +605,7 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态并移除作业 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); + mydoJob.setFinishTime(DateUtil.now()); updateMydoJob(mydoJob); deleteMydoJobByJobId(jobId); @@ -619,6 +626,8 @@ public class MydoJobServiceImpl implements IMydoJobService //更新任务主表状态 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); log.info("【账务处理-盘点出库】出库完成，等待确认，作业号:{}，托盘号:{}", jobId, mydoJob.getTrayCode()); @@ -706,8 +715,9 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态并移除作业 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); - mydoJobMapper.updateMydoJob(mydoJob); - mydoJobMapper.insertMydoJobFinish(mydoJob.getJobId()); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); + insertMydoJobFinish(mydoJob.getJobId()); deleteMydoJobByJobId(jobId); //2.移除所有子作业 @@ -782,7 +792,8 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态并移除作业 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); - mydoJobMapper.updateMydoJob(mydoJob); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); deleteMydoJobByJobId(jobId); //2.并移除所有子作业 @@ -813,7 +824,8 @@ public class MydoJobServiceImpl implements IMydoJobService //--------------------处理任务表和子任务表-------------------- //1.更新任务主表状态并移除作业 mydoJob.setStatus(TaskStatusEnum.AUTO_FINISHED.getCode()); - mydoJobMapper.updateMydoJob(mydoJob); + mydoJob.setFinishTime(DateUtil.now()); + updateMydoJob(mydoJob); deleteMydoJobByJobId(jobId); //2.并移除所有子作业