From c46ab52362d5c19d22b0fd253fe5d7a1cc8b1e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 4 Jun 2020 21:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E5=8C=B9=E9=85=8D=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html         |  3 ++-
 .../pages/reports/in_out_stock_report.html    | 22 ++++---------------
 .../erp/controller/MaterialController.java    | 22 -------------------
 .../datasource/mappers/MaterialMapperEx.java  |  2 --
 .../erp/service/material/MaterialService.java |  4 ----
 .../resources/mapper_xml/MaterialMapperEx.xml |  7 ------
 6 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index d3a4e7ca..e5e5897b 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -43,7 +43,7 @@
         <div class="form-group">
             <label class="control-label">名称：</label>
             <div class="control-inline">
-                <input type="text" id="searchName" name="searchName" value="" maxlength="100" class="width-120"/>
+                <input type="text" id="searchName" name="searchName" value="" maxlength="100" class="width-90"/>
             </div>
         </div>
         <div class="form-group">
@@ -382,6 +382,7 @@
                 url: "/material/getMaterialNameList",
                 valueField: 'value',
                 textField: 'text',
+                hasDownArrow: false,
                 filter: function(q, row){
                     var opts = $(this).combobox('options');
                     return row[opts.textField].indexOf(q) >-1;
diff --git a/erp_web/pages/reports/in_out_stock_report.html b/erp_web/pages/reports/in_out_stock_report.html
index ef9f4a9b..468e2e31 100644
--- a/erp_web/pages/reports/in_out_stock_report.html
+++ b/erp_web/pages/reports/in_out_stock_report.html
@@ -31,13 +31,13 @@
         <div class="form-group">
             <label class="control-label">名称：</label>
             <div class="control-inline">
-                <input name="mName" id="mName" style="width:120px;"></input>
+                <input name="mName" id="mName" style="width:100px;"></input>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label">型号：</label>
             <div class="control-inline">
-                <input name="mModel" id="mModel" style="width:120px;"></input>
+                <input type="text" name="mModel" id="mModel" class="easyui-textbox" style="width:100px;"></input>
             </div>
         </div>
         <div class="form-group">
@@ -73,7 +73,6 @@
         initSystemData_depot();
         initSelectInfo_depot();
         initMaterialNameList();
-        initMaterialModelList();
         initMProperty(); //初始化商品属性
         initTableData();
         ininPager();
@@ -174,20 +173,7 @@
             url: "/material/getMaterialNameList",
             valueField: 'value',
             textField: 'text',
-            filter: function(q, row){
-                var opts = $(this).combobox('options');
-                return row[opts.textField].indexOf(q) >-1;
-            }
-        });
-    }
-
-    //初始化商品型号模糊匹配
-    function initMaterialModelList() {
-        $('#mModel').combobox({
-            method:"get",
-            url: "/material/getMaterialModelList",
-            valueField: 'value',
-            textField: 'text',
+            hasDownArrow: false,
             filter: function(q, row){
                 var opts = $(this).combobox('options');
                 return row[opts.textField].indexOf(q) >-1;
@@ -348,7 +334,7 @@
                             dataType: "json",
                             data: ({
                                 name: $("#mName").combobox("getValue"),
-                                model: $("#mModel").combobox("getValue")
+                                model: $("#mModel").textbox("getValue")
                             }),
                             success: function (res) {
                                 if(res && res.code === 200 && res.data) {
diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index 63f3571a..3c4964b5 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -482,26 +482,4 @@ public class MaterialController {
         }
         return arr;
     }
-
-    /**
-     * 商品型号模糊匹配
-     * @return
-     * @throws Exception
-     */
-    @GetMapping(value = "/getMaterialModelList")
-    public JSONArray getMaterialModelList() throws Exception {
-        JSONArray arr = new JSONArray();
-        try {
-            List<String> list = materialService.getMaterialModelList();
-            for (String s : list) {
-                JSONObject item = new JSONObject();
-                item.put("value", s);
-                item.put("text", s);
-                arr.add(item);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return arr;
-    }
 }
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
index ea0f9b38..e874183d 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java
@@ -77,8 +77,6 @@ public interface MaterialMapperEx {
 
     List<String> getMaterialNameList();
 
-    List<String> getMaterialModelList();
-
     List<Material> findByOrder(@Param("name") String name,
                                @Param("model") String model);
 }
diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java
index df8f38ca..df98fcb8 100644
--- a/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -730,8 +730,4 @@ public class MaterialService {
     public List<String> getMaterialNameList() {
         return materialMapperEx.getMaterialNameList();
     }
-
-    public List<String> getMaterialModelList() {
-        return materialMapperEx.getMaterialModelList();
-    }
 }
diff --git a/src/main/resources/mapper_xml/MaterialMapperEx.xml b/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 148b8c18..618e1420 100644
--- a/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -259,13 +259,6 @@
         order by m.name asc
     </select>
 
-    <select id="getMaterialModelList" resultType="java.lang.String">
-        select m.Model from jsh_material m
-        where m.Model is not null and m.Model !='' and ifnull(m.delete_Flag,'0') !='1'
-        group by m.Model
-        order by m.Model asc
-    </select>
-
     <select id="findByOrder" resultType="com.jsh.erp.datasource.entities.Material">
         select m.*
         FROM jsh_material m