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
new file mode 100644
index 00000000..e37532bb
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpMaterialController.java
@@ -0,0 +1,126 @@
+package com.ruoyi.erp.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.erp.domain.ErpMaterial;
+import com.ruoyi.erp.service.IErpMaterialService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 物料信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-11-12
+ */
+@Controller
+@RequestMapping("/erp/material")
+public class ErpMaterialController extends BaseController
+{
+    private String prefix = "erp/material";
+
+    @Autowired
+    private IErpMaterialService erpMaterialService;
+
+    @RequiresPermissions("erp:material:view")
+    @GetMapping()
+    public String material()
+    {
+        return prefix + "/material";
+    }
+
+    /**
+     * 查询物料信息列表
+     */
+    @RequiresPermissions("erp:material:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ErpMaterial erpMaterial)
+    {
+        startPage();
+        List<ErpMaterial> list = erpMaterialService.selectErpMaterialList(erpMaterial);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出物料信息列表
+     */
+    @RequiresPermissions("erp:material:export")
+    @Log(title = "物料信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(ErpMaterial erpMaterial)
+    {
+        List<ErpMaterial> list = erpMaterialService.selectErpMaterialList(erpMaterial);
+        ExcelUtil<ErpMaterial> util = new ExcelUtil<ErpMaterial>(ErpMaterial.class);
+        return util.exportExcel(list, "物料信息数据");
+    }
+
+    /**
+     * 新增物料信息
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存物料信息
+     */
+    @RequiresPermissions("erp:material:add")
+    @Log(title = "物料信息", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ErpMaterial erpMaterial)
+    {
+        return toAjax(erpMaterialService.insertErpMaterial(erpMaterial));
+    }
+
+    /**
+     * 修改物料信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        ErpMaterial erpMaterial = erpMaterialService.selectErpMaterialById(id);
+        mmap.put("erpMaterial", erpMaterial);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存物料信息
+     */
+    @RequiresPermissions("erp:material:edit")
+    @Log(title = "物料信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ErpMaterial erpMaterial)
+    {
+        return toAjax(erpMaterialService.updateErpMaterial(erpMaterial));
+    }
+
+    /**
+     * 删除物料信息
+     */
+    @RequiresPermissions("erp:material:remove")
+    @Log(title = "物料信息", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(erpMaterialService.deleteErpMaterialByIds(ids));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
new file mode 100644
index 00000000..75dbf594
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
@@ -0,0 +1,211 @@
+package com.ruoyi.erp.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 物料信息对象 erp_material
+ * 
+ * @author ruoyi
+ * @date 2023-11-12
+ */
+public class ErpMaterial extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    @Excel(name = "主键ID")
+    private Long id;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除")
+    private String delFlag;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 审核状态 */
+    @Excel(name = "审核状态")
+    private String auditStatus;
+
+    /** 使用状态 */
+    @Excel(name = "使用状态")
+    private String useStatus;
+
+    /** 是否有生产团队 */
+    @Excel(name = "是否有生产团队")
+    private String havaProductTem;
+
+    /** 物料类型 */
+    @Excel(name = "物料类型")
+    private String materialType;
+
+    /** 加工方式 */
+    @Excel(name = "加工方式")
+    private String processMethod;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 品牌 */
+    @Excel(name = "品牌")
+    private String brand;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String describe;
+
+    /** 入库部门 */
+    @Excel(name = "入库部门")
+    private String warehouseDept;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setMaterialNo(String materialNo) 
+    {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialNo() 
+    {
+        return materialNo;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setAuditStatus(String auditStatus) 
+    {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() 
+    {
+        return auditStatus;
+    }
+    public void setUseStatus(String useStatus) 
+    {
+        this.useStatus = useStatus;
+    }
+
+    public String getUseStatus() 
+    {
+        return useStatus;
+    }
+    public void setHavaProductTem(String havaProductTem) 
+    {
+        this.havaProductTem = havaProductTem;
+    }
+
+    public String getHavaProductTem() 
+    {
+        return havaProductTem;
+    }
+    public void setMaterialType(String materialType) 
+    {
+        this.materialType = materialType;
+    }
+
+    public String getMaterialType() 
+    {
+        return materialType;
+    }
+    public void setProcessMethod(String processMethod) 
+    {
+        this.processMethod = processMethod;
+    }
+
+    public String getProcessMethod() 
+    {
+        return processMethod;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setBrand(String brand) 
+    {
+        this.brand = brand;
+    }
+
+    public String getBrand() 
+    {
+        return brand;
+    }
+    public void setDescribe(String describe) 
+    {
+        this.describe = describe;
+    }
+
+    public String getDescribe() 
+    {
+        return describe;
+    }
+    public void setWarehouseDept(String warehouseDept) 
+    {
+        this.warehouseDept = warehouseDept;
+    }
+
+    public String getWarehouseDept() 
+    {
+        return warehouseDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("auditStatus", getAuditStatus())
+            .append("useStatus", getUseStatus())
+            .append("havaProductTem", getHavaProductTem())
+            .append("materialType", getMaterialType())
+            .append("processMethod", getProcessMethod())
+            .append("unit", getUnit())
+            .append("brand", getBrand())
+            .append("describe", getDescribe())
+            .append("warehouseDept", getWarehouseDept())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java
new file mode 100644
index 00000000..b54e5c2e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.erp.mapper;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpMaterial;
+
+/**
+ * 物料信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-11-12
+ */
+public interface ErpMaterialMapper 
+{
+    /**
+     * 查询物料信息
+     * 
+     * @param id 物料信息ID
+     * @return 物料信息
+     */
+    public ErpMaterial selectErpMaterialById(Long id);
+
+    /**
+     * 查询物料信息列表
+     * 
+     * @param erpMaterial 物料信息
+     * @return 物料信息集合
+     */
+    public List<ErpMaterial> selectErpMaterialList(ErpMaterial erpMaterial);
+
+    /**
+     * 新增物料信息
+     * 
+     * @param erpMaterial 物料信息
+     * @return 结果
+     */
+    public int insertErpMaterial(ErpMaterial erpMaterial);
+
+    /**
+     * 修改物料信息
+     * 
+     * @param erpMaterial 物料信息
+     * @return 结果
+     */
+    public int updateErpMaterial(ErpMaterial erpMaterial);
+
+    /**
+     * 删除物料信息
+     * 
+     * @param id 物料信息ID
+     * @return 结果
+     */
+    public int deleteErpMaterialById(Long id);
+
+    /**
+     * 批量删除物料信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpMaterialByIds(String[] ids);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java
new file mode 100644
index 00000000..fd24678c
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.erp.service;
+
+import java.util.List;
+import com.ruoyi.erp.domain.ErpMaterial;
+
+/**
+ * 物料信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-11-12
+ */
+public interface IErpMaterialService 
+{
+    /**
+     * 查询物料信息
+     * 
+     * @param id 物料信息ID
+     * @return 物料信息
+     */
+    public ErpMaterial selectErpMaterialById(Long id);
+
+    /**
+     * 查询物料信息列表
+     * 
+     * @param erpMaterial 物料信息
+     * @return 物料信息集合
+     */
+    public List<ErpMaterial> selectErpMaterialList(ErpMaterial erpMaterial);
+
+    /**
+     * 新增物料信息
+     * 
+     * @param erpMaterial 物料信息
+     * @return 结果
+     */
+    public int insertErpMaterial(ErpMaterial erpMaterial);
+
+    /**
+     * 修改物料信息
+     * 
+     * @param erpMaterial 物料信息
+     * @return 结果
+     */
+    public int updateErpMaterial(ErpMaterial erpMaterial);
+
+    /**
+     * 批量删除物料信息
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpMaterialByIds(String ids);
+
+    /**
+     * 删除物料信息信息
+     * 
+     * @param id 物料信息ID
+     * @return 结果
+     */
+    public int deleteErpMaterialById(Long id);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
new file mode 100644
index 00000000..1acc30b5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
@@ -0,0 +1,97 @@
+package com.ruoyi.erp.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.erp.mapper.ErpMaterialMapper;
+import com.ruoyi.erp.domain.ErpMaterial;
+import com.ruoyi.erp.service.IErpMaterialService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 物料信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-11-12
+ */
+@Service
+public class ErpMaterialServiceImpl implements IErpMaterialService 
+{
+    @Autowired
+    private ErpMaterialMapper erpMaterialMapper;
+
+    /**
+     * 查询物料信息
+     * 
+     * @param id 物料信息ID
+     * @return 物料信息
+     */
+    @Override
+    public ErpMaterial selectErpMaterialById(Long id)
+    {
+        return erpMaterialMapper.selectErpMaterialById(id);
+    }
+
+    /**
+     * 查询物料信息列表
+     * 
+     * @param erpMaterial 物料信息
+     * @return 物料信息
+     */
+    @Override
+    public List<ErpMaterial> selectErpMaterialList(ErpMaterial erpMaterial)
+    {
+        return erpMaterialMapper.selectErpMaterialList(erpMaterial);
+    }
+
+    /**
+     * 新增物料信息
+     * 
+     * @param erpMaterial 物料信息
+     * @return 结果
+     */
+    @Override
+    public int insertErpMaterial(ErpMaterial erpMaterial)
+    {
+        erpMaterial.setCreateTime(DateUtils.getNowDate());
+        return erpMaterialMapper.insertErpMaterial(erpMaterial);
+    }
+
+    /**
+     * 修改物料信息
+     * 
+     * @param erpMaterial 物料信息
+     * @return 结果
+     */
+    @Override
+    public int updateErpMaterial(ErpMaterial erpMaterial)
+    {
+        erpMaterial.setUpdateTime(DateUtils.getNowDate());
+        return erpMaterialMapper.updateErpMaterial(erpMaterial);
+    }
+
+    /**
+     * 删除物料信息对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpMaterialByIds(String ids)
+    {
+        return erpMaterialMapper.deleteErpMaterialByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除物料信息信息
+     * 
+     * @param id 物料信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpMaterialById(Long id)
+    {
+        return erpMaterialMapper.deleteErpMaterialById(id);
+    }
+}
diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
new file mode 100644
index 00000000..679e31dd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.erp.mapper.ErpMaterialMapper">
+    
+    <resultMap type="ErpMaterial" id="ErpMaterialResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="materialNo"    column="material_no"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="useStatus"    column="use_status"    />
+        <result property="havaProductTem"    column="hava_product_tem"    />
+        <result property="materialType"    column="material_type"    />
+        <result property="processMethod"    column="process_method"    />
+        <result property="unit"    column="unit"    />
+        <result property="brand"    column="brand"    />
+        <result property="describe"    column="describe"    />
+        <result property="warehouseDept"    column="warehouse_dept"    />
+    </resultMap>
+
+    <sql id="selectErpMaterialVo">
+        select id, del_flag, create_by, create_time, update_by, update_time, remark, material_no, material_name, audit_status, use_status, hava_product_tem, material_type, process_method, unit, brand, describe, warehouse_dept from erp_material
+    </sql>
+
+    <select id="selectErpMaterialList" parameterType="ErpMaterial" resultMap="ErpMaterialResult">
+        <include refid="selectErpMaterialVo"/>
+        <where>  
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="materialNo != null  and materialNo != ''"> and material_no = #{materialNo}</if>
+            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="useStatus != null  and useStatus != ''"> and use_status = #{useStatus}</if>
+            <if test="havaProductTem != null  and havaProductTem != ''"> and hava_product_tem = #{havaProductTem}</if>
+            <if test="materialType != null  and materialType != ''"> and material_type = #{materialType}</if>
+            <if test="processMethod != null  and processMethod != ''"> and process_method = #{processMethod}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="describe != null  and describe != ''"> and describe = #{describe}</if>
+            <if test="warehouseDept != null  and warehouseDept != ''"> and warehouse_dept = #{warehouseDept}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpMaterialById" parameterType="Long" resultMap="ErpMaterialResult">
+        <include refid="selectErpMaterialVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertErpMaterial" parameterType="ErpMaterial" useGeneratedKeys="true" keyProperty="id">
+        insert into erp_material
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="materialNo != null">material_no,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="useStatus != null">use_status,</if>
+            <if test="havaProductTem != null">hava_product_tem,</if>
+            <if test="materialType != null">material_type,</if>
+            <if test="processMethod != null">process_method,</if>
+            <if test="unit != null">unit,</if>
+            <if test="brand != null">brand,</if>
+            <if test="describe != null">describe,</if>
+            <if test="warehouseDept != null">warehouse_dept,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="materialNo != null">#{materialNo},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="useStatus != null">#{useStatus},</if>
+            <if test="havaProductTem != null">#{havaProductTem},</if>
+            <if test="materialType != null">#{materialType},</if>
+            <if test="processMethod != null">#{processMethod},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="brand != null">#{brand},</if>
+            <if test="describe != null">#{describe},</if>
+            <if test="warehouseDept != null">#{warehouseDept},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErpMaterial" parameterType="ErpMaterial">
+        update erp_material
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="useStatus != null">use_status = #{useStatus},</if>
+            <if test="havaProductTem != null">hava_product_tem = #{havaProductTem},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+            <if test="processMethod != null">process_method = #{processMethod},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="brand != null">brand = #{brand},</if>
+            <if test="describe != null">describe = #{describe},</if>
+            <if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteErpMaterialById" parameterType="Long">
+        delete from erp_material where id = #{id}
+    </delete>
+
+    <delete id="deleteErpMaterialByIds" parameterType="String">
+        delete from erp_material where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
new file mode 100644
index 00000000..61c8829a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增物料信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-material-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" class="form-control" type="text">
+                </div>
+            </div>
+            <!--<div class="form-group">
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('auditStatus')}">
+                        <input type="radio" th:id="${'auditStatus_' + dict.dictCode}" name="auditStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${'auditStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('useStatus')}">
+                        <input type="radio" th:id="${'useStatus_' + dict.dictCode}" name="useStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                        <label th:for="${'useStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否有生产团队：</label>
+                <div class="col-sm-8">
+                    <input name="havaProductTem" class="form-control" type="text">
+                </div>
+            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类型：</label>
+                <div class="col-sm-8">
+                    <select name="materialType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">加工方式：</label>
+                <div class="col-sm-8">
+                    <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">品牌：</label>
+                <div class="col-sm-8">
+                    <input name="brand" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="describe" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">入库部门：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "erp/material"
+        $("#form-material-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-material-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
new file mode 100644
index 00000000..ab50434a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改物料信息')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-material-edit" th:object="${erpMaterial}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">料号：</label>
+                <div class="col-sm-8">
+                    <input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料名称：</label>
+                <div class="col-sm-8">
+                    <input name="materialName" th:field="*{materialName}" class="form-control" type="text">
+                </div>
+            </div>
+            <!--<div class="form-group">
+                <label class="col-sm-3 control-label">审核状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('auditStatus')}">
+                        <input type="radio" th:id="${'auditStatus_' + dict.dictCode}" name="auditStatus" th:value="${dict.dictValue}" th:field="*{auditStatus}">
+                        <label th:for="${'auditStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">使用状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box" th:each="dict : ${@dict.getType('useStatus')}">
+                        <input type="radio" th:id="${'useStatus_' + dict.dictCode}" name="useStatus" th:value="${dict.dictValue}" th:field="*{useStatus}">
+                        <label th:for="${'useStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否有生产团队：</label>
+                <div class="col-sm-8">
+                    <input name="havaProductTem" th:field="*{havaProductTem}" class="form-control" type="text">
+                </div>
+            </div>-->
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">物料类型：</label>
+                <div class="col-sm-8">
+                    <select name="materialType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">加工方式：</label>
+                <div class="col-sm-8">
+                    <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">单位：</label>
+                <div class="col-sm-8">
+                    <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">品牌：</label>
+                <div class="col-sm-8">
+                    <input name="brand" th:field="*{brand}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="describe" class="form-control">[[*{describe}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">入库部门：</label>
+                <div class="col-sm-8">
+                    <select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "erp/material";
+        $("#form-material-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-material-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
new file mode 100644
index 00000000..2ac314f8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -0,0 +1,233 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('物料信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>料号：</label>
+                                <input type="text" name="materialNo"/>
+                            </li>
+                            <li>
+                                <label>物料名称：</label>
+                                <input type="text" name="materialName"/>
+                            </li>
+                            <li>
+                                <label>审核状态：</label>
+                                <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>使用状态：</label>
+                                <select name="useStatus" th:with="type=${@dict.getType('useStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>工程员：</label>
+                                <input type="text" name="createBy"/>
+                            </li>
+                            <li>
+                                <label>是否有生产团队：</label>
+                                <input type="text" name="havaProductTem"/>
+                            </li>
+                            <li>
+                                <label>物料类型：</label>
+                                <select name="materialType">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </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>
+                                <input type="text" name="unit"/>
+                            </li>
+                            <li>
+                                <label>品牌：</label>
+                                <input type="text" name="brand"/>
+                            </li>
+                            <li>
+                                <label>入库部门：</label>
+                                <select name="warehouseDept" th:with="type=${@dict.getType('warehouseDept')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>-->
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:material:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <!--<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:material:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:material:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>-->
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:material:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('erp:material:edit')}]];
+        var auditFlag = [[${@permission.hasPermi('erp:material:audit')}]];
+        var removeFlag = [[${@permission.hasPermi('erp:material:remove')}]];
+        var unRemoveFlag = [[${@permission.hasPermi('erp:material:unRemove')}]];
+        var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+        var useStatusDatas = [[${@dict.getType('useStatus')}]];
+        var processMethodDatas = [[${@dict.getType('processMethod')}]];
+        var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+        var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
+        var prefix = ctx + "erp/material";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "物料信息",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '主键ID',
+                    visible: false
+                },
+                {
+                    field: 'auditStatus',
+                    title: '审核状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(auditStatusDatas, value);
+                    }
+                },
+                {
+                    field: 'useStatus',
+                    title: '使用状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(useStatusDatas, value);
+                    }
+                },
+                {
+                    field: 'createBy',
+                    title: '工程员'
+                },
+                {
+                    field: 'materialNo',
+                    title: '料号'
+                },
+                {
+                    field: 'materialName',
+                    title: '物料名称'
+                },
+                {
+                    field: 'materialType',
+                    title: '物料类型'
+                },
+                {
+                    field: 'unit',
+                    title: '单位',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(sysUnitClassDatas, value);
+                    }
+                },
+                {
+                    field: 'brand',
+                    title: '品牌'
+                },
+                {
+                    field: 'describe',
+                    title: '描述'
+                },
+                {
+                    field: 'havaProductTem',
+                    title: '是否有生产团队'
+                },
+                {
+                    field: 'createTime',
+                    title: '录入时间'
+                },
+                {
+                    field: 'updateBy',
+                    title: '更新人'
+                },
+                {
+                    field: 'updateTime',
+                    title: '上次更新时间'
+                },
+                {
+                    field: 'delFlag',
+                    title: '删除标志',
+                    visible: false
+                },
+                /*{
+                    field: 'processMethod',
+                    title: '加工方式',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(processMethodDatas, value);
+                    }
+                },
+                {
+                    field: 'warehouseDept',
+                    title: '入库部门',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(warehouseDeptDatas, value);
+                    }
+                },*/
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + auditFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-file-o"></i>审核</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a>');
+                        actions.push('<a class="btn btn-danger btn-xs ' + unRemoveFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>恢复</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html
index 53a6c2b2..cf126d33 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html
@@ -536,6 +536,7 @@
 			var options = {
 				title: '菜单选择',
 				width: "380",
+				height: "580",
 				url: url,
 				callBack: doMenuSubmit
 			};
diff --git a/sql/erp_update.sql b/sql/erp_update.sql
new file mode 100644
index 00000000..976fc0aa
--- /dev/null
+++ b/sql/erp_update.sql
@@ -0,0 +1,55 @@
+-- 20231112 新增物料信息表
+CREATE TABLE `erp_material` (
+    `id` BIGINT ( 20 ) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `del_flag` CHAR ( 1 ) DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）',
+    `create_by` VARCHAR ( 64 ) DEFAULT '' COMMENT '创建者',
+    `create_time` DATETIME DEFAULT NULL COMMENT '创建时间',
+    `update_by` VARCHAR ( 64 ) DEFAULT '' COMMENT '更新者',
+    `update_time` DATETIME DEFAULT NULL COMMENT '更新时间',
+    `remark` VARCHAR ( 500 ) DEFAULT NULL COMMENT '备注',
+    `material_no` VARCHAR ( 50 ) DEFAULT NULL COMMENT '料号',
+    `material_name` VARCHAR ( 255 ) DEFAULT NULL COMMENT '物料名称',
+    `audit_status` VARCHAR ( 50 ) DEFAULT NULL COMMENT '审核状态',
+    `use_status` VARCHAR ( 50 ) DEFAULT NULL COMMENT '使用状态',
+    `hava_product_tem` VARCHAR ( 50 ) DEFAULT NULL COMMENT '是否有生产团队',
+    `material_type` VARCHAR ( 50 ) DEFAULT NULL COMMENT '物料类型',
+    `process_method` VARCHAR ( 50 ) DEFAULT NULL COMMENT '加工方式',
+    `unit` VARCHAR ( 50 ) DEFAULT NULL COMMENT '单位',
+    `brand` VARCHAR ( 255 ) DEFAULT NULL COMMENT '品牌',
+    `describe` VARCHAR ( 500 ) DEFAULT NULL COMMENT '描述',
+    `warehouse_dept` VARCHAR ( 50 ) DEFAULT NULL COMMENT '入库部门',
+    PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 32 DEFAULT CHARSET = utf8mb4 ROW_FORMAT = DYNAMIC COMMENT = '物料表';
+
+-- 20231112 更新数据字典
+UPDATE `wancaierpdemo`.`sys_dict_type` SET `dict_name` = '单位', `dict_type` = 'sys_unit_class', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:01:22', `update_by` = 'admin', `update_time` = '2023-11-12 08:54:14', `remark` = 'erp_material' WHERE `dict_id` = 18;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 1, `dict_label` = 'pcs', `dict_value` = 'pcs', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:01:58', `update_by` = 'admin', `update_time` = '2021-10-21 10:14:48', `remark` = '' WHERE `dict_code` = 52;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 6, `dict_label` = '套', `dict_value` = '套', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:02:12', `update_by` = 'admin', `update_time` = '2023-11-12 08:45:00', `remark` = '' WHERE `dict_code` = 53;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 14, `dict_label` = '只', `dict_value` = '只', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:02:23', `update_by` = 'admin', `update_time` = '2023-11-12 08:45:36', `remark` = '' WHERE `dict_code` = 54;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 7, `dict_label` = '卷', `dict_value` = '卷', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:02:36', `update_by` = 'admin', `update_time` = '2023-11-12 08:45:08', `remark` = '' WHERE `dict_code` = 55;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 8, `dict_label` = '双', `dict_value` = '双', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:02:52', `update_by` = 'admin', `update_time` = '2023-11-12 08:45:16', `remark` = '' WHERE `dict_code` = 56;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 4, `dict_label` = 'M', `dict_value` = 'M', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:03:02', `update_by` = 'admin', `update_time` = '2023-11-12 08:44:11', `remark` = '' WHERE `dict_code` = 57;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 2, `dict_label` = 'kg', `dict_value` = 'kg', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:03:13', `update_by` = 'admin', `update_time` = '2023-11-12 08:43:53', `remark` = '' WHERE `dict_code` = 58;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 3, `dict_label` = 'g', `dict_value` = 'g', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:03:23', `update_by` = 'admin', `update_time` = '2023-11-12 08:43:59', `remark` = '' WHERE `dict_code` = 59;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 9, `dict_label` = 'KPCS', `dict_value` = 'KPCS', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:03:39', `update_by` = 'admin', `update_time` = '2021-10-21 10:15:58', `remark` = '' WHERE `dict_code` = 60;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 10, `dict_label` = '箱', `dict_value` = '箱', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:03:57', `update_by` = 'admin', `update_time` = '2021-10-21 10:16:07', `remark` = '' WHERE `dict_code` = 61;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 11, `dict_label` = '桶', `dict_value` = '桶', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:04:09', `update_by` = 'admin', `update_time` = '2021-10-21 10:21:43', `remark` = '' WHERE `dict_code` = 62;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 12, `dict_label` = '盒', `dict_value` = '盒', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2021-10-14 14:04:25', `update_by` = 'admin', `update_time` = '2021-10-21 10:21:49', `remark` = '' WHERE `dict_code` = 63;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 13, `dict_label` = '台', `dict_value` = '台', `dict_type` = 'sys_unit_class', `css_class` = '', `list_class` = '', `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2022-11-17 11:56:38', `update_by` = 'admin', `update_time` = '2022-11-17 11:56:53', `remark` = '' WHERE `dict_code` = 188;
+UPDATE `wancaierpdemo`.`sys_dict_data` SET `dict_sort` = 5, `dict_label` = 'ML', `dict_value` = '5', `dict_type` = 'sys_unit_class', `css_class` = NULL, `list_class` = NULL, `is_default` = 'Y', `status` = '0', `create_by` = 'admin', `create_time` = '2023-11-12 08:44:26', `update_by` = '', `update_time` = NULL, `remark` = NULL WHERE `dict_code` = 280;
+INSERT INTO `wancaierpdemo`.`sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (77, '审核状态', 'auditStatus', '0', 'admin', '2023-11-12 05:28:46', 'admin', '2023-11-12 06:51:07', 'erp_material');
+INSERT INTO `wancaierpdemo`.`sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (79, '加工方式', 'processMethod', '0', 'admin', '2023-11-12 06:47:38', 'admin', '2023-11-12 06:51:17', 'erp_material');
+INSERT INTO `wancaierpdemo`.`sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (78, '使用状态', 'useStatus', '0', 'admin', '2023-11-12 06:44:29', '', NULL, 'erp_material');
+INSERT INTO `wancaierpdemo`.`sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (80, '入库部门', 'warehouseDept', '0', 'admin', '2023-11-12 06:50:40', '', NULL, 'erp_material');
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (269, 0, '待审核', '0', 'auditStatus', NULL, 'default', 'Y', '0', 'admin', '2023-11-12 05:29:41', '', NULL, NULL);
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (270, 1, '审核通过', '1', 'auditStatus', '', '', 'Y', '0', 'admin', '2023-11-12 05:29:58', 'admin', '2023-11-12 05:30:08', '');
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (271, 2, '审核拒绝', '2', 'auditStatus', NULL, NULL, 'Y', '0', 'admin', '2023-11-12 05:30:23', '', NULL, NULL);
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (272, 0, '是', '0', 'useStatus', '', '', 'Y', '0', 'admin', '2023-11-12 06:45:09', 'admin', '2023-11-12 06:45:36', '');
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (273, 1, '否', '1', 'useStatus', NULL, NULL, 'Y', '0', 'admin', '2023-11-12 06:45:24', '', NULL, NULL);
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (274, 2, '已作废', '2', 'useStatus', NULL, NULL, 'Y', '0', 'admin', '2023-11-12 06:46:04', '', NULL, NULL);
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (275, 0, '采购', '0', 'processMethod', '', '', 'Y', '0', 'admin', '2023-11-12 06:48:47', 'admin', '2023-11-12 06:49:52', '');
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (276, 1, '委内加工', '1', 'processMethod', NULL, NULL, 'Y', '0', 'admin', '2023-11-12 06:49:03', '', NULL, NULL);
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (277, 2, '委外加工', '2', 'processMethod', NULL, NULL, 'Y', '0', 'admin', '2023-11-12 06:49:29', '', NULL, NULL);
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (278, 0, '仓库部门', '0', 'warehouseDept', '', '', 'Y', '0', 'admin', '2023-11-12 08:42:01', 'admin', '2023-11-12 08:43:00', '');
+INSERT INTO `wancaierpdemo`.`sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (279, 1, '采购部门', '1', 'warehouseDept', NULL, NULL, 'Y', '0', 'admin', '2023-11-12 08:42:12', '', NULL, NULL);
+