ak/zn-cloud-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加阶段

Browse Source
This commit is contained in:
cbs 2025-03-31 14:25:09 +08:00
parent 2cff1970d7
commit fce696c504
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogResoVO.java
View File

@ -38,4 +38,7 @@ public class RobotTaskDetailLogResoVO {
@Schema(description = "计算后的来源库位编号") @Schema(description = "计算后的来源库位编号")
private String fromLocationNo; private String fromLocationNo;
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
private Long taskStage;
} }

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/detail/RobotTaskDetailLogVO.java
View File

@ -30,4 +30,7 @@ public class RobotTaskDetailLogVO extends PageParam {
@Schema(description = "关键词") @Schema(description = "关键词")
private String msg; private String msg;
@Schema(description = "任务阶段(0:待执行、1：前往取货、2：取货中、3：前往放货、4：放货中、5：结束、6：移动中、7:正在充电、8:取消、9:人工完成、10:异常)")
private Long taskStage;
} }

6
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/robot/RobotTaskMapper.xml
View File

@ -299,7 +299,8 @@
t2.start_time as startTime, t2.start_time as startTime,
t2.end_time as endTime, t2.end_time as endTime,
t2.from_location_no as fromLocationNo, t2.from_location_no as fromLocationNo,
t2.to_location_no as toLocationNo t2.to_location_no as toLocationNo,
t2.task_stage as taskStage
from from
robot_task t1 inner join robot_task_detail t2 robot_task t1 inner join robot_task_detail t2
on t1.id = t2.robot_task_id on t1.id = t2.robot_task_id
@ -324,6 +325,9 @@
<if test="pageReqVO.endTime!=null "> <if test="pageReqVO.endTime!=null ">
AND t1.create_time &lt;= #{pageReqVO.endTime} AND t1.create_time &lt;= #{pageReqVO.endTime}
</if> </if>
<if test="pageReqVO.taskStage != null">
and t2.task_stage = #{pageReqVO.taskStage}
</if>
</where> </where>
order by t1.create_time desc order by t1.create_time desc
</select> </select>