优化单据的查询条件

erp_web/pages/bill/allocation_out_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/assemble_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/disassemble_list.html

@@ -34,7 +34,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/other_in_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/other_out_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/purchase_back_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/purchase_in_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/purchase_orders_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/retail_back_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/retail_out_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/sale_back_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/sale_orders_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

erp_web/pages/bill/sale_out_list.html

@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">

src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -69,8 +69,9 @@
         <if test="endTime != null">
             and dh.oper_time &lt;= '${endTime}'
         </if>
-        <if test="materialParam != null">
-            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        <if test="materialParam != null and materialParam !=''">
+            <bind name="bindKey" value="'%'+materialParam+'%'"/>
+            and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
         </if>
         <if test="depotIds != null">
             and di.depot_id in (${depotIds})
@@ -113,8 +114,9 @@
         <if test="endTime != null">
             and dh.oper_time &lt;= '${endTime}'
         </if>
-        <if test="materialParam != null">
-            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        <if test="materialParam != null and materialParam !=''">
+            <bind name="bindKey" value="'%'+materialParam+'%'"/>
+            and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
         </if>
         <if test="depotIds != null">
             and di.depot_id in (${depotIds})
@@ -130,7 +132,7 @@
     </select>
 
     <select id="findMaterialsListByHeaderId" resultType="java.lang.String">
-        select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model)) as mName
+        select group_concat(concat(jsh_material.name,' ',jsh_material.standard,' ',jsh_material.model)) as mName
         from jsh_depot_item
         inner join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1'
         where jsh_depot_item.header_id = ${id}