wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weihongyang' of mengtong/mt-pms-api into master

Browse Source
This commit is contained in:
何勇 2020-01-06 17:08:41 +08:00 committed by Gitea
commit d65b3113a6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
View File

@ -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>

1
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
View File

@ -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<>();