From 5871c178a2888f18c98f95ebe8dc2d43e880264d Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 6 Mar 2024 16:50:10 +0800
Subject: [PATCH] '123'

---
 .../java/com/ruoyi/clMaterial/domain/CYlMaterial.java     | 8 ++++++--
 .../main/resources/mapper/material/CMaterialMapper.xml    | 1 +
 ruoyi-ui/src/views/material/material/index.vue            | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
index bd18dc5..b2339e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
@@ -73,9 +73,13 @@ public class CYlMaterial extends BaseEntity
         return materialPrice;
     }
 
-    public String getMaterialState() {return materialState;}
+    public String getMaterialState() {
+        return materialState;
+    }
 
-    public void setMaterialState(String materialState) {this.materialState = materialState;}
+    public void setMaterialState(String materialState) {
+        this.materialState = materialState;
+    }
 
     @Override
     public String toString() {
diff --git a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
index b5843d5..cc5d2c4 100644
--- a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialXingh != null  and materialXingh != ''"> and material_xingh like concat('%', #{materialXingh}, '%')</if>
             <if test="materialGuig != null  and materialGuig != ''"> and material_guig like concat('%', #{materialGuig}, '%')</if>
             <if test="materialDiany != null  and materialDiany != ''"> and material_diany like concat('%', #{materialDiany}, '%')</if>
+            <if test="materialState != null  and materialState != ''"> and material_state = #{materialState}</if>
         </where>
     </select>
 
diff --git a/ruoyi-ui/src/views/material/material/index.vue b/ruoyi-ui/src/views/material/material/index.vue
index 9e2a08a..0746dab 100644
--- a/ruoyi-ui/src/views/material/material/index.vue
+++ b/ruoyi-ui/src/views/material/material/index.vue
@@ -26,7 +26,7 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="materialState">
-        <el-select v-model="queryParams.materialState" placeholder="材料状态" clearable>
+        <el-select v-model="queryParams.materialState" placeholder="物料状态" clearable>
           <el-option
             v-for="dict in dict.type.material_state"
             :key="dict.value"
@@ -292,6 +292,7 @@ export default {
         materialXingh: null,
         materialGuig: null,
         materialDiany: null,
+        materialState: null
       },
       // 表单参数
       form: {},
@@ -374,7 +375,8 @@ export default {
         materialXingh: null,
         materialGuig: null,
         materialDiany: null,
-        materialDw: null
+        materialDw: null,
+        materialState: 0
       };
       this.cMaterialCostList = [];
       this.resetForm("form");