Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml

@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null  and createBy != ''"> and erp.create_by = #{createBy}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and erp.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             <if test="params.materialNo != null  and params.materialNo != ''"> and erp.material_no like concat('%', #{params.materialNo}, '%')</if>
+            <if test="params.bomNo != null  and params.bomNo != ''"> and erp.bom_no like concat('%', #{params.bomNo}, '%')</if>
             <if test="materialNo != null  and materialNo != ''"> and erp.material_no = #{materialNo}</if>
             <if test="bomNo != null  and bomNo != ''"> and erp.bom_no = #{bomNo}</if>
             <if test="materialName != null  and materialName != ''"> and erp.material_name like concat('%', #{materialName}, '%')</if>

ruoyi-admin/src/main/resources/templates/erp/bom/bom.html

@@ -18,11 +18,11 @@
                         <ul>
                             <li>
                                 <label>料号：</label>
-                                <input type="text" id="selectMaterialNo" name="materialNo"/>
+                                <input type="text" id="selectMaterialNo" name="params[materialNo]"/>
                             </li>
                             <li>
                                 <label>bom号：</label>
-                                <input type="text" id="selectBomNo" name="bomNo"/>
+                                <input type="text" id="selectBomNo" name="params[bomNo]"/>
                             </li>
                             <li>
                                 <label>物料名称：</label>