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

修改页面显示

Browse Source
This commit is contained in:
liuhanqing
2025-09-28 16:40:00 +08:00
parent 4d6e3e8107
commit 109e65730a
11 changed files with 156 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,18 @@ public class MydoJobController extends BaseController
return getDataTable(list);
}
/**
* 查询作业信息列表
*/
@PreAuthorize("@ss.hasPermi('job:mydoJob:list')")
@GetMapping("/listFinish")
public TableDataInfo listFinish(MydoJob mydoJob)
{
startPage();
List<MydoJob> list = mydoJobService.selectMydoJobFinishList(mydoJob);
return getDataTable(list);
}
/**
* 导出作业信息列表
*/

2
ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
View File

@@ -77,4 +77,6 @@ public interface MydoJobMapper
List<MydoJob> selectInOrOutMydoJobList(MydoJob mydoJob);
MydoJob selectMydoJobByEntranceList(@Param("entranceList") List<String> entranceList);
List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
}

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

@@ -72,4 +72,6 @@ public interface IMydoJobService
List<MydoJob> selectInOrOutMydoJobList(MydoJob mydoJob);
MydoJob selectMydoJobByEntranceList(List<String> entranceList);
List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
}

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

@@ -147,4 +147,9 @@ public class MydoJobServiceImpl implements IMydoJobService
public MydoJob selectMydoJobByEntranceList(List<String> entranceList) {
return mydoJobMapper.selectMydoJobByEntranceList(entranceList);
}
@Override
public List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob) {
return mydoJobMapper.selectMydoJobFinishList(mydoJob);
}
}

3
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
View File

@@ -15,7 +15,6 @@ import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.job.service.IMydoJobService;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue;
import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
@@ -37,7 +36,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
public HashMap<String, DeviceSsj> ssjCodeList;
private IApiService apiService;
private IAgvQueueService agvQueueService;
private IMydoJobService mydoJobService;
private IBasCargoSpaceService basCargoSpaceService;
private IDdjDeviceExecutionQueueService ddjDeviceExecutionQueueService;
@@ -57,7 +55,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
apiService = SpringUtils.getBean(IApiService.class);
agvQueueService = SpringUtils.getBean(IAgvQueueService.class);
mydoJobService = SpringUtils.getBean(IMydoJobService.class);
basCargoSpaceService = SpringUtils.getBean(IBasCargoSpaceService.class);
ddjDeviceExecutionQueueService = SpringUtils.getBean(IDdjDeviceExecutionQueueService.class);

23
ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
View File

@@ -27,6 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectMydoJobVo">
select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag from mydo_job_wcs
</sql>
<sql id="selectMydoJobFinishVo">
select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag from mydo_job_wcs_finish
</sql>
<select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
<include refid="selectMydoJobVo"/>
@@ -197,4 +200,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and in_or_out &lt;= 20 ans status = 3
order by priority desc,create_time desc
</select>
<select id="selectMydoJobFinishList" resultMap="MydoJobResult">
<include refid="selectMydoJobFinishVo"/>
<where>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="taskNo != null and taskNo != ''"> and task_no = #{taskNo}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
<if test="targetRoadwayId != null and targetRoadwayId != ''"> and target_roadway_id = #{targetRoadwayId}</if>
<if test="targetCargoSpaceId != null and targetCargoSpaceId != ''"> and target_cargo_space_id = #{targetCargoSpaceId}</if>
<if test="priority != null "> and priority = #{priority}</if>
<if test="executionPhase != null and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and in_or_out = #{inOrOut}</if>
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
<if test="entranceId != null and entranceId != ''"> and entrance_id = #{entranceId}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="faultFlag != null and faultFlag != ''"> and fault_flag = #{faultFlag}</if>
</where>
</select>
</mapper>

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

