lsy/FT577-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场运行调整

Browse Source
This commit is contained in:
FT577-Server
2026-10-16 10:31:29 +08:00
parent d0ba03e9c9
commit f73767e95c
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-admin/src/main/java/com/ruoyi/in/job/service/impl/MydoJobServiceImpl.java
View File

@@ -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.并移除所有子作业