From 0e91d84c392a7ea997dff5d257c785979e396782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 28 Dec 2020 22:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/bill/allocation_out_list.html         |  2 +-
 erp_web/pages/bill/assemble_list.html               |  2 +-
 erp_web/pages/bill/disassemble_list.html            |  2 +-
 erp_web/pages/bill/other_in_list.html               |  2 +-
 erp_web/pages/bill/other_out_list.html              |  2 +-
 erp_web/pages/bill/purchase_back_list.html          |  2 +-
 erp_web/pages/bill/purchase_in_list.html            |  2 +-
 erp_web/pages/bill/purchase_orders_list.html        |  2 +-
 erp_web/pages/bill/retail_back_list.html            |  2 +-
 erp_web/pages/bill/retail_out_list.html             |  2 +-
 erp_web/pages/bill/sale_back_list.html              |  2 +-
 erp_web/pages/bill/sale_orders_list.html            |  2 +-
 erp_web/pages/bill/sale_out_list.html               |  2 +-
 src/main/resources/mapper_xml/DepotHeadMapperEx.xml | 12 +++++++-----
 14 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/erp_web/pages/bill/allocation_out_list.html b/erp_web/pages/bill/allocation_out_list.html
index 1d17c6a2..0962c714 100644
--- a/erp_web/pages/bill/allocation_out_list.html
+++ b/erp_web/pages/bill/allocation_out_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/assemble_list.html b/erp_web/pages/bill/assemble_list.html
index 7b4a7d05..331929ee 100644
--- a/erp_web/pages/bill/assemble_list.html
+++ b/erp_web/pages/bill/assemble_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/disassemble_list.html b/erp_web/pages/bill/disassemble_list.html
index bbf1a7a4..626e3b95 100644
--- a/erp_web/pages/bill/disassemble_list.html
+++ b/erp_web/pages/bill/disassemble_list.html
@@ -34,7 +34,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html
index df878dae..6fa0bce8 100644
--- a/erp_web/pages/bill/other_in_list.html
+++ b/erp_web/pages/bill/other_in_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html
index 21b82cce..a7331e69 100644
--- a/erp_web/pages/bill/other_out_list.html
+++ b/erp_web/pages/bill/other_out_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/purchase_back_list.html b/erp_web/pages/bill/purchase_back_list.html
index ae760d8b..d32c5ac6 100644
--- a/erp_web/pages/bill/purchase_back_list.html
+++ b/erp_web/pages/bill/purchase_back_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html
index e62bcb1d..010382a3 100644
--- a/erp_web/pages/bill/purchase_in_list.html
+++ b/erp_web/pages/bill/purchase_in_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html
index f640f3ed..49676a78 100644
--- a/erp_web/pages/bill/purchase_orders_list.html
+++ b/erp_web/pages/bill/purchase_orders_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/retail_back_list.html b/erp_web/pages/bill/retail_back_list.html
index 7d2d7d03..ab7d071d 100644
--- a/erp_web/pages/bill/retail_back_list.html
+++ b/erp_web/pages/bill/retail_back_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/retail_out_list.html b/erp_web/pages/bill/retail_out_list.html
index db546383..43177e12 100644
--- a/erp_web/pages/bill/retail_out_list.html
+++ b/erp_web/pages/bill/retail_out_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/sale_back_list.html b/erp_web/pages/bill/sale_back_list.html
index cdbb0c2b..7b8fd8ca 100644
--- a/erp_web/pages/bill/sale_back_list.html
+++ b/erp_web/pages/bill/sale_back_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html
index 03f4bb53..7cc971ae 100644
--- a/erp_web/pages/bill/sale_orders_list.html
+++ b/erp_web/pages/bill/sale_orders_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html
index e526fca0..1a98d7cd 100644
--- a/erp_web/pages/bill/sale_out_list.html
+++ b/erp_web/pages/bill/sale_out_list.html
@@ -35,7 +35,7 @@
         <div class="form-group">
             <label class="control-label">商品信息：</label>
             <div class="control-inline">
-                <input type="text" id="searchMaterial" name="searchMaterial" placeholder="名称，型号" maxlength="100" class="easyui-textbox width-90"/>
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" maxlength="100" class="easyui-textbox width-120"/>
             </div>
         </div>
         <div class="form-group">
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 36dc164f..53334fd0 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -69,8 +69,9 @@
         <if test="endTime != null">
             and dh.oper_time &lt;= '${endTime}'
         </if>
-        <if test="materialParam != null">
-            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        <if test="materialParam != null and materialParam !=''">
+            <bind name="bindKey" value="'%'+materialParam+'%'"/>
+            and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
         </if>
         <if test="depotIds != null">
             and di.depot_id in (${depotIds})
@@ -113,8 +114,9 @@
         <if test="endTime != null">
             and dh.oper_time &lt;= '${endTime}'
         </if>
-        <if test="materialParam != null">
-            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        <if test="materialParam != null and materialParam !=''">
+            <bind name="bindKey" value="'%'+materialParam+'%'"/>
+            and (m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
         </if>
         <if test="depotIds != null">
             and di.depot_id in (${depotIds})
@@ -130,7 +132,7 @@
     </select>
 
     <select id="findMaterialsListByHeaderId" resultType="java.lang.String">
-        select group_concat(concat(jsh_material.`Name`,' ',jsh_material.Model)) as mName
+        select group_concat(concat(jsh_material.name,' ',jsh_material.standard,' ',jsh_material.model)) as mName
         from jsh_depot_item
         inner join jsh_material on jsh_depot_item.material_id = jsh_material.Id and ifnull(jsh_material.delete_Flag,'0') !='1'
         where jsh_depot_item.header_id = ${id}