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

请求逻辑提示信息优化

Browse Source
This commit is contained in:
lsymicc
2026-05-11 14:09:07 +08:00
parent 93d7877620
commit 4566753e09
7 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
View File

@@ -112,12 +112,12 @@ public class MydoJobController extends BaseController
return toAjax(mydoJobService.deleteMydoJobByJobIds(jobIds));
}
@PreAuthorize("@ss.hasAnyPermi('job:mydoJob:OuthandFinish')")
@PreAuthorize("@ss.hasAnyPermi('job:mydoJob:outhandFinish')")
@Log(title = "出库手动完成", businessType = BusinessType.OTHER)
@RequestMapping("/OuthandFinish")
@RequestMapping("/outhandFinish")
public AjaxResult manualCompleted(@RequestParam("jobIds")String[] jobIds)
{
return mydoJobService.OuthandFinish(jobIds);
return mydoJobService.outhandFinish(jobIds);
}
@PreAuthorize("@ss.hasAnyPermi('job:mydoJob:resendTaskToEntrance')")

6
ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
View File

@@ -1,13 +1,9 @@
package com.ruoyi.job.service;
import java.util.HashMap;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.job.domain.MydoJob;
import org.apache.ibatis.annotations.Param;
/**
* 作业信息Service接口
@@ -92,7 +88,7 @@ public interface IMydoJobService
MydoJob selectMydoJobByEntranceList1(String entranceId);
AjaxResult OuthandFinish(String[] jobIds);
AjaxResult outhandFinish(String[] jobIds);
AjaxResult ManuelTaskFinish(String taskNo);

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

@@ -102,11 +102,15 @@ public class MydoJobServiceImpl implements IMydoJobService
mydoJobMapper.insertHistory(jobId);
//当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常）
// 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作
String taskNo = selectMydoJobByJobId(jobId).getTaskNo();
if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(taskNo) != null) {
ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo);
if (selectMydoJobByJobId(jobId) != null){
String taskNo = selectMydoJobByJobId(jobId).getTaskNo();
if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(taskNo) != null) {
ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo);
}
}
}
return mydoJobMapper.deleteMydoJobByJobIds(jobIds);
}
@@ -207,12 +211,11 @@ public class MydoJobServiceImpl implements IMydoJobService
/**
* 手动完成同一【作业单号】的作业
* 如果【jobid】和【taskno】是一对多的情况，使用上一个方法<OuthandFinish>手动完成作业会导致整个【jobid】单据完成回传
* @param jobIds
* @return
*/
@Override
public AjaxResult OuthandFinish(String[] jobIds) {
public AjaxResult outhandFinish(String[] jobIds) {
//获取所有符合【任务单号】的作业
for (String jobId : jobIds) {