任务管理-界面显示任务类型，托盘号，单据号

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

@@ -106,6 +106,34 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="任务类型" prop="ext7">
+        <el-select v-model="queryParams.ext7" placeholder="请选择类型" clearable size="small">
+          <el-option
+            v-for="dict in taskTypeCombo"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="托盘号" prop="ext5">
+        <el-input
+          v-model="queryParams.ext5"
+          placeholder="请输入托盘号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单据号" prop="ext6">
+        <el-input
+          v-model="queryParams.ext6"
+          placeholder="请输入单据号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!--      <el-form-item label="仓库" prop="shopId">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.shopId"-->
@@ -230,7 +258,16 @@
       <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" class-name="small-padding fixed-width">
+      <el-table-column label="任务类型" align="center" prop="ext7">
+        <template slot-scope="scope">
+          <div v-if="scope.row.ext7 === '5'">入库</div>
+          <div v-if="scope.row.ext7 === '6'">出库</div>
+          <div v-if="scope.row.ext7 === '9'">回库</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="托盘号" align="center" prop="ext5" />
+      <el-table-column label="单据号" align="center" prop="ext6"  width="200" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed = "right">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.state !== 7 && scope.row.state !== 2 && scope.row.state !== 11 && scope.row.state !== 12"
@@ -276,7 +313,7 @@
         <el-form-item label="是否转发" prop="businessType">
           <el-select v-model="form.taskType" placeholder="请选择" clearable size="small" style="width: 100%">
             <el-option
-              v-for="dict in taskTypeCombo"
+              v-for="dict in isYesAndNoCombo"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -518,6 +555,11 @@ export default {
         {'label':'三向车','value':'3'}
       ],
       taskTypeCombo: [
+        {'label':'入库','value':'5'},
+        {'label':'出库','value':'6'},
+        {'label':'回库','value':'9'}
+      ],
+      isYesAndNoCombo: [
         {'label':'是','value':'Y'},
         {'label':'否','value':'N'}
       ],

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

@@ -111,7 +111,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.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
         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
@@ -139,6 +139,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="parentTask != null  and parentTask != ''"> and t.parent_task = #{parentTask}</if>
             <if test="agvNo != null  and agvNo != ''"> and t.agv_no like concat('%', #{agvNo}, '%')</if>
+            <if test="ext5 != null  and ext5 != ''"> and t.ext5 like concat('%', #{ext5}, '%')</if>
+            <if test="ext6 != null  and ext6 != ''"> and t.ext6 like concat('%', #{ext6}, '%')</if>
+            <if test="ext7 != null  and ext7 != ''"> and t.ext7 like concat('%', #{ext7}, '%')</if>
         </where>
         order by t.create_date desc
     </select>