优化商品查询功能

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="easyui-textbox width-90"/>
+                <input type="text" id="searchName" name="searchName" value="" maxlength="100" class="width-120"/>
             </div>
         </div>
         <div class="form-group">
@@ -241,6 +241,7 @@
             initMProperty();
             manyUnitFun();
             priceKeyUp();//价格触发事件
+            initMaterialNameList();
             initMPropertyShort(); //初始化商品属性
             initTableData();
             ininPager();
@@ -374,6 +375,20 @@
             });
         }
 
+        //初始化商品名称模糊匹配
+        function initMaterialNameList() {
+            $('#searchName').combobox({
+                method:"get",
+                url: "/material/getMaterialNameList",
+                valueField: 'value',
+                textField: 'text',
+                filter: function(q, row){
+                    var opts = $(this).combobox('options');
+                    return row[opts.textField].indexOf(q) >-1;
+                }
+            });
+        }
+
         //初始化商品属性
         function initMPropertyShort() {
             $.ajax({
@@ -940,7 +955,7 @@
 
         //导出数据
         function setOutputFun() {
-            var name = $.trim($("#searchName").val());
+            var name = $.trim($("#searchName").combobox("getValue"));
             var model = $.trim($("#searchModel").val());
             window.location.href = "/material/exportExcel?browserType=" + getOs()
                 + "&name=" + name + "&model=" + model + "&categoryIds=" + types;
@@ -1415,7 +1430,7 @@
 
         function showMaterialDetails(pageNo, pageSize) {
             var barCode = $.trim($("#searchBarCode").val());
-            var name = $.trim($("#searchName").val());
+            var name = $.trim($("#searchName").combobox("getValue"));
             var standard = $.trim($("#searchStandard").val());
             var model = $.trim($("#searchModel").val());
             $.ajax({
@@ -1455,7 +1470,7 @@
                 $("#searchBarCode").textbox("clear");
                 $("#searchParentName").textbox("clear");
                 $("#searchParentId").val("");
-                $("#searchName").textbox("clear");
+                $("#searchName").combobox("clear");
                 $("#searchStandard").textbox("clear");
                 $("#searchModel").textbox("clear");
                 types = ""; //清空类别

erp_web/pages/reports/in_out_stock_report.html

@@ -28,6 +28,18 @@
                 <select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #95B8E7;border-radius:5px;"></select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="control-label">名称：</label>
+            <div class="control-inline">
+                <input name="mName" id="mName" style="width:120px;"></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>
+            </div>
+        </div>
         <div class="form-group">
             <label class="control-label">月份：</label>
             <div class="control-inline">
@@ -60,6 +72,8 @@
         initSelectInfo_UB();
         initSystemData_depot();
         initSelectInfo_depot();
+        initMaterialNameList();
+        initMaterialModelList();
         initMProperty(); //初始化商品属性
         initTableData();
         ininPager();
@@ -153,6 +167,34 @@
         }
     }
 
+    //初始化商品名称模糊匹配
+    function initMaterialNameList() {
+        $('#mName').combobox({
+            method:"get",
+            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',
+            filter: function(q, row){
+                var opts = $(this).combobox('options');
+                return row[opts.textField].indexOf(q) >-1;
+            }
+        });
+    }
+
     //初始化商品属性
     function initMProperty() {
         $.ajax({
@@ -304,6 +346,10 @@
                             type: "get",
                             url: "/material/findByOrder",
                             dataType: "json",
+                            data: ({
+                                name: $("#mName").combobox("getValue"),
+                                model: $("#mModel").combobox("getValue")
+                            }),
                             success: function (res) {
                                 if(res && res.code === 200 && res.data) {
                                     var mIds = res.data.mIds;

src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -215,11 +215,13 @@ public class MaterialController {
      * @return
      */
     @GetMapping(value = "/findByOrder")
-    public BaseResponseInfo findByOrder(HttpServletRequest request)throws Exception {
+    public BaseResponseInfo findByOrder(@RequestParam("name") String name,
+                                        @RequestParam("model") String model,
+                                        HttpServletRequest request)throws Exception {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<Material> dataList = materialService.findByOrder();
+            List<Material> dataList = materialService.findByOrder(StringUtil.toNull(name), StringUtil.toNull(model));
             String mId = "";
             if (null != dataList) {
                 for (Material material : dataList) {
@@ -458,4 +460,48 @@ public class MaterialController {
         res.data = map;
         return res;
     }
+
+    /**
+     * 商品名称模糊匹配
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "/getMaterialNameList")
+    public JSONArray getMaterialNameList() throws Exception {
+        JSONArray arr = new JSONArray();
+        try {
+            List<String> list = materialService.getMaterialNameList();
+            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;
+    }
+
+    /**
+     * 商品型号模糊匹配
+     * @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;
+    }
 }

src/main/java/com/jsh/erp/datasource/mappers/MaterialMapperEx.java

@@ -74,4 +74,11 @@ public interface MaterialMapperEx {
 
     List<MaterialVo4Unit> getMaterialByMeId(
             @Param("meId") Long meId);
+
+    List<String> getMaterialNameList();
+
+    List<String> getMaterialModelList();
+
+    List<Material> findByOrder(@Param("name") String name,
+                               @Param("model") String model);
 }

src/main/java/com/jsh/erp/service/material/MaterialService.java

@@ -327,13 +327,10 @@ public class MaterialService {
         return list;
     }
 
-    public List<Material> findByOrder()throws Exception{
+    public List<Material> findByOrder(String name, String model)throws Exception{
-        MaterialExample example = new MaterialExample();
-        example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("Name,Model asc");
         List<Material> list =null;
         try{
-            list=  materialMapper.selectByExample(example);
+            list=  materialMapperEx.findByOrder(name, model);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
@@ -729,4 +726,12 @@ public class MaterialService {
         String maxBarCodeOld = materialMapperEx.getMaxBarCode();
         return Long.parseLong(maxBarCodeOld)+"";
     }
+
+    public List<String> getMaterialNameList() {
+        return materialMapperEx.getMaterialNameList();
+    }
+
+    public List<String> getMaterialModelList() {
+        return materialMapperEx.getMaterialModelList();
+    }
 }

src/main/resources/mapper_xml/MaterialMapperEx.xml

@@ -251,4 +251,32 @@
         </if>
         and ifnull(m.delete_Flag,'0') !='1'
     </select>
+
+    <select id="getMaterialNameList" resultType="java.lang.String">
+        select m.name from jsh_material m
+        where m.name is not null and m.name !='' and ifnull(m.delete_Flag,'0') !='1'
+        group by m.name
+        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
+        where 1=1
+        <if test="name != null">
+            and m.name like '%${name}%'
+        </if>
+        <if test="model != null">
+            and m.model like '%${model}%'
+        </if>
+        and ifnull(m.delete_Flag,'0') !='1'
+        order by m.name,m.model asc
+    </select>
 </mapper>