更新bug
This commit is contained in:
parent
e376194e1d
commit
02e8142b7f
@ -125,14 +125,13 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="findMaterialsByKeyWords" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams" resultMap="mtAloneProcessMaterialsBomVO">
|
<select id="findMaterialsByKeyWords" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams" resultMap="mtAloneProcessMaterialsBomVO">
|
||||||
SELECT * from mt_alone_materials_info materialsInfo inner JOIN mt_alone_process_materials_bom pmb on materialsInfo.id = pmb.materials_id
|
SELECT * from mt_alone_materials_info materialsInfo
|
||||||
<where>
|
<where>
|
||||||
<if test="keywords != null and keywords != ''">
|
<if test="keywords != null and keywords != ''">
|
||||||
AND materialsInfo.materials_name LIKE CONCAT('%', #{keywords}, '%')
|
AND materialsInfo.materials_name LIKE CONCAT('%', #{keywords}, '%')
|
||||||
OR materialsInfo.code LIKE CONCAT('%', #{keywords}, '%')
|
OR materialsInfo.code LIKE CONCAT('%', #{keywords}, '%')
|
||||||
OR materialsInfo.specification LIKE CONCAT('%', #{keywords}, '%')
|
OR materialsInfo.specification LIKE CONCAT('%', #{keywords}, '%')
|
||||||
OR materialsInfo.unit_id LIKE CONCAT('%', #{keywords}, '%')
|
OR materialsInfo.unit_id LIKE CONCAT('%', #{keywords}, '%')
|
||||||
OR pmb.dosage LIKE CONCAT('%', #{keywords}, '%')
|
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
|
|
||||||
|
@ -198,6 +198,7 @@ public class MaterialsInfoController {
|
|||||||
if(currentUser==null){
|
if(currentUser==null){
|
||||||
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
|
return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
|
||||||
}
|
}
|
||||||
|
System.err.println("pageSize:"+params.getPageSize()+",,pageNum:"+params.getPageNum()+",keyWords"+params.getKeywords());
|
||||||
params.setCompanyId(currentUser.getCompanyId());
|
params.setCompanyId(currentUser.getCompanyId());
|
||||||
PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
||||||
List<MaterialsInfoVO> list = new ArrayList<>();
|
List<MaterialsInfoVO> list = new ArrayList<>();
|
||||||
|
Loading…
Reference in New Issue
Block a user