1.任务管理-显示入库单号，托盘号，wcs任务号

2.入库界面明细隐藏不必要字段

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

@@ -201,9 +201,12 @@
       <el-table-column label="起始区域" align="center" prop="areaFrom" />
       <el-table-column label="起始点位" align="center" prop="locationFrom" />
       <el-table-column label="终点点位" align="center" prop="locationTo" />
-      <el-table-column label="AGV站点" align="center" prop="agvStation" />
       <el-table-column label="终点区域" align="center" prop="areaTo" />
       <!--      <el-table-column label="优先级" align="center" prop="priority" />-->
+      <el-table-column label="入库单号" align="center" prop="ext1" />
+      <el-table-column label="托盘号" align="center" prop="ext2" />
+      <el-table-column label="wcs任务号" align="center" prop="ext3" />
+<!--      <el-table-column label="AGV站点" align="center" prop="agvStation" />-->
       <el-table-column label="ִ状态" align="center" prop="state" >
         <template slot-scope="scope">
           <div v-if="scope.row.state === 1">开始</div>

ruoyi-ui/src/views/wms/docAsn/docAsnHeader-add-or-update.vue

@@ -37,49 +37,49 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+<!--          <el-col :span="6">-->
-            <el-form-item label="客户" prop="customerId">
+<!--            <el-form-item label="客户" prop="customerId">-->
-              <el-select v-model="dataFormHead.customerId" placeholder="请选择" style="width: 100%" clearable>
+<!--              <el-select v-model="dataFormHead.customerId" placeholder="请选择" style="width: 100%" clearable>-->
-                <el-option
+<!--                <el-option-->
-                  v-for="item in customerIdCombo"
+<!--                  v-for="item in customerIdCombo"-->
-                  :key="item.value"
+<!--                  :key="item.value"-->
-                  :label="item.customerName"
+<!--                  :label="item.customerName"-->
-                  :value="item.customerId">
+<!--                  :value="item.customerId">-->
-                </el-option>
+<!--                </el-option>-->
-              </el-select>
+<!--              </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span="6">
+<!--          <el-col :span="6">-->
-            <el-form-item label="客户单号" prop="customerNo">
+<!--            <el-form-item label="客户单号" prop="customerNo">-->
-              <el-input v-model="dataFormHead.customerNo" placeholder=""></el-input>
+<!--              <el-input v-model="dataFormHead.customerNo" placeholder=""></el-input>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span="6">
+<!--          <el-col :span="6">-->
-            <el-form-item label="关联单号" prop="asnReference1">
+<!--            <el-form-item label="关联单号" prop="asnReference1">-->
-              <el-input v-model="dataFormHead.asnReference1" placeholder=""></el-input>
+<!--              <el-input v-model="dataFormHead.asnReference1" placeholder=""></el-input>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span="6">
+<!--          <el-col :span="6">-->
-            <el-form-item label="预计收货时间" prop="expectedArriveTime">
+<!--            <el-form-item label="预计收货时间" prop="expectedArriveTime">-->
-              <el-date-picker
+<!--              <el-date-picker-->
-                v-model="dataFormHead.expectedArriveTime"
+<!--                v-model="dataFormHead.expectedArriveTime"-->
-                type="date"
+<!--                type="date"-->
-                placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">
+<!--                placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">-->
-              </el-date-picker>
+<!--              </el-date-picker>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span="6">
+<!--          <el-col :span="6">-->
-            <el-form-item label="供应商" prop="supplierId">
+<!--            <el-form-item label="供应商" prop="supplierId">-->
-              <el-select v-model="dataFormHead.supplierId" placeholder="请选择" style="width: 100%" clearable>
+<!--              <el-select v-model="dataFormHead.supplierId" placeholder="请选择" style="width: 100%" clearable>-->
-                <el-option
+<!--                <el-option-->
-                  v-for="item in supplierCombo"
+<!--                  v-for="item in supplierCombo"-->
-                  :key="item.value"
+<!--                  :key="item.value"-->
-                  :label="item.supplierName"
+<!--                  :label="item.supplierName"-->
-                  :value="item.supplierId">
+<!--                  :value="item.supplierId">-->
-                </el-option>
+<!--                </el-option>-->
-              </el-select>
+<!--              </el-select>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="6">

ruoyi-ui/src/views/wms/docAsn/index.vue

@@ -30,23 +30,23 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="采购单号" prop="asnReference1">
+<!--      <el-form-item label="采购单号" prop="asnReference1">-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.asnReference1"
+<!--          v-model="queryParams.asnReference1"-->
-          placeholder="请输入采购单号"
+<!--          placeholder="请输入采购单号"-->
-          clearable
+<!--          clearable-->
-          size="small"
+<!--          size="small"-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
-      <el-form-item label="预期到货时间" prop="expectedArriveTime">
+<!--      <el-form-item label="预期到货时间" prop="expectedArriveTime">-->
-        <el-date-picker clearable size="small"
+<!--        <el-date-picker clearable size="small"-->
-          v-model="queryParams.expectedArriveTime"
+<!--          v-model="queryParams.expectedArriveTime"-->
-          type="date"
+<!--          type="date"-->
-          value-format="yyyy-MM-dd"
+<!--          value-format="yyyy-MM-dd"-->
-          placeholder="选择预期到货时间">
+<!--          placeholder="选择预期到货时间">-->
-        </el-date-picker>
+<!--        </el-date-picker>-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
@@ -125,14 +125,14 @@
         </template>
       </el-table-column>
       <!--<el-table-column label="客户" align="center" prop="customerId" />-->
-      <el-table-column label="客户单号" align="center" prop="customerNo" />
+<!--      <el-table-column label="客户单号" align="center" prop="customerNo" />-->
-      <el-table-column label="采购单号" align="center" prop="asnReference1" />
+<!--      <el-table-column label="采购单号" align="center" prop="asnReference1" />-->
       <!--<el-table-column label="asn参考信息" align="center" prop="asnReference2" />-->
-      <el-table-column label="预期到货时间" align="center" prop="expectedArriveTime" width="180">
+<!--      <el-table-column label="预期到货时间" align="center" prop="expectedArriveTime" width="180">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <span>{{ parseTime(scope.row.expectedArriveTime, '{y}-{m}-{d}') }}</span>
+<!--          <span>{{ parseTime(scope.row.expectedArriveTime, '{y}-{m}-{d}') }}</span>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

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

@@ -120,7 +120,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
         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
@@ -133,6 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="locationTo != null  and locationTo != ''"> and bt.location_no like concat('%', #{locationTo}, '%')</if>
             <if test="areaTo != null  and areaTo != ''"> and t.area_to = #{areaTo}</if>
             <if test="priority != null "> and t.priority = #{priority}</if>
+            <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+            <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
+            <if test="ext3 != null  and ext3 != ''"> and ext3 = #{ext3}</if>
             <if test="state != null "> and t.state = #{state}</if>
             <if test="createUser != null  and createUser != ''"> and t.create_user = #{createUser}</if>
             <!--            <if test="createDate != null "> and t.create_date = #{createDate}</if>-->