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

添加手动回传 重新下发按钮

Browse Source
This commit is contained in:
liuhanqing
2025-11-07 09:31:30 +08:00
parent ee86fbe37f
commit 252a919c54
6 changed files with 88 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,4 +113,13 @@ public class MydoJobController extends BaseController
{
return toAjax(mydoJobService.deleteMydoJobByJobIds(jobIds));
}
@PreAuthorize("@ss.hasPermi('job:mydoJob:manualCallback')")
@Log(title = "作业信息", businessType = BusinessType.UPDATE)
@GetMapping("/manualCallback/{jobId}")
public AjaxResult manualCallback(@PathVariable("jobId") String jobId)
{
return mydoJobService.manualCallback(jobId);
}
}

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

@@ -1,6 +1,8 @@
package com.ruoyi.job.service;
import java.util.List;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.job.domain.MydoJob;
/**
@@ -76,4 +78,6 @@ public interface IMydoJobService
List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
MydoJob selectRunningMydoJobByExitList(List<String> strings);
AjaxResult manualCallback(String jobId);
}

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

@@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.List;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjUtil;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -158,4 +160,17 @@ public class MydoJobServiceImpl implements IMydoJobService
public MydoJob selectRunningMydoJobByExitList(List<String> exitList) {
return mydoJobMapper.selectRunningMydoJobByExitList(exitList);
}
@Override
public AjaxResult manualCallback(String jobId) {
MydoJob mydoJob = mydoJobMapper.selectMydoJobByJobId(jobId);
if (ObjUtil.isNull(mydoJob)){
return AjaxResult.warn("作业不存在");
}
boolean b = ddjTaskFinish(Convert.toLong(mydoJob.getTaskNo()), Convert.toInt(mydoJob.getRoadwayId()), 1);
if (b){
return AjaxResult.success("手动回调成功");
}
return AjaxResult.error("手动回调失败");
}
}

8
ruoyi-ui/src/api/job/mydoJob.js
View File

@@ -51,3 +51,11 @@ export function delMydoJob(jobId) {
method: 'delete'
})
}
// 导出作业信息
export function manualCallback(jobId) {
return request({
url: '/job/mydoJob/manualCallback/'+jobId,
method: 'get',
})
}

61
ruoyi-ui/src/views/job/mydoJob/index.vue
View File

@@ -129,7 +129,7 @@
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">-->
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
@@ -140,28 +140,28 @@
<!-- v-hasPermi="['job:mydoJob:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['job:mydoJob:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['job:mydoJob:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['job:mydoJob:edit']"
>手动回传</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['job:mydoJob:remove']"
>手动作废</el-button>
</el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
@@ -173,7 +173,7 @@
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
</el-row>
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
@@ -200,7 +200,7 @@
<el-table-column label="出口ID" align="center" prop="exitId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<!-- <el-table-column label="重分标志" align="center" prop="faultFlag" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -217,7 +217,7 @@
v-hasPermi="['job:mydoJob:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table-column>-->
</el-table>
<pagination
@@ -283,7 +283,7 @@
</template>
<script>
import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish} from "@/api/job/mydoJob"
import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish,manualCallback} from "@/api/job/mydoJob"
export default {
name: "MydoJob",
@@ -417,10 +417,9 @@ export default {
handleUpdate(row) {
this.reset()
const jobId = row.jobId || this.ids
getMydoJob(jobId).then(response => {
this.form = response.data
this.open = true
this.title = "修改作业信息"
manualCallback(jobId).then(response => {
this.$modal.msgSuccess("手动回调成功")
this.getList()
})
},
/** 提交按钮 */

41
ruoyi-ui/src/views/queue/ddj/index.vue
View File

@@ -159,6 +159,17 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['queue:ddj:edit']"
>重新下发</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="primary"
@@ -169,17 +180,7 @@
v-hasPermi="['queue:ddj:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['queue:ddj:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@@ -206,7 +207,7 @@
<el-table v-loading="loading" :data="ddjList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="uuid" align="center" prop="uuid" />
<!-- <el-table-column label="uuid" align="center" prop="uuid" width="320"/>-->
<el-table-column label="任务号" align="center" prop="rwh" />
<el-table-column label="设备id" align="center" prop="devId" />
<el-table-column label="设备名称" align="center" prop="devName" />
@@ -227,9 +228,9 @@
<dict-tag :options="dict.type.ddj_rwlx" :value="scope.row.rwlx"/>
</template>
</el-table-column>
<el-table-column label="生成时间" align="center" prop="scsj" />
<el-table-column label="下发时间" align="center" prop="xfsj" />
<el-table-column label="结束时间" align="center" prop="jssj" />
<el-table-column label="生成时间" align="center" prop="scsj" width="160" />
<el-table-column label="下发时间" align="center" prop="xfsj" width="160" />
<el-table-column label="结束时间" align="center" prop="jssj" width="160" />
<el-table-column label="命令方式" align="center" prop="mlfs" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -468,10 +469,12 @@ export default {
handleUpdate(row) {
this.reset()
const uuid = row.uuid || this.ids
getDdj(uuid).then(response => {
this.form = response.data
this.open = true
this.title = "修改堆垛机执行队列"
this.form.uuid = uuid[0]
this.form.ddjxf = 0
updateDdj(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
},
/** 提交按钮 */