From aca26fd06023624d2ca48db00e5d1e4634b8f8da Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 26 Feb 2024 17:33:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

物料管理 远程搜索接口
---
 .../heli/controller/admin/material/vo/MaterialPageReqVO.java | 3 +++
 .../mes/module/heli/dal/mysql/material/MaterialMapper.java   | 5 +++++
 mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts      | 1 +
 3 files changed, 9 insertions(+)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialPageReqVO.java
index 2f3048c1..249f8aba 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialPageReqVO.java
@@ -24,6 +24,9 @@ public class MaterialPageReqVO extends PageParam {
     @Schema(description = "物料名称", example = "李四")
     private String name;
 
+    @Schema(description = "物料名称", example = "李四")
+    private String codeAndName;
+
     @Schema(description = "品牌")
     private String brand;
 
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java
index 39d182b0..71f92484 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java
@@ -8,6 +8,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO;
 import com.chanko.yunxi.mes.module.heli.enums.YesOrNoEnum;
+import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.util.StringUtils;
@@ -37,6 +38,10 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
                 .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
                 .eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart());
 
+        if(!StringUtils.isEmpty(reqVO.getCodeAndName())){
+            query.like(MaterialDO::getName, reqVO.getName()).or().like(MaterialDO::getCode, reqVO.getCode());
+        }
+
         return selectPage(reqVO, query);
     }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts
index 8360586f..e7bd9a88 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/material/index.ts
@@ -4,6 +4,7 @@ export interface MaterialVO {
   id: number
   code: string
   name: string
+  codeAndName:string
   brand: string
   spec: string
   sizeInfo: string