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

优化

Browse Source
This commit is contained in:
lsymicc
2026-06-02 16:28:23 +08:00
parent c3689b2a6c
commit 361ec0dcb6
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,12 +4,16 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.UUID; import cn.hutool.core.lang.UUID;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.job.domain.JobCallBack; import com.ruoyi.job.domain.JobCallBack;
import com.ruoyi.job.service.IJobCallBackService; import com.ruoyi.job.service.IJobCallBackService;
import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue;
import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueueFinish;
import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueFinishService;
import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService; import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +41,8 @@ public class MydoJobServiceImpl implements IMydoJobService
private IJobCallBackService jobCallBackService; private IJobCallBackService jobCallBackService;
@Autowired @Autowired
private IDdjDeviceExecutionQueueService ddjDeviceExecutionQueueService; private IDdjDeviceExecutionQueueService ddjDeviceExecutionQueueService;
@Autowired
private IDdjDeviceExecutionQueueFinishService ddjDeviceExecutionQueueServiceFinishService;
/** /**
* 查询作业信息 * 查询作业信息
@@ -170,6 +176,9 @@ public class MydoJobServiceImpl implements IMydoJobService
map.put("v_rwh", rwh); map.put("v_rwh", rwh);
map.put("v_ddj_id", id); map.put("v_ddj_id", id);
mydoJobMapper.InvalidMydoJob(map); mydoJobMapper.InvalidMydoJob(map);
log.info("【人工操作】手动作废wcs任务并移除执行中的堆垛机队列，wcs任务号:{}", rwh);
if (Convert.toInt(map.get("v_result")) == 10){ if (Convert.toInt(map.get("v_result")) == 10){
return true; return true;
}else { }else {
@@ -237,6 +246,26 @@ public class MydoJobServiceImpl implements IMydoJobService
//移除实时任务 //移除实时任务
mydoJobMapper.deleteMydoJobByJobId(jobId); mydoJobMapper.deleteMydoJobByJobId(jobId);
log.info("【人工操作】手动完成wcs任务，wcs任务号:{}，wms任务号:{}", mydoJob.getTaskNo(), mydoJob.getWmsTaskNo());
DdjDeviceExecutionQueue queue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo());
try {
if (queue != null)
{
DdjDeviceExecutionQueueFinish queueFinish = BeanUtil.copyProperties(queue, DdjDeviceExecutionQueueFinish.class);
ddjDeviceExecutionQueueServiceFinishService.insertDdjDeviceExecutionQueueFinish(queueFinish);
ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo());
log.info("【人工操作】移除堆垛机队列，wcs任务号:{}", mydoJob.getTaskNo());
}
} catch (Exception e) {
}
} }
return AjaxResult.success("操作成功"); return AjaxResult.success("操作成功");