diff --git a/.prettierrc.cjs b/.prettierrc.cjs
index fae9475..f436405 100644
--- a/.prettierrc.cjs
+++ b/.prettierrc.cjs
@@ -1,8 +1,8 @@
 module.exports = {
   // 超过最大值换行
-  printWidth: 148,
-  // 使用 2 个空格缩进
-  tabWidth: 2,
+  printWidth: 160,
+  // 使用 4 个空格缩进
+  tabWidth: 4,
   // 不使用缩进符，而使用空格
   useTabs: false,
   // 行尾不需要有分号
diff --git a/src/api/materialManagement/wms-category.js b/src/api/materialManagement/wms-category.js
new file mode 100644
index 0000000..b1375cc
--- /dev/null
+++ b/src/api/materialManagement/wms-category.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 物料分类分页查询
+ * @param {查询条件} data
+ */
+export function listMaterialCategories(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsCategories/list',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 新增物料分类
+ * @param data
+ */
+export function addMaterialCategories(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsCategories',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改物料分类
+ * @param data
+ */
+export function updateMaterialCategories(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsCategories',
+        method: 'PUT',
+        data: data
+    })
+}
+/**
+ * 获取物料分类详情
+ * @param {Id}
+ */
+export function getMaterialCategories(id) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsCategories/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 删除物料分类
+ * @param {主键} pid
+ */
+export function delMaterialCategories(pid) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsCategories/' + pid,
+        method: 'delete'
+    })
+}
diff --git a/src/api/materialManagement/wms-inventory.js b/src/api/materialManagement/wms-inventory.js
new file mode 100644
index 0000000..0778f8d
--- /dev/null
+++ b/src/api/materialManagement/wms-inventory.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 物料库位分页查询
+ * @param {查询条件} data
+ */
+export function listPartsInventory(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory/list',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 新增物料库位
+ * @param data
+ */
+export function addPartsInventory(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改物料库位
+ * @param data
+ */
+export function updatePartsInventory(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory',
+        method: 'PUT',
+        data: data
+    })
+}
+/**
+ * 获取物料库位详情
+ * @param {Id}
+ */
+export function getPartsInventory(id) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 删除物料库位
+ * @param {主键} pid
+ */
+export function delPartsInventory(pid) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory/' + pid,
+        method: 'delete'
+    })
+}
diff --git a/src/api/materialManagement/wms-log.js b/src/api/materialManagement/wms-log.js
new file mode 100644
index 0000000..38ac1af
--- /dev/null
+++ b/src/api/materialManagement/wms-log.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 物料出入库记录分页查询
+ * @param {查询条件} data
+ */
+export function listMaterialTransactions(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsTransactions/list',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 新增物料出入库记录
+ * @param data
+ */
+export function addMaterialTransactions(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsTransactions',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改物料出入库记录
+ * @param data
+ */
+export function updateMaterialTransactions(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsTransactions',
+        method: 'PUT',
+        data: data
+    })
+}
+/**
+ * 获取物料出入库记录详情
+ * @param {Id}
+ */
+export function getMaterialTransactions(id) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsTransactions/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 删除物料出入库记录
+ * @param {主键} pid
+ */
+export function delMaterialTransactions(pid) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsTransactions/' + pid,
+        method: 'delete'
+    })
+}
diff --git a/src/api/materialManagement/wms-mbom.js b/src/api/materialManagement/wms-mbom.js
new file mode 100644
index 0000000..f4d4389
--- /dev/null
+++ b/src/api/materialManagement/wms-mbom.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 物料清单信息表分页查询
+ * @param {查询条件} data
+ */
+export function listMBom(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialSpareParts/list',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 新增物料清单信息表
+ * @param data
+ */
+export function addMBom(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialSpareParts',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改物料清单信息表
+ * @param data
+ */
+export function updateMBom(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialSpareParts',
+        method: 'PUT',
+        data: data
+    })
+}
+/**
+ * 获取物料清单信息表详情
+ * @param {Id}
+ */
+export function getMBom(id) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialSpareParts/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 删除物料清单信息表
+ * @param {主键} pid
+ */
+export function delMBom(pid) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialSpareParts/' + pid,
+        method: 'delete'
+    })
+}
diff --git a/src/api/materialManagement/wms-supplier.js b/src/api/materialManagement/wms-supplier.js
new file mode 100644
index 0000000..f07a6cb
--- /dev/null
+++ b/src/api/materialManagement/wms-supplier.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+/**
+ * 物料供应商分页查询
+ * @param {查询条件} data
+ */
+export function listSupplier(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsSuppliers/list',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 新增物料供应商
+ * @param data
+ */
+export function addSupplier(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsSuppliers',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改物料供应商
+ * @param data
+ */
+export function updateSupplier(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsSuppliers',
+        method: 'PUT',
+        data: data
+    })
+}
+/**
+ * 获取物料供应商详情
+ * @param {Id}
+ */
+export function getSupplier(id) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsSuppliers/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 删除物料供应商
+ * @param {主键} pid
+ */
+export function delSupplier(pid) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsSuppliers/' + pid,
+        method: 'delete'
+    })
+}
diff --git a/src/api/materialManagement/wms-warehouse.js b/src/api/materialManagement/wms-warehouse.js
new file mode 100644
index 0000000..4aaa66d
--- /dev/null
+++ b/src/api/materialManagement/wms-warehouse.js
@@ -0,0 +1,129 @@
+import request from '@/utils/request'
+
+/**
+ * 库位信息表分页查询
+ * @param {查询条件} data
+ */
+export function listWarehouse(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsStorageLocations/list',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 新增库位信息表
+ * @param data
+ */
+export function addWarehouse(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsStorageLocations',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 修改库位信息表
+ * @param data
+ */
+export function updateWarehouse(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsStorageLocations',
+        method: 'PUT',
+        data: data
+    })
+}
+/**
+ * 获取库位信息表详情
+ * @param {Id}
+ */
+export function getWarehouse(id) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsStorageLocations/' + id,
+        method: 'get'
+    })
+}
+
+/**
+ * 删除库位信息表
+ * @param {主键} pid
+ */
+export function delWarehouse(pid) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsStorageLocations/' + pid,
+        method: 'delete'
+    })
+}
+
+/**
+ * 获取库位下拉
+ * @param {查询条件} data
+ */
+export function getLocationOptions(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsStorageLocations/list_location_code',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 获取货物下拉
+ * @param {查询条件} data
+ */
+export function getSparePartsOptions(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialSpareParts/list_nopage',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 获取供应商下拉
+ * @param {查询条件} data
+ */
+export function getSupplierOptions(query) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsSuppliers/list_supplier_No_Page',
+        method: 'get',
+        params: query
+    })
+}
+
+/**
+ * 入库
+ * @param {查询条件} data
+ */
+export function EntryInventory(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory/entryInventory',
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 出库
+ * @param {查询条件} data
+ */
+export function OutInventory(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory/OutInventory',
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 盘点
+ * @param {查询条件} data
+ */
+export function CheckInventory(data) {
+    return request({
+        url: 'mes/materialManagement/Parts/MaterialPartsInventory/CheckInventory',
+        method: 'post',
+        data: data
+    })
+}
diff --git a/src/views/materialManagement/category/index.vue b/src/views/materialManagement/category/index.vue
new file mode 100644
index 0000000..5d09536
--- /dev/null
+++ b/src/views/materialManagement/category/index.vue
@@ -0,0 +1,229 @@
+<!--
+ * @Descripttion: (物料分类/category)
+ * @Author: (admin)
+ * @Date: (2025-3-18)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <el-col :span="1.5">
+                <el-button type="primary" v-hasPermi="['deviceManagement:devicepartscategories:add']" plain icon="plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column prop="categoryName" label="分类名称" align="center" v-if="columns.showColumn('categoryName')" />
+            <el-table-column prop="createdAt" label="创建时间" v-if="columns.showColumn('createdAt')" />
+            <el-table-column prop="updatedAt" label="更新时间" v-if="columns.showColumn('updatedAt')" />
+            <el-table-column label="操作" width="160">
+                <template #default="scope">
+                    <el-button type="success" size="small" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+                    <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改物料分类对话框 -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="open" :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="12">
+                        <el-form-item label="分类名称" prop="categoryName">
+                            <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="category">
+import {
+    listMaterialCategories,
+    addMaterialCategories,
+    delMaterialCategories,
+    updateMaterialCategories,
+    getMaterialCategories
+} from '@/api/materialManagement/wms-category.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    sort: '',
+    sortType: 'asc'
+})
+const columns = ref([
+    //{ visible: true, prop: 'categoryId', label: '分类ID' },
+    //{ visible: true, prop: 'parentCategoryId', label: '父级分类ID' },
+    { visible: true, prop: 'categoryName', label: '分类名称' },
+    { visible: true, prop: 'createdAt', label: '创建时间' },
+    { visible: true, prop: 'updatedAt', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+    loading.value = true
+    listMaterialCategories(queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            dataList.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+    var sort = undefined
+    var sortType = undefined
+
+    if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+    }
+    queryParams.sort = sort
+    queryParams.sortType = sortType
+    handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+    single: true,
+    multiple: true,
+    form: {},
+    rules: {
+        categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
+    },
+    options: {}
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+    open.value = false
+    reset()
+}
+
+// 重置表单
+function reset() {
+    form.value = {
+        categoryId: null,
+        categoryName: null,
+        parentCategoryId: null,
+        createdAt: null,
+        updatedAt: null
+    }
+    proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+    reset()
+    open.value = true
+    title.value = '添加物料分类'
+    opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+    reset()
+    const id = row.categoryId || ids.value
+    getMaterialCategories(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            open.value = true
+            title.value = '修改物料分类'
+            opertype.value = 2
+
+            form.value = {
+                ...data
+            }
+        }
+    })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+    proxy.$refs['formRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.categoryId != undefined && opertype.value === 2) {
+                updateMaterialCategories(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addMaterialCategories(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
+            }
+        }
+    })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+    const Ids = row.categoryId || ids.value
+
+    proxy
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+            return delMaterialCategories(Ids)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+}
+
+handleQuery()
+</script>
diff --git a/src/views/materialManagement/inventory/index.vue b/src/views/materialManagement/inventory/index.vue
new file mode 100644
index 0000000..748b7f7
--- /dev/null
+++ b/src/views/materialManagement/inventory/index.vue
@@ -0,0 +1,381 @@
+<!--
+ * @Descripttion: (库存信息表inventory)
+ * @Author: (admin)
+ * @Date: (2025-3-18)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item label="库位" prop="locationCode">
+                <el-input v-model="queryParams.locationCode" placeholder="请输入库位" />
+            </el-form-item>
+            <el-form-item label="物料编号" prop="partCode">
+                <el-input v-model="queryParams.partCode" placeholder="请输入物料编号" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="partName">
+                <el-input v-model="queryParams.partName" placeholder="请输入物料名称" />
+            </el-form-item>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <!-- <el-col :span="1.5">
+                <el-button type="primary" plain icon="plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col> -->
+            <el-col :span="1.5">
+                <el-button type="primary" icon="Download" @click="handleOpenDialog(1)"> 入库 </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="danger" icon="Upload" @click="handleOpenDialog(2)"> 出库 </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" icon="Search" @click="handleOpenDialog(3)"> 盘点 </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column prop="inventoryId" label="库存台账编号" width="120" align="center" />
+            <el-table-column prop="location" label="库位" align="center" />
+            <el-table-column prop="partName" label="物料名称" align="center" />
+            <el-table-column prop="partCode" label="物料编号" align="center" />
+            <el-table-column prop="description" label="描述" align="center" />
+            <el-table-column prop="unitOfMeasure" label="单位" align="center" />
+            <el-table-column prop="quantity" label="数量" align="center" />
+            <el-table-column prop="lastInventoryCheck" width="120" label="上次盘点日期" align="center" v-if="columns.showColumn('lastInventoryCheck')" />
+            <el-table-column prop="createdAt" label="创建时间" align="center" v-if="columns.showColumn('createdAt')" />
+            <el-table-column prop="updatedAt" label="更新时间" align="center" v-if="columns.showColumn('updatedAt')" />
+            <el-table-column label="操作" width="300" align="center">
+                <template #default="scope">
+                    <el-button type="primary" icon="Download" @click="handleOpenDialog(1, scope.row)"> 入库 </el-button>
+                    <el-button type="danger" icon="Upload" @click="handleOpenDialog(2, scope.row)"> 出库 </el-button>
+                    <el-button type="warning" icon="Search" @click="handleOpenDialog(3, scope.row)"> 盘点 </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改库存信息表对话框 -->
+        <el-dialog :title="title" :close-on-click-modal="false" :lock-scroll="false" v-model="open">
+            <el-form size="large" ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="24">
+                        <el-form-item label="操作类别">
+                            <div v-if="actionType == 1" class="tag-box bg-blue">入库</div>
+                            <div v-if="actionType == 2" class="tag-box bg-red">出库</div>
+                            <div v-if="actionType == 3" class="tag-box bg-yellow">盘点</div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :lg="24" v-if="actionType == 1">
+                        <el-form-item label="入库单号" prop="id">
+                            <el-input v-model="form.id" placeholder="请输入库单号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="24" v-if="actionType == 2">
+                        <el-form-item label="领料单号" prop="id">
+                            <el-input v-model="form.id" placeholder="请输入领料单号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="24">
+                        <el-form-item label="库位" prop="location">
+                            <el-select :disabled="isUpdate" filterable v-model="form.location" placeholder="请选择库位">
+                                <el-option v-for="(item, index) in locaitonOptions" :key="index" :label="item.label" :value="item.value" />
+                            </el-select>
+                            <!-- <el-button v-if="!isUpdate" style="margin-left: 10px" @click="getLocationSelectOptions()"> 全部 </el-button>
+                            <el-button v-if="!isUpdate" @click="getLocationSelectOptions('A')"> A库 </el-button>
+                            <el-button v-if="!isUpdate" @click="getLocationSelectOptions('B')"> B库 </el-button> -->
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="24">
+                        <el-form-item label="物料" prop="partId">
+                            <el-select :disabled="isUpdate" filterable v-model="form.partId" placeholder="请选择物料">
+                                <el-option v-for="(item, index) in sparePartOptions" :key="index" :label="item.label" :value="item.value" />
+                            </el-select>
+                            <!-- <el-button v-if="!isUpdate" style="margin-left: 10px" @click="getSparePartsSelectOptions()"> 全部 </el-button>
+                            <el-button v-if="!isUpdate" @click="getSparePartsSelectOptions('调节阀')"> 调节阀 </el-button>
+                            <el-button v-if="!isUpdate" @click="getSparePartsSelectOptions('断路器')"> 断路器 </el-button>
+                            <el-button v-if="!isUpdate" @click="getSparePartsSelectOptions('开关')"> 开关 </el-button>
+                            <el-button v-if="!isUpdate" @click="getSparePartsSelectOptions('气缸')"> 气缸 </el-button> -->
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="24">
+                        <el-form-item label="供应商" prop="supplierId">
+                            <el-select :disabled="isUpdate" filterable v-model="form.supplierId" placeholder="请选择供应商">
+                                <el-option v-for="(item, index) in supplierOptions" :key="index" :label="item.label" :value="item.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="24">
+                        <el-form-item label="数量" prop="quantity">
+                            <el-input-number :min="0" v-model.number="form.quantity" placeholder="请输入数量" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="inventory">
+import { listPartsInventory, addPartsInventory, updatePartsInventory } from '@/api/materialManagement/wms-inventory.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    sort: '',
+    sortType: 'asc'
+})
+const columns = ref([
+    { visible: true, prop: 'inventoryId', label: '库存ID' },
+    { visible: true, prop: 'partId', label: '物料ID' },
+    { visible: true, prop: 'quantity', label: '数量' },
+    { visible: true, prop: 'location', label: '存放位置' },
+    { visible: true, prop: 'lastInventoryCheck', label: '上次盘点日期' },
+    { visible: true, prop: 'createdAt', label: '创建时间' },
+    { visible: true, prop: 'updatedAt', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+    loading.value = true
+    listPartsInventory(queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            dataList.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+    var sort = undefined
+    var sortType = undefined
+
+    if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+    }
+    queryParams.sort = sort
+    queryParams.sortType = sortType
+    handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+    single: true,
+    multiple: true,
+    form: {},
+    rules: {
+        location: [{ required: true, message: '库位不能为空', trigger: 'blur' }],
+        partId: [{ required: true, message: '物料不能为空', trigger: 'blur' }],
+        quantity: [{ required: true, message: '数量不能为空', trigger: 'blur', type: 'number' }]
+    },
+    options: {}
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+    open.value = false
+    reset()
+}
+
+// 重置表单
+function reset() {
+    form.value = {
+        inventoryId: null,
+        partId: null,
+        quantity: 0,
+        location: null,
+        lastInventoryCheck: null,
+        createdAt: null,
+        updatedAt: null
+    }
+    proxy.resetForm('formRef')
+}
+
+handleQuery()
+
+/// ====================== 库存操作 ======================
+const locaitonOptions = ref([])
+const sparePartOptions = ref([])
+const supplierOptions = ref([])
+// 获取下拉选项
+import {
+    getLocationOptions,
+    getSparePartsOptions,
+    getSupplierOptions,
+    EntryInventory,
+    OutInventory,
+    CheckInventory
+} from '@/api/materialManagement/wms-warehouse.js'
+function getOptions() {
+    getLocationSelectOptions('')
+    getSparePartsSelectOptions('')
+    getSupplierSelectOptions('')
+}
+function getLocationSelectOptions(query = '') {
+    getLocationOptions({ query }).then((res) => {
+        if (res.code === 200) {
+            locaitonOptions.value = res.data.map((item) => {
+                return {
+                    label: item,
+                    value: item
+                }
+            })
+        }
+    })
+}
+function getSparePartsSelectOptions(query = '') {
+    getSparePartsOptions({ query }).then((res) => {
+        if (res.code === 200) {
+            sparePartOptions.value = res.data.map((item) => {
+                return {
+                    label: item.partName + '-' + item.partCode,
+                    value: item.partId
+                }
+            })
+        }
+    })
+}
+function getSupplierSelectOptions(query = '') {
+    getSupplierOptions({ query }).then((res) => {
+        if (res.code === 200) {
+            supplierOptions.value = res.data.map((item) => {
+                return {
+                    label: item.supplierName,
+                    value: item.supplierId
+                }
+            })
+        }
+    })
+}
+// 打开库存操作Dialog
+const actionType = ref(0)
+const isUpdate = ref(false)
+function handleOpenDialog(type = 0, row = null) {
+    actionType.value = type
+    if (type == 0) {
+        proxy.$modal.msgError('操作类别为异常,请选择操作类别')
+        return
+    }
+    if (type == 1) {
+        title.value = '入库'
+    } else if (type == 2) {
+        title.value = '出库'
+    } else if (type == 3) {
+        title.value = '盘点'
+    }
+    reset()
+    isUpdate.value = false
+    if (row != null) {
+        isUpdate.value = true
+        form.value = JSON.parse(JSON.stringify(row))
+    }
+
+    getOptions()
+    open.value = true
+}
+// 添加&修改 表单提交
+async function submitForm() {
+    proxy.$refs['formRef'].validate(async (valid) => {
+        if (valid) {
+            try {
+                const params = form.value
+                let response
+                let type = actionType.value
+                if (type == 1) {
+                    response = await EntryInventory(params)
+                } else if (type == 2) {
+                    response = await OutInventory(params)
+                } else if (type == 3) {
+                    response = await CheckInventory(params)
+                }
+                if (response.code == 200) {
+                    proxy.$modal.msgSuccess(title.value + '操作成功')
+                    cancel()
+                    getList()
+                } else {
+                    proxy.$modal.msgError(response.msg)
+                }
+            } catch (e) {
+                proxy.$modal.msgError('操作异常:' + e)
+            }
+        }
+    })
+}
+/// ======================================================
+</script>
+
+<style scoped>
+.tag-box {
+    width: 200px;
+    height: 40px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    font-size: 24px;
+    font-weight: bold;
+}
+.bg-blue {
+    background-color: #409eff;
+    color: #fff;
+}
+.bg-red {
+    background-color: red;
+    color: #fff;
+}
+.bg-yellow {
+    background-color: yellow;
+    color: #fff;
+}
+</style>
diff --git a/src/views/materialManagement/log/inventoryChangeLog.vue b/src/views/materialManagement/log/inventoryChangeLog.vue
new file mode 100644
index 0000000..647655f
--- /dev/null
+++ b/src/views/materialManagement/log/inventoryChangeLog.vue
@@ -0,0 +1,307 @@
+<!--
+ * @Descripttion: (出入库日志InventoryChangeLog)
+ * @Author: (admin)
+ * @Date: (2025-3-18)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <!-- <el-col :span="1.5">
+                <el-button type="primary" v-hasPermi="['deviceManagement:devicepartstransactions:add']" plain icon="plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col> -->
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column prop="transactionId" label="记录编号" align="center" v-if="columns.showColumn('transactionId')" />
+            <el-table-column prop="partId" label="物料编号" align="center" v-if="columns.showColumn('partId')" />
+            <el-table-column prop="partName" label="物料名称" align="center" v-if="columns.showColumn('partName')" />
+            <el-table-column prop="transactionType" label="交易类型" align="center" v-if="columns.showColumn('transactionType')">
+                <template #default="scope">
+                    <dict-tag :options="options.transactionTypeOptions" :value="scope.row.transactionType" />
+                </template>
+            </el-table-column>
+            <el-table-column prop="quantity" label="数量" align="center" v-if="columns.showColumn('quantity')" />
+            <el-table-column prop="transactionDate" label="交易日期" v-if="columns.showColumn('transactionDate')" />
+            <el-table-column prop="supplierId" label="供应商" align="center" v-if="columns.showColumn('supplierId')" />
+            <el-table-column prop="remarks" label="备注" align="center" v-if="columns.showColumn('remarks')" />
+            <el-table-column prop="createdBy" label="创建人" align="center" v-if="columns.showColumn('createdBy')" />
+            <el-table-column label="操作" width="160">
+                <template #default="scope">
+                    <el-button
+                        type="success"
+                        size="small"
+                        icon="edit"
+                        title="编辑"
+                        v-hasPermi="['deviceManagement:devicepartstransactions:edit']"
+                        @click="handleUpdate(scope.row)"></el-button>
+                    <el-button
+                        type="danger"
+                        size="small"
+                        icon="delete"
+                        title="删除"
+                        v-hasPermi="['deviceManagement:devicepartstransactions:delete']"
+                        @click="handleDelete(scope.row)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改备品物料出入库对话框 -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="open">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="12">
+                        <el-form-item label="物料ID" prop="partId">
+                            <el-input v-model.number="form.partId" placeholder="请输入物料ID" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :lg="12">
+                        <el-form-item label="交易类型" prop="transactionType">
+                            <el-select v-model="form.transactionType" placeholder="请选择交易类型">
+                                <el-option
+                                    v-for="item in options.transactionTypeOptions"
+                                    :key="item.dictValue"
+                                    :label="item.dictLabel"
+                                    :value="item.dictValue"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="数量" prop="quantity">
+                            <el-input v-model.number="form.quantity" placeholder="请输入数量" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="交易日期" prop="transactionDate">
+                            <el-date-picker v-model="form.transactionDate" type="datetime" :teleported="false" placeholder="选择日期时间"></el-date-picker>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="供应商ID编号" prop="supplierId">
+                            <el-input v-model.number="form.supplierId" placeholder="请输入供应商ID编号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="备注" prop="remarks">
+                            <el-input v-model="form.remarks" placeholder="请输入备注" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="创建人" prop="createdBy">
+                            <el-input v-model="form.createdBy" placeholder="请输入创建人" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="inventoryChangeLog">
+import {
+    listMaterialTransactions,
+    addMaterialTransactions,
+    delMaterialTransactions,
+    updateMaterialTransactions,
+    getMaterialTransactions
+} from '@/api/materialManagement/wms-log.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    sort: '',
+    sortType: 'asc'
+})
+const columns = ref([
+    { visible: true, prop: 'transactionId', label: '交易ID' },
+    { visible: true, prop: 'partId', label: '物料ID' },
+    { visible: true, prop: 'transactionType', label: '交易类型：入库(in)，出库(out)' },
+    { visible: true, prop: 'quantity', label: '数量' },
+    { visible: true, prop: 'transactionDate', label: '交易日期' },
+    { visible: true, prop: 'supplierId', label: '供应商ID（仅对入库有效）' },
+    { visible: true, prop: 'remarks', label: '备注' },
+    { visible: true, prop: 'createdBy', label: '创建人' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+    loading.value = true
+    listMaterialTransactions(queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            dataList.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+    var sort = undefined
+    var sortType = undefined
+
+    if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+    }
+    queryParams.sort = sort
+    queryParams.sortType = sortType
+    handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+    single: true,
+    multiple: true,
+    form: {},
+    rules: {
+        partId: [{ required: true, message: '物料ID不能为空', trigger: 'blur', type: 'number' }],
+        transactionType: [{ required: true, message: '交易类型：入库(in)，出库(out)不能为空', trigger: 'change' }],
+        quantity: [{ required: true, message: '数量不能为空', trigger: 'blur', type: 'number' }]
+    },
+    options: {
+        // 交易类型：入库(in)，出库(out) 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+        transactionTypeOptions: [
+            { dictLabel: '入库', dictValue: '入库', className: 'success' },
+            { dictLabel: '出库', dictValue: '出库', className: 'danger' },
+            { dictLabel: '盘点', dictValue: '盘点', className: 'warning' }
+        ]
+    }
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+    open.value = false
+    reset()
+}
+
+// 重置表单
+function reset() {
+    form.value = {
+        transactionId: null,
+        partId: null,
+        transactionType: null,
+        quantity: null,
+        transactionDate: null,
+        supplierId: null,
+        remarks: null,
+        createdBy: null
+    }
+    proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+    reset()
+    open.value = true
+    title.value = '添加备品物料出入库'
+    opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+    reset()
+    const id = row.transactionId || ids.value
+    getMaterialTransactions(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            open.value = true
+            title.value = '修改备品物料出入库'
+            opertype.value = 2
+
+            form.value = {
+                ...data
+            }
+        }
+    })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+    proxy.$refs['formRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.transactionId != undefined && opertype.value === 2) {
+                updateMaterialTransactions(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addMaterialTransactions(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
+            }
+        }
+    })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+    const Ids = row.transactionId || ids.value
+
+    proxy
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+            return delMaterialTransactions(Ids)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+}
+
+handleQuery()
+</script>
diff --git a/src/views/materialManagement/mbom/index.vue b/src/views/materialManagement/mbom/index.vue
new file mode 100644
index 0000000..be0ad97
--- /dev/null
+++ b/src/views/materialManagement/mbom/index.vue
@@ -0,0 +1,280 @@
+<!--
+ * @Descripttion: (物料清单/bom表)
+ * @Author: (admin)
+ * @Date: (2025-3-18)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <el-col :span="1.5">
+                <el-button type="primary" v-hasPermi="['deviceManagement:devicespareparts:add']" plain icon="plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column prop="categoryId" label="分类" align="center" v-if="columns.showColumn('categoryId')" />
+            <el-table-column prop="partName" label="物料名称" align="center" v-if="columns.showColumn('partName')" />
+            <el-table-column prop="partCode" label="物料编号" align="center" v-if="columns.showColumn('partCode')" />
+            <el-table-column prop="description" label="描述" align="center" v-if="columns.showColumn('description')" />
+            <el-table-column prop="unitOfMeasure" label="计量单位" align="center" v-if="columns.showColumn('unitOfMeasure')" />
+            <el-table-column prop="minStockLevel" label="最低库存量" align="center" v-if="columns.showColumn('minStockLevel')" />
+            <el-table-column prop="maxStockLevel" label="最高库存量" align="center" v-if="columns.showColumn('maxStockLevel')" />
+            <el-table-column prop="createdAt" label="创建时间" v-if="columns.showColumn('createdAt')" />
+            <el-table-column prop="updatedAt" label="更新时间" v-if="columns.showColumn('updatedAt')" />
+            <el-table-column label="操作" width="160">
+                <template #default="scope">
+                    <el-button type="success" size="small" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+                    <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改备品物料基本信息表对话框 -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="open" :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="12">
+                        <el-form-item label="物料分类" prop="categoryId">
+                            <el-select v-model="form.categoryId" style="width: 240px">
+                                <el-option v-for="item in categoryOptions" :key="item.value" :label="item.label" :value="item.value" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="物料名称" prop="partName">
+                            <el-input v-model="form.partName" placeholder="请输入物料名称" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="物料编号" prop="partCode">
+                            <el-input v-model="form.partCode" placeholder="请输入物料编号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="描述" prop="description">
+                            <el-input type="textarea" v-model="form.description" placeholder="请输入描述" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="计量单位" prop="unitOfMeasure">
+                            <el-input v-model="form.unitOfMeasure" placeholder="请输入计量单位" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="最低库存量" prop="minStockLevel">
+                            <el-input-number v-model.number="form.minStockLevel" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="最高库存量" prop="maxStockLevel">
+                            <el-input-number v-model.number="form.maxStockLevel" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="mbom">
+import { listMBom, addMBom, delMBom, updateMBom, getMBom } from '@/api/materialManagement/wms-mbom.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    sort: '',
+    sortType: 'asc'
+})
+const columns = ref([
+    //{ visible: true, prop: 'partId', label: '物料ID' },
+    { visible: true, prop: 'partName', label: '物料名称' },
+    { visible: true, prop: 'partCode', label: '物料编号' },
+    { visible: true, prop: 'description', label: '描述' },
+    { visible: true, prop: 'categoryId', label: '分类ID' },
+    { visible: true, prop: 'unitOfMeasure', label: '计量单位' },
+    { visible: true, prop: 'minStockLevel', label: '最低库存量' },
+    { visible: true, prop: 'maxStockLevel', label: '最高库存量' },
+    { visible: false, prop: 'createdAt', label: '创建时间' },
+    { visible: false, prop: 'updatedAt', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+    loading.value = true
+    listMBom(queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            dataList.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+    var sort = undefined
+    var sortType = undefined
+
+    if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+    }
+    queryParams.sort = sort
+    queryParams.sortType = sortType
+    handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+    single: true,
+    multiple: true,
+    form: {},
+    rules: {
+        partName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
+        partCode: [{ required: true, message: '物料编号不能为空', trigger: 'blur' }]
+    },
+    options: {}
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+    open.value = false
+    reset()
+}
+
+// 重置表单
+function reset() {
+    form.value = {
+        categoryId: null,
+        partId: null,
+        partName: null,
+        partNumber: null,
+        description: null,
+        unitOfMeasure: '个',
+        minStockLevel: 0,
+        maxStockLevel: 0,
+        createdAt: null,
+        updatedAt: null
+    }
+    proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+    reset()
+    open.value = true
+    title.value = '添加备品物料基本信息表'
+    opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+    reset()
+    const id = row.partId || ids.value
+    getMBom(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            open.value = true
+            title.value = '修改备品物料基本信息表'
+            opertype.value = 2
+
+            form.value = {
+                ...data
+            }
+        }
+    })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+    proxy.$refs['formRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.partId != undefined && opertype.value === 2) {
+                updateMBom(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addMBom(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
+            }
+        }
+    })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+    const Ids = row.partId || ids.value
+
+    proxy
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+            return delMBom(Ids)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+}
+
+const categoryOptions = ref([])
+
+handleQuery()
+</script>
diff --git a/src/views/materialManagement/supplier/index.vue b/src/views/materialManagement/supplier/index.vue
new file mode 100644
index 0000000..b50f1c2
--- /dev/null
+++ b/src/views/materialManagement/supplier/index.vue
@@ -0,0 +1,275 @@
+<!--
+ * @Descripttion: (供应商)
+ * @Author: (admin)
+ * @Date: (2025-3-18)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <el-col :span="1.5">
+                <el-button type="primary" v-hasPermi="['deviceManagement:devicepartssuppliers:add']" plain icon="plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column prop="supplierId" label="供应商编号" align="center" v-if="columns.showColumn('supplierId')" />
+            <el-table-column prop="supplierName" label="供应商名称" align="center" v-if="columns.showColumn('supplierName')" />
+            <el-table-column prop="contactPerson" label="联系人" align="center" v-if="columns.showColumn('contactPerson')" />
+            <el-table-column prop="phone" label="联系电话" align="center" v-if="columns.showColumn('phone')" />
+            <el-table-column prop="email" label="电子邮箱" align="center" v-if="columns.showColumn('email')" />
+            <el-table-column prop="address" label="地址" align="center" v-if="columns.showColumn('address')" />
+            <el-table-column prop="createdAt" label="创建时间" v-if="columns.showColumn('createdAt')" />
+            <el-table-column prop="updatedAt" label="更新时间" v-if="columns.showColumn('updatedAt')" />
+            <el-table-column label="操作" width="160">
+                <template #default="scope">
+                    <el-button
+                        type="success"
+                        size="small"
+                        icon="edit"
+                        title="编辑"
+                        v-hasPermi="['deviceManagement:devicepartssuppliers:edit']"
+                        @click="handleUpdate(scope.row)"></el-button>
+                    <el-button
+                        type="danger"
+                        size="small"
+                        icon="delete"
+                        title="删除"
+                        v-hasPermi="['deviceManagement:devicepartssuppliers:delete']"
+                        @click="handleDelete(scope.row)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改备品备件供应商对话框 -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="open" :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <!-- <el-col :lg="12">
+                        <el-form-item label="供应商编号" prop="supplierId">
+                            <el-input v-model="form.supplierId" placeholder="请输入供应商编号" />
+                        </el-form-item>
+                    </el-col> -->
+                    <el-col :lg="12">
+                        <el-form-item label="供应商名称" prop="supplierName">
+                            <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="联系人" prop="contactPerson">
+                            <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="联系电话" prop="phone">
+                            <el-input v-model="form.phone" placeholder="请输入联系电话" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="电子邮箱" prop="email">
+                            <el-input v-model="form.email" placeholder="请输入电子邮箱" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="地址" prop="address">
+                            <el-input v-model="form.address" placeholder="请输入地址" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="supplier">
+import { listSupplier, addSupplier, delSupplier, updateSupplier, getSupplier } from '@/api/materialManagement/wms-supplier.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    sort: '',
+    sortType: 'asc'
+})
+const columns = ref([
+    { visible: true, prop: 'supplierId', label: '供应商ID' },
+    { visible: true, prop: 'supplierName', label: '供应商名称' },
+    { visible: true, prop: 'contactPerson', label: '联系人' },
+    { visible: true, prop: 'phone', label: '联系电话' },
+    { visible: true, prop: 'email', label: '电子邮箱' },
+    { visible: true, prop: 'address', label: '地址' },
+    { visible: true, prop: 'createdAt', label: '创建时间' },
+    { visible: true, prop: 'updatedAt', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+    loading.value = true
+    listSupplier(queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            dataList.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+    var sort = undefined
+    var sortType = undefined
+
+    if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+    }
+    queryParams.sort = sort
+    queryParams.sortType = sortType
+    handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+    single: true,
+    multiple: true,
+    form: {},
+    rules: {
+        supplierId: [{ required: true, message: '供应商编号不能为空', trigger: 'blur' }],
+        supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }]
+    },
+    options: {}
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+    open.value = false
+    reset()
+}
+
+// 重置表单
+function reset() {
+    form.value = {
+        supplierId: null,
+        supplierName: null,
+        contactPerson: null,
+        phone: null,
+        email: null,
+        address: null,
+        createdAt: null,
+        updatedAt: null
+    }
+    proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+    reset()
+    open.value = true
+    title.value = '添加备品备件供应商'
+    opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+    reset()
+    const id = row.supplierId || ids.value
+    getSupplier(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            open.value = true
+            title.value = '修改备品备件供应商'
+            opertype.value = 2
+
+            form.value = {
+                ...data
+            }
+        }
+    })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+    proxy.$refs['formRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.supplierId != undefined && opertype.value === 2) {
+                updateSupplier(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addSupplier(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
+            }
+        }
+    })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+    const Ids = row.supplierId || ids.value
+    proxy
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+            return delSupplier(Ids)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+}
+
+handleQuery()
+</script>
diff --git a/src/views/materialManagement/warehouse/index.vue b/src/views/materialManagement/warehouse/index.vue
new file mode 100644
index 0000000..7c0e41c
--- /dev/null
+++ b/src/views/materialManagement/warehouse/index.vue
@@ -0,0 +1,233 @@
+<!--
+ * @Descripttion: (库位列表)
+ * @Author: (admin)
+ * @Date: (2025-3-18)
+-->
+<template>
+    <div>
+        <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
+                <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <!-- 工具区域 -->
+        <el-row :gutter="15" class="mb10">
+            <el-col :span="1.5">
+                <el-button type="primary" v-hasPermi="['deviceManagement:devicepartsstoragelocations:add']" plain icon="plus" @click="handleAdd">
+                    {{ $t('btn.add') }}
+                </el-button>
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table
+            :data="dataList"
+            v-loading="loading"
+            ref="table"
+            border
+            header-cell-class-name="el-table-header-cell"
+            highlight-current-row
+            @sort-change="sortChange">
+            <el-table-column prop="locationCode" label="库位编码" align="center" v-if="columns.showColumn('locationCode')" />
+            <el-table-column prop="description" label="库位描述" align="center" v-if="columns.showColumn('description')" />
+            <!-- <el-table-column prop="warehouseId" label="所属仓库ID" align="center" v-if="columns.showColumn('warehouseId')" /> -->
+            <el-table-column prop="createdAt" label="创建时间" align="center" v-if="columns.showColumn('createdAt')" />
+            <el-table-column prop="updatedAt" label="更新时间" align="center" v-if="columns.showColumn('updatedAt')" />
+            <el-table-column label="操作" width="160">
+                <template #default="scope">
+                    <el-button type="success" size="small" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+                    <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改备品备件库位对话框 -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="open" :close-on-click-modal="false">
+            <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="12">
+                        <el-form-item label="库位编码" prop="locationCode">
+                            <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :lg="12">
+                        <el-form-item label="库位描述" prop="description">
+                            <el-input v-model="form.description" placeholder="请输入库位描述" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="warehouse">
+import { listWarehouse, addWarehouse, delWarehouse, updateWarehouse, getWarehouse } from '@/api/materialManagement/wms-warehouse.js'
+const { proxy } = getCurrentInstance()
+const ids = ref([])
+const loading = ref(false)
+const showSearch = ref(true)
+const queryParams = reactive({
+    pageNum: 1,
+    pageSize: 10,
+    sort: '',
+    sortType: 'asc'
+})
+const columns = ref([
+    //{ visible: true, prop: 'locationId', label: '库位ID' },
+    { visible: false, prop: 'warehouseId', label: '所属仓库ID' },
+    { visible: true, prop: 'locationCode', label: '库位编码' },
+    { visible: true, prop: 'description', label: '库位描述' },
+    { visible: true, prop: 'createdAt', label: '创建时间' },
+    { visible: true, prop: 'updatedAt', label: '更新时间' }
+])
+const total = ref(0)
+const dataList = ref([])
+const queryRef = ref()
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
+
+var dictParams = []
+
+function getList() {
+    loading.value = true
+    listWarehouse(queryParams).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            dataList.value = data.result
+            total.value = data.totalNum
+            loading.value = false
+        }
+    })
+}
+
+// 查询
+function handleQuery() {
+    queryParams.pageNum = 1
+    getList()
+}
+
+// 重置查询操作
+function resetQuery() {
+    proxy.resetForm('queryRef')
+    handleQuery()
+}
+// 自定义排序
+function sortChange(column) {
+    var sort = undefined
+    var sortType = undefined
+
+    if (column.prop != null && column.order != null) {
+        sort = column.prop
+        sortType = column.order
+    }
+    queryParams.sort = sort
+    queryParams.sortType = sortType
+    handleQuery()
+}
+
+/*************** form操作 ***************/
+const formRef = ref()
+const title = ref('')
+// 操作类型 1、add 2、edit 3、view
+const opertype = ref(0)
+const open = ref(false)
+const state = reactive({
+    single: true,
+    multiple: true,
+    form: {},
+    rules: {
+        locationCode: [{ required: true, message: '库位编码不能为空', trigger: 'blur' }]
+        // warehouseId: [{ required: true, message: '所属仓库ID不能为空', trigger: 'blur', type: 'number' }]
+    },
+    options: {}
+})
+
+const { form, rules, options, single, multiple } = toRefs(state)
+
+// 关闭dialog
+function cancel() {
+    open.value = false
+    reset()
+}
+
+// 重置表单
+function reset() {
+    form.value = {
+        locationId: null,
+        locationCode: null,
+        description: null,
+        warehouseId: null,
+        createdAt: null,
+        updatedAt: null
+    }
+    proxy.resetForm('formRef')
+}
+// 添加按钮操作
+function handleAdd() {
+    reset()
+    open.value = true
+    title.value = '添加备品备件库位'
+    opertype.value = 1
+}
+// 修改按钮操作
+function handleUpdate(row) {
+    reset()
+    const id = row.locationId || ids.value
+    getWarehouse(id).then((res) => {
+        const { code, data } = res
+        if (code == 200) {
+            open.value = true
+            title.value = '修改备品备件库位'
+            opertype.value = 2
+
+            form.value = {
+                ...data
+            }
+        }
+    })
+}
+
+// 添加&修改 表单提交
+function submitForm() {
+    proxy.$refs['formRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.locationId != undefined && opertype.value === 2) {
+                updateWarehouse(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addWarehouse(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
+            }
+        }
+    })
+}
+
+// 删除按钮操作
+function handleDelete(row) {
+    const Ids = row.locationId || ids.value
+
+    proxy
+        .$confirm('是否确认删除参数编号为"' + Ids + '"的数据项？')
+        .then(function () {
+            return delWarehouse(Ids)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+}
+
+handleQuery()
+</script>