feat(ViewInJobFlow): 添加roadwayId字段

ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java

@@ -162,6 +162,16 @@ public class ViewInJobFlow extends BaseEntity
     private String dateEnd;
     private String classId;
 
+    private String roadwayId;
+
+    public String getRoadwayId() {
+        return roadwayId;
+    }
+
+    public void setRoadwayId(String roadwayId) {
+        this.roadwayId = roadwayId;
+    }
+
     public String getClassId() {
         return classId;
     }

ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml

@@ -50,10 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="departmentId"    column="department_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="classId"    column="class_id"    />
+        <result property="roadwayId"    column="roadway_id"    />
     </resultMap>
 
     <sql id="selectViewInJobFlowVo">
-        select job_detail_id,class_id, job_id, task_no, status, in_or_out, tray_code,cargo_space_id,cargo_space_name, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo,department_id,dept_name from view_in_job_flow vijf
+        select job_detail_id,class_id, job_id, task_no, status, in_or_out, tray_code,cargo_space_id,cargo_space_name, create_time, start_time, finish_time, entrance_id, warehouse_id, product_id, product_name, parent_id, price, cargo_no, unit, spec, remark, productType, systemItem, productCtm, productCtu, upperNum, limitNum, enableFlag, quantity, lot_no, in_or_out_id, in_or_out_d_id, priceTotal, origin, turnovertype, account, purpose, units, contract, cases, quality, managementNo,department_id,dept_name,roadway_id from view_in_job_flow vijf
     </sql>
 
     <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
@@ -101,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dateStart != null  and dateStart != ''"> and finish_time &gt;= #{dateStart}</if>
             <if test="dateEnd != null  and dateEnd != ''"> and finish_time &lt;= #{dateEnd}</if>
             <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>

ruoyi-ui/src/views/search/ViewInJobFlow/index.vue

@@ -58,6 +58,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="巷道" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="起始时间" prop="dateStart">
         <el-date-picker clearable
                         v-model="queryParams.dateStart"
@@ -106,6 +114,7 @@
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="140" />
       <el-table-column label="部门" align="center" prop="deptName" width="100" />
       <el-table-column label="任务编码" align="center" prop="jobId" width="160"/>
+      <el-table-column label="巷道" align="center" prop="roadwayId"/>
       <el-table-column label="备注" align="center" prop="classId" width="120"/>
       <el-table-column label="任务类型" align="center" prop="inOrOut" width="120">
         <template slot-scope="scope">
@@ -397,6 +406,7 @@ export default {
         managementNo: null,
         dateStart:null,
         dateEnd:null,
+        roadwayId:null
       },
       // 表单参数
       form: {},