@@ -9,6 +9,15 @@ export function listMydoJob(query) {
})
}
// 查询作业信息列表
export function listMydoJobFinish(query) {
return request({
url: '/job/mydoJob/listFinish',
method: 'get',
params: query
})
}
// 查询作业信息详细
export function getMydoJob(jobId) {
return request({

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

@@ -9,6 +9,14 @@ export function listDdj(query) {
})
}
export function listFinishDdj(query) {
return request({
url: '/queue/ddjFinish/list',
method: 'get',
params: query
})
}
// 查询堆垛机执行队列详细
export function getDdj(uuid) {
return request({

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

@@ -13,21 +13,21 @@
<el-form-item label="容器码" prop="wmsTraycode">
<el-input
v-model="queryParams.wmsTraycode"
placeholder="请输入wms托盘码/容器码"
placeholder="请输入托盘码/容器码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="wms任务号" prop="wmsTaskNo">
<el-form-item label="任务号" prop="wmsTaskNo">
<el-input
v-model="queryParams.wmsTaskNo"
placeholder="请输入wms任务号"
placeholder="请输入任务号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="wms任务类型" prop="wmsTaskType">
<el-select v-model="queryParams.wmsTaskType" placeholder="请选择wms任务类型" clearable>
<el-form-item label="任务类型" prop="wmsTaskType">
<el-select v-model="queryParams.wmsTaskType" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.wms_task_type"
:key="dict.value"
@@ -159,7 +159,7 @@ export default {
/** 查询AGV任务队列列表 */
getList() {
this.loading = true
if (this.queryParams.status !=='4'){
if (this.queryParams.status !=='7' || this.queryParams.status ==='8'){
listQueue(this.queryParams).then(response => {
this.queueList = response.rows
this.total = response.total

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

@@ -9,6 +9,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.job_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="巷道ID" prop="roadwayId">-->
<!-- <el-input-->
<!-- v-model="queryParams.roadwayId"-->
@@ -168,21 +178,28 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="jobId" />
<el-table-column label="任务状态" align="center" prop="status" />
<el-table-column label="任务状态" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column label="去向" align="center" prop="targetRoadwayId" />
<!-- <el-table-column label="目标货位ID" align="center" prop="targetCargoSpaceId" />-->
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase" />
<el-table-column label="任务类型" align="center" prop="inOrOut" />
<!-- <el-table-column label="优先级" align="center" prop="priority" />-->
<el-table-column label="执行阶段" align="center" prop="executionPhase" >
<template slot-scope="scope">
<dict-tag :options="dict.type.job_ep" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<!-- <el-table-column label="任务类型" align="center" prop="inOrOut" />-->
<el-table-column label="开始时间" align="center" prop="startTime" />
<el-table-column label="结束时间" align="center" prop="finishTime" />
<el-table-column label="入口ID" align="center" prop="entranceId" />
<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="仓库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">
<template slot-scope="scope">
<el-button
@@ -266,10 +283,11 @@
</template>
<script>
import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/mydoJob"
import {listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish} from "@/api/job/mydoJob"
export default {
name: "MydoJob",
dicts:['job_status','job_ep'],
data() {
return {
// 遮罩层
@@ -330,11 +348,20 @@ export default {
/** 查询作业信息列表 */
getList() {
this.loading = true
listMydoJob(this.queryParams).then(response => {
this.mydoJobList = response.rows
this.total = response.total
this.loading = false
})
if ( this.queryParams.status ==='4' || this.queryParams.status ==='5'){
listMydoJobFinish(this.queryParams).then(response => {
this.mydoJobList = response.rows
this.total = response.total
this.loading = false
})
}else {
listMydoJob(this.queryParams).then(response => {
this.mydoJobList = response.rows
this.total = response.total
this.loading = false
})
}
},
// 取消按钮
cancel() {

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

@@ -9,13 +9,25 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备id" prop="devId">
<el-input
v-model="queryParams.devId"
placeholder="请输入设备id"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="任务状态" prop="rwzt">
<el-select v-model="queryParams.rwzt" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.ddj_task_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="rwlx">
<el-select v-model="queryParams.rwlx" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.ddj_rwlx"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="设备名称" prop="devName">
<el-input
@@ -26,14 +38,7 @@
/>
</el-form-item>
<el-form-item label="任务状态" prop="rwzt">
<el-input
v-model="queryParams.rwzt"
placeholder="请输入任务状态"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="原排" prop="yph">
<el-input
v-model="queryParams.yph"
@@ -90,14 +95,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务类型" prop="rwlx">
<el-input
v-model="queryParams.rwlx"
placeholder="请输入任务类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生成时间" prop="scsj">
<el-input
v-model="queryParams.scsj"
@@ -210,9 +208,13 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="uuid" align="center" prop="uuid" />
<el-table-column label="任务号" align="center" prop="rwh" />
<el-table-column label="设备名称" align="center" prop="devName" />
<el-table-column label="设备id" align="center" prop="devId" />
<el-table-column label="任务状态" align="center" prop="rwzt" />
<el-table-column label="设备名称" align="center" prop="devName" />
<el-table-column label="任务状态" align="center" prop="rwzt" >
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_task_status" :value="scope.row.rwzt"/>
</template>
</el-table-column>
<el-table-column label="原排" align="center" prop="yph" />
<el-table-column label="原列" align="center" prop="ylh" />
<el-table-column label="原层" align="center" prop="ych" />
@@ -220,7 +222,11 @@
<el-table-column label="目标列" align="center" prop="mblh" />
<el-table-column label="目标层" align="center" prop="mbch" />
<el-table-column label="堆垛机下发" align="center" prop="ddjxf" />
<el-table-column label="任务类型" align="center" prop="rwlx" />
<el-table-column label="任务类型" align="center" prop="rwlx" >
<template slot-scope="scope">
<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" />
@@ -259,9 +265,7 @@
<el-form-item label="任务号" prop="rwh">
<el-input v-model="form.rwh" placeholder="请输入任务号" />
</el-form-item>
<el-form-item label="设备名称" prop="devName">
<el-input v-model="form.devName" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备id" prop="devId">
<el-input v-model="form.devId" placeholder="请输入设备id" />
</el-form-item>
@@ -323,10 +327,11 @@
</template>
<script>
import { listDdj, getDdj, delDdj, addDdj, updateDdj } from "@/api/queue/ddj"
import { listDdj, getDdj, delDdj, addDdj, updateDdj ,listFinishDdj} from "@/api/queue/ddj"
export default {
name: "Ddj",
dicts: ['ddj_task_status','ddj_rwlx'],
data() {
return {
// 遮罩层
@@ -391,11 +396,20 @@ export default {
/** 查询堆垛机执行队列列表 */
getList() {
this.loading = true
listDdj(this.queryParams).then(response => {
this.ddjList = response.rows
this.total = response.total
this.loading = false
})
console.log(this.queryParams)
if (this.queryParams.rwzt==null ||!this.queryParams.rwzt === '5' ){
listDdj(this.queryParams).then(response => {
this.ddjList = response.rows
this.total = response.total
this.loading = false
})
}else {
listFinishDdj(this.queryParams).then(response => {
this.ddjList = response.rows
this.total = response.total
this.loading = false
})
}
},
// 取消按钮
cancel() {