增加辅料字段，辅料页面

gear-mat/src/main/java/com/gear/mat/domain/MatMaterial.java

@@ -32,6 +32,10 @@ public class MatMaterial extends BaseEntity {
      * 配料名称
      */
     private String materialName;
+    /**
+     * 物料类型：1=辅料，2=原料
+     */
+    private Integer materialType;
     /**
      * 配料规格
      */

gear-mat/src/main/java/com/gear/mat/domain/bo/MatMaterialBo.java

@@ -32,6 +32,11 @@ public class MatMaterialBo extends BaseEntity {
      */
     private String materialName;
 
+    /**
+     * 物料类型：1=辅料，2=原料
+     */
+    private Integer materialType;
+
     /**
      * 配料规格
      */

gear-mat/src/main/java/com/gear/mat/domain/vo/MatMaterialVo.java

@@ -34,6 +34,12 @@ public class MatMaterialVo {
     @ExcelProperty(value = "配料名称")
     private String materialName;
 
+    /**
+     * 物料类型：1=辅料，2=原料
+     */
+    @ExcelProperty(value = "物料类型")
+    private Integer materialType;
+
     /**
      * 配料规格
      */

gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java

@@ -75,6 +75,7 @@ public class MatMaterialServiceImpl implements IMatMaterialService {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<MatMaterial> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getMaterialName()), MatMaterial::getMaterialName, bo.getMaterialName());
+        lqw.eq(bo.getMaterialType() != null, MatMaterial::getMaterialType, bo.getMaterialType());
         lqw.eq(StringUtils.isNotBlank(bo.getSpec()), MatMaterial::getSpec, bo.getSpec());
         lqw.eq(StringUtils.isNotBlank(bo.getModel()), MatMaterial::getModel, bo.getModel());
         lqw.eq(StringUtils.isNotBlank(bo.getFactory()), MatMaterial::getFactory, bo.getFactory());

gear-mat/src/main/resources/mapper/MatMaterialMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.gear.mat.domain.MatMaterial" id="MatMaterialResult">
         <result property="materialId" column="material_id"/>
         <result property="materialName" column="material_name"/>
+        <result property="materialType" column="material_type"/>
         <result property="spec" column="spec"/>
         <result property="model" column="model"/>
         <result property="factory" column="factory"/>