任务管理界面-显示车号

ruoyi-ui/src/views/ams/task/index.vue

@@ -257,7 +257,7 @@
       <el-table-column label="任务开始时间" align="center" prop="startTime"/>
       <el-table-column label="任务结束时间" align="center" prop="endTime"/>
       <!--<el-table-column label="父任务单号" align="center" prop="parentTask" />-->
-      <!--<el-table-column label="AGV接收车号" align="center" prop="agvNo" />-->
+      <el-table-column label="车号" align="center" prop="agvNo" />
       <el-table-column label="任务类型" align="center" prop="ext7">
         <template slot-scope="scope">
           <div v-if="scope.row.ext7 === '5'">入库</div>

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -342,7 +342,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
             return AjaxResult.error("agv回传没有任务记录------------->");
         }
 
-        if (state > 1 && state != 7) {
+        if (state == 4 || state == 6) {
             wcsTask.setAgvNo(carNo + "");
         }
 

warewms-ams/src/main/resources/mapper/ams/WcsTaskMapper.xml

@@ -112,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectWcsTaskListVO" parameterType="WcsTask" resultMap="WcsTaskResult">
         select t.task_no, t.business_type,bf.location_no location_from,fz.zone_name area_from,bt.location_no location_to,tz.zone_name area_to,
         t.state,t.create_date,t.task_type, t.start_time, t.end_time,t.remark, t.ext1, t.ext2, t.ext3, t.ext4, t.ext5, t.ext6, t.ext7, t.ext8
+        ,t.agv_no
         from wcs_task t
         left join base_location_info bf on t.location_from = bf.id
         left join base_location_info bt on t.location_to = bt.id