From 3f05eb4ac2ec6af1fc83dc3b884bbbd5bb181d8d Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Thu, 24 Oct 2024 21:59:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC2=E6=89=B9=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D-=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/product/bomnew/api/user/BomReportApi.java | 4 +++-
 .../src/main/resources/mapper/master/MaterialMainMapper.xml | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
index e014d8a6..46774e5f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
@@ -336,7 +336,9 @@ public class BomReportApi extends BaseApi {
     @PostMapping("queryMaterial")
     @ApiOperation("物料查询")
     public ResultVO<Page<MaterialQueryResult>>  materialQuery(@RequestBody MaterialQueryDTO queryParam){
-
+        if(StrUtil.isNotBlank(queryParam.getDrawingNo())){
+            queryParam.setDrawingNo(StrUtil.replace(queryParam.getDrawingNo(),"*",""));
+        }
         Page<MaterialQueryDTO> page = new PageVO<>(queryParam.getPage(), queryParam.getPageSize());
         Page<MaterialQueryResult> result = materialMainService.getBaseMapper().queryMaterial(page , queryParam);
         //排序
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
index 1ca74d19..c3fcec81 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
@@ -217,13 +217,13 @@
         </choose>
         from t_material_main where 1=1
         <if test="query.materialCategoryCode != null and query.materialCategoryCode != ''">
-            and material_category_code = #{query.materialCategoryCode}
+            and material_category_code  like concat( #{query.materialCategoryCode} ,'%')
         </if>
         <if test="query.materialNo != null and query.materialNo != ''">
-            and material_no like concat(#{query.materialNo},'%')
+            and material_no like concat('%', #{query.materialNo},'%')
         </if>
         <if test="query.drawingNo != null and query.drawingNo != ''">
-            and drawing_no like concat(#{query.drawingNo},'%')
+            and drawing_no like concat('%', #{query.drawingNo},'%')
         </if>
         <if test="query.materialDesc != null and query.materialDesc != ''">
             and material_desc like concat('%',#{query.materialDesc},'%')