领料接口优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java

@@ -43,6 +43,7 @@ public class Machine extends BaseEntity
 
     /** 机具状态（数据字典） */
     @Excel(name = "机具状态")
+    @ApiModelProperty(value = "机具状态")
     private String maStatus;
 
     /** 二维码 */

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml

@@ -95,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId != null">
             and ma.type_id = #{typeId}
         </if>
+        <if test="maStatus != null and maStatus != ''">
+            and ma.ma_status = #{maStatus}
+        </if>
         <if test="materialType != null and materialType != ''">
               and mt3.type_name like concat('%', #{materialType}, '%')
         </if>