From 02e8142b7fa06e1012a61ea8fa2fc23504aa6538 Mon Sep 17 00:00:00 2001
From: weihongyang <1075331873@qq.com>
Date: Mon, 6 Jan 2020 16:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml | 3 +--
 .../deer/wms/produce/manage/web/MaterialsInfoController.java   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
index 148c549..baa1d9e 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml
@@ -125,14 +125,13 @@
     </select>
 
     <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>
             <if test="keywords != null and keywords != ''">
                 AND materialsInfo.materials_name LIKE CONCAT('%', #{keywords}, '%')
                 OR  materialsInfo.code LIKE CONCAT('%', #{keywords}, '%')
                 OR  materialsInfo.specification LIKE CONCAT('%', #{keywords}, '%')
                 OR  materialsInfo.unit_id LIKE CONCAT('%', #{keywords}, '%')
-                OR  pmb.dosage LIKE CONCAT('%', #{keywords}, '%')
             </if>
         </where>
 
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
index 6ce0bff..1c93ca6 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java
@@ -198,6 +198,7 @@ public class MaterialsInfoController {
         if(currentUser==null){
             return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
         }
+        System.err.println("pageSize："+params.getPageSize()+"，，pageNum："+params.getPageNum()+",keyWords"+params.getKeywords());
         params.setCompanyId(currentUser.getCompanyId());
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         List<MaterialsInfoVO> list = new ArrayList<>();