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

优化0120

Browse Source
This commit is contained in:
zj
2026-01-20 16:45:46 +08:00
parent 6c2d8fcb0f
commit d2d871baf1
26 changed files with 335 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,3 +51,13 @@ export function delMydoJob(jobId) {
method: 'delete'
})
}
export function handFinish(jobIds) {
return request({
url: '/job/mydoJob/OuthandFinish',
method: 'get',
params: { jobIds: jobIds }
})
}

1
ruoyi-ui/src/api/queue/ddj.js
View File

@@ -49,4 +49,5 @@ export function delDdj(uuid) {
url: '/queue/ddj/' + uuid,
method: 'delete'
})
}

26
ruoyi-ui/src/views/agv/queue/index.vue
View File

@@ -54,6 +54,20 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['agv:queue:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="queueList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="请求编号" align="center" prop="reqCode" />
@@ -82,6 +96,18 @@
<dict-tag :options="dict.type.wms_task_type" :value="scope.row.wmsTaskType"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['agv:queue:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination

38
ruoyi-ui/src/views/device/ddj/index.vue
View File

@@ -158,25 +158,25 @@
</el-col>
</el-row>
<el-row :gutter="20" class="table-container">
<el-col :span="24" class="table-col">
<div class="table-card">
<div class="table-header">
<span class="table-title">AGV</span>
<el-tag type="success" size="mini">{{ agvData.length }}台</el-tag>
</div>
<el-table :data="agvData" size="mini" style="width: 100%">
<el-table-column label="设备编码" align="center" prop="deviceCode" />
<el-table-column label="设备名称" align="center" prop="name" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="起点" align="center" prop="spare1" />
<el-table-column label="终点" align="center" prop="spare2" />
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="执行阶段" align="center" prop="zxjd" />
</el-table>
</div>
</el-col>
</el-row>
<!-- <el-row :gutter="20" class="table-container">-->
<!-- <el-col :span="24" class="table-col">-->
<!-- <div class="table-card">-->
<!-- <div class="table-header">-->
<!-- <span class="table-title">AGV</span>-->
<!-- <el-tag type="success" size="mini">{{ agvData.length }}台</el-tag>-->
<!-- </div>-->
<!-- <el-table :data="agvData" size="mini" style="width: 100%">-->
<!-- <el-table-column label="设备编码" align="center" prop="deviceCode" />-->
<!-- <el-table-column label="设备名称" align="center" prop="name" />-->
<!-- <el-table-column label="状态" align="center" prop="status" />-->
<!-- <el-table-column label="起点" align="center" prop="spare1" />-->
<!-- <el-table-column label="终点" align="center" prop="spare2" />-->
<!-- <el-table-column label="任务号" align="center" prop="taskNo" />-->
<!-- <el-table-column label="执行阶段" align="center" prop="zxjd" />-->
<!-- </el-table>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="24">
<div class="floor-title">一层</div>

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

@@ -129,51 +129,20 @@
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- 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="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['job:mydoJob:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
<!-- </el-row>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="OuthandFinish"
v-hasPermi="['job:mydoJob:OuthandFinish']"
>手动完成</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
@@ -234,45 +203,45 @@
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
</el-form-item>
<el-form-item label="去向" prop="targetRoadwayId">
<el-input v-model="form.targetRoadwayId" placeholder="请输入去向" />
</el-form-item>
<!-- <el-form-item label="巷道ID" prop="roadwayId">-->
<!-- <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId">-->
<!-- <el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="去向" prop="targetRoadwayId">-->
<!-- <el-input v-model="form.targetRoadwayId" placeholder="请输入去向" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="目标货位ID" prop="targetCargoSpaceId">
<el-input v-model="form.targetCargoSpaceId" placeholder="请输入目标货位ID" />
</el-form-item>-->
<el-form-item label="优先级" prop="priority">
<el-input v-model="form.priority" placeholder="请输入优先级" />
<el-form-item label="状态" prop="status">
<el-input v-model="form.priority" placeholder="请修改状态" />
</el-form-item>
<el-form-item label="执行阶段" prop="executionPhase">
<el-input v-model="form.executionPhase" placeholder="请输入执行阶段" />
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-input v-model="form.inOrOut" placeholder="请输入任务类型" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-input v-model="form.startTime" placeholder="请输入开始时间" />
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-input v-model="form.finishTime" placeholder="请输入结束时间" />
</el-form-item>
<el-form-item label="入口ID" prop="entranceId">
<el-input v-model="form.entranceId" placeholder="请输入入口ID" />
</el-form-item>
<el-form-item label="出口ID" prop="exitId">
<el-input v-model="form.exitId" placeholder="请输入出口ID" />
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
</el-form-item>
<el-form-item label="重分标志" prop="faultFlag">
<el-input v-model="form.faultFlag" placeholder="请输入重分标志" />
<el-input v-model="form.executionPhase" placeholder="请修改执行阶段" />
</el-form-item>
<!-- <el-form-item label="任务类型" prop="inOrOut">-->
<!-- <el-input v-model="form.inOrOut" placeholder="请输入任务类型" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="开始时间" prop="startTime">-->
<!-- <el-input v-model="form.startTime" placeholder="请输入开始时间" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束时间" prop="finishTime">-->
<!-- <el-input v-model="form.finishTime" placeholder="请输入结束时间" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入口ID" prop="entranceId">-->
<!-- <el-input v-model="form.entranceId" placeholder="请输入入口ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出口ID" prop="exitId">-->
<!-- <el-input v-model="form.exitId" placeholder="请输入出口ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库ID" prop="warehouseId">-->
<!-- <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="重分标志" prop="faultFlag">-->
<!-- <el-input v-model="form.faultFlag" placeholder="请输入重分标志" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -283,7 +252,7 @@
</template>
<script>
import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish} from "@/api/job/mydoJob"
import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish,handFinish} from "@/api/job/mydoJob"
export default {
name: "MydoJob",
@@ -450,9 +419,25 @@ export default {
return delMydoJob(jobIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
this.$modal.msgSuccess("操作成功")
}).catch(() => {})
},
OuthandFinish() {
if (this.ids.length === 0) {
this.$modal.msgError("请选择需要手动完成的任务");
return;
}
console.log(this.ids.join(','))
this.$modal.confirm('是否确认手动完成选中的任务？').then(() => {
return handFinish(this.ids.join(','));
}).then(() => {
this.$modal.msgSuccess("手动完成成功");
this.getList();
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('job/mydoJob/export', {

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

@@ -159,16 +159,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['queue:ddj:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@@ -178,7 +168,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['queue:ddj:edit']"
>修改</el-button>
>重新下发</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -191,16 +181,6 @@
v-hasPermi="['queue:ddj:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['queue:ddj:export']"
>导出</el-button>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -259,70 +239,70 @@
@pagination="getList"
/>
<!-- 添加或修改堆垛机执行队列对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="任务号" prop="rwh">
<el-input v-model="form.rwh" placeholder="请输入任务号" />
</el-form-item>
<!-- 添加或修改堆垛机执行队列对话框-->
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="80px">-->
<!-- <el-form-item label="任务号" prop="rwh">-->
<!-- <el-input v-model="form.rwh" placeholder="请输入任务号" />-->
<!-- </el-form-item>-->
<el-form-item label="设备id" prop="devId">
<el-input v-model="form.devId" placeholder="请输入设备id" />
</el-form-item>
<el-form-item label="任务状态" prop="rwzt">
<el-input v-model="form.rwzt" placeholder="请输入任务状态" />
</el-form-item>
<el-form-item label="原排" prop="yph">
<el-input v-model="form.yph" placeholder="请输入原排" />
</el-form-item>
<el-form-item label="原列" prop="ylh">
<el-input v-model="form.ylh" placeholder="请输入原列" />
</el-form-item>
<el-form-item label="原层" prop="ych">
<el-input v-model="form.ych" placeholder="请输入原层" />
</el-form-item>
<el-form-item label="目标排" prop="mbph">
<el-input v-model="form.mbph" placeholder="请输入目标排" />
</el-form-item>
<el-form-item label="目标列" prop="mblh">
<el-input v-model="form.mblh" placeholder="请输入目标列" />
</el-form-item>
<el-form-item label="目标层" prop="mbch">
<el-input v-model="form.mbch" placeholder="请输入目标层" />
</el-form-item>
<el-form-item label="堆垛机下发" prop="ddjxf">
<el-input v-model="form.ddjxf" placeholder="请输入堆垛机下发" />
</el-form-item>
<el-form-item label="任务类型" prop="rwlx">
<el-input v-model="form.rwlx" placeholder="请输入任务类型" />
</el-form-item>
<el-form-item label="生成时间" prop="scsj">
<el-input v-model="form.scsj" placeholder="请输入生成时间" />
</el-form-item>
<el-form-item label="下发时间" prop="xfsj">
<el-input v-model="form.xfsj" placeholder="请输入下发时间" />
</el-form-item>
<el-form-item label="结束时间" prop="jssj">
<el-input v-model="form.jssj" placeholder="请输入结束时间" />
</el-form-item>
<el-form-item label="命令方式" prop="mlfs">
<el-input v-model="form.mlfs" placeholder="请输入命令方式" />
</el-form-item>
<el-form-item label="${comment}" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入${comment}" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- <el-form-item label="设备id" prop="devId">-->
<!-- <el-input v-model="form.devId" placeholder="请输入设备id" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务状态" prop="rwzt">-->
<!-- <el-input v-model="form.rwzt" placeholder="请输入任务状态" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="原排" prop="yph">-->
<!-- <el-input v-model="form.yph" placeholder="请输入原排" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="原列" prop="ylh">-->
<!-- <el-input v-model="form.ylh" placeholder="请输入原列" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="原层" prop="ych">-->
<!-- <el-input v-model="form.ych" placeholder="请输入原层" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="目标排" prop="mbph">-->
<!-- <el-input v-model="form.mbph" placeholder="请输入目标排" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="目标列" prop="mblh">-->
<!-- <el-input v-model="form.mblh" placeholder="请输入目标列" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="目标层" prop="mbch">-->
<!-- <el-input v-model="form.mbch" placeholder="请输入目标层" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="堆垛机下发" prop="ddjxf">-->
<!-- <el-input v-model="form.ddjxf" placeholder="请输入堆垛机下发" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="任务类型" prop="rwlx">-->
<!-- <el-input v-model="form.rwlx" placeholder="请输入任务类型" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="生成时间" prop="scsj">-->
<!-- <el-input v-model="form.scsj" placeholder="请输入生成时间" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="下发时间" prop="xfsj">-->
<!-- <el-input v-model="form.xfsj" placeholder="请输入下发时间" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束时间" prop="jssj">-->
<!-- <el-input v-model="form.jssj" placeholder="请输入结束时间" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="命令方式" prop="mlfs">-->
<!-- <el-input v-model="form.mlfs" placeholder="请输入命令方式" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare1">-->
<!-- <el-input v-model="form.spare1" placeholder="请输入${comment}" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare2">-->
<!-- <el-input v-model="form.spare2" placeholder="请输入${comment}" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare3">-->
<!-- <el-input v-model="form.spare3" placeholder="请输入${comment}" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
@@ -466,13 +446,27 @@ 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.$modal.confirm('是否确认重新下发？').then(() => {
// 只处理第一个选中的
const uuids = row.uuid || this.ids
console.log(uuids)
if (uuids.length > 0) {
// 假设DdjDeviceExecutionQueue对象有uuid字段
const data = {
uuid: uuids[0]
// 可能需要的其他字段...
};
return updateDdj(data);
} else {
return Promise.reject('请选择要重新下发的记录');
}
}).then(() => {
this.$modal.msgSuccess("重新下发成功");
this.getList();
}).catch((error) => {
console.error(error);
});
},
/** 提交按钮 */
submitForm() {
@@ -480,7 +474,7 @@ export default {
if (valid) {
if (this.form.uuid != null) {
updateDdj(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.$modal.msgSuccess("下发成功")
this.open = false
this.getList()
})
@@ -504,6 +498,19 @@ export default {
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
},
/**重新下发 */
// OuthandFinish() {
// if (this.ids.length === 0) {
// this.$modal.msgError("请选择需要重新下发的任务");
// return;
// }
// this.$modal.confirm('是否确认重新下发？').then(() => {
// return handFinish(this.ids.join(','));
// }).then(() => {
// this.$modal.msgSuccess("重新下发成功");
// this.getList();
// }).catch(() => {});
// },
/** 导出按钮操作 */
handleExport() {
this.download('queue/ddj/export', {