From cda04b972b1ae49f3a192f800b9151b0b4d9f8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 9 Oct 2024 18:02:00 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=89=A9=E6=96=99controller=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9D=83=E9=99=90=EF=BC=9B=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=89=A9=E6=96=99=E6=90=9C=E7=B4=A2=E6=A0=8F=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E6=96=B9=E5=BC=8F=E4=B8=8B=E6=8B=89=E6=A1=86=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/erp/controller/ErpMaterialController.java    | 2 +-
 .../main/resources/templates/erp/material/material.html    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
index da934ee3..35db3c04 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
@@ -114,7 +114,7 @@ public class ErpMaterialController extends BaseController
     }
     /**
      * 物料信息审核，通过物料查询*/
-    @RequiresPermissions("erp:material:list")
+//    @RequiresPermissions("erp:material:list")
     @PostMapping("/selectList")
     @ResponseBody
     public TableDataInfo selectList(ErpMaterialVo erpMaterialVo)
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 9d78ef7a..b3d99e35 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -19,6 +19,13 @@
                                 <label>物料名称：</label>
                                 <input type="text" name="materialName"/>
                             </li>
+                            <li>
+                                <label>加工方式：</label>
+                                <select name="processMethod" th:with="type=${@dict.getType('processMethod')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
                             <li>
                                 <label>审核状态：</label>
                                 <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">