From 9334f73b40914330d0158e50a5a02385be642db0 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 30 Oct 2024 23:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper_xml/MaterialMapperEx.xml      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index fd6e4aa7d..acf70c3af 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -380,7 +380,8 @@
         where m.enabled=1 and me.id is not null
         <if test="q != null and q !=''">
             <bind name="bindKey" value="'%'+q+'%'"/>
-            and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey})
+            and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey} or m.standard like #{bindKey}
+            or m.model like #{bindKey} or m.color like #{bindKey} or m.brand like #{bindKey} or m.mfrs like #{bindKey})
         </if>
         <if test="standardOrModel != null and standardOrModel !=''">
             <bind name="bindStandardOrModel" value="'%'+standardOrModel+'%'"/>
@@ -424,7 +425,8 @@
         where m.enabled=1 and me.id is not null
         <if test="q != null and q !=''">
             <bind name="bindKey" value="'%'+q+'%'"/>
-            and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey})
+            and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.mnemonic like #{bindKey} or m.standard like #{bindKey}
+            or m.model like #{bindKey} or m.color like #{bindKey} or m.brand like #{bindKey} or m.mfrs like #{bindKey})
         </if>
         <if test="standardOrModel != null and standardOrModel !=''">
             <bind name="bindStandardOrModel" value="'%'+standardOrModel+'%'"/>