purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据的查询条件

Browse Source
This commit is contained in:
季圣华
2020-12-28 22:00:03 +08:00
parent d1fa807514
commit 0e91d84c39
14 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/bill/allocation_out_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/assemble_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/disassemble_list.html
View File

@@ -34,7 +34,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/other_in_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/other_out_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/purchase_back_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/purchase_in_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/purchase_orders_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/retail_back_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/retail_out_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/sale_back_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/sale_orders_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

2
erp_web/pages/bill/sale_out_list.html
View File

@@ -35,7 +35,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">商品信息：</label> <label class="control-label">商品信息：</label>
<div class="control-inline"> <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> </div>
<div class="form-group"> <div class="form-group">

12
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -69,8 +69,9 @@
<if test="endTime != null"> <if test="endTime != null">
and dh.oper_time &lt;= '${endTime}' and dh.oper_time &lt;= '${endTime}'
</if> </if>
<if test="materialParam != null"> <if test="materialParam != null and materialParam !=''">
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%') <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if> </if>
<if test="depotIds != null"> <if test="depotIds != null">
and di.depot_id in (${depotIds}) and di.depot_id in (${depotIds})
@@ -113,8 +114,9 @@
<if test="endTime != null"> <if test="endTime != null">
and dh.oper_time &lt;= '${endTime}' and dh.oper_time &lt;= '${endTime}'
</if> </if>
<if test="materialParam != null"> <if test="materialParam != null and materialParam !=''">
and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%') <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if> </if>
<if test="depotIds != null"> <if test="depotIds != null">
and di.depot_id in (${depotIds}) and di.depot_id in (${depotIds})
@@ -130,7 +132,7 @@
</select> </select>
<select id="findMaterialsListByHeaderId" resultType="java.lang.String"> <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 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' 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} where jsh_depot_item.header_id = ${id}