diff --git a/src/api/mes/baseClassTeamInfo/index.ts b/src/api/mes/baseClassTeamInfo/index.ts
index 75df354..8c50495 100644
--- a/src/api/mes/baseClassTeamInfo/index.ts
+++ b/src/api/mes/baseClassTeamInfo/index.ts
@@ -61,3 +61,16 @@ export const delBaseClassTeamInfo = (classTeamId: string | number | Array<string
     method: 'delete'
   });
 };
+
+/**
+ * 下拉框查询班组信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseClassTeamInfoList (query) {
+  return request({
+    url: '/mes/baseClassTeamInfo/getBaseClassTeamInfoList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/system/masterData/index.ts b/src/api/system/masterData/index.ts
new file mode 100644
index 0000000..b761d83
--- /dev/null
+++ b/src/api/system/masterData/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MasterDataVO, MasterDataForm, MasterDataQuery } from '@/api/system/masterData/types';
+
+/**
+ * 查询主数据维护列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMasterData = (query?: MasterDataQuery): AxiosPromise<MasterDataVO[]> => {
+  return request({
+    url: '/system/masterData/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询主数据维护详细
+ * @param masterDataId
+ */
+export const getMasterData = (masterDataId: string | number): AxiosPromise<MasterDataVO> => {
+  return request({
+    url: '/system/masterData/' + masterDataId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增主数据维护
+ * @param data
+ */
+export const addMasterData = (data: MasterDataForm) => {
+  return request({
+    url: '/system/masterData',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改主数据维护
+ * @param data
+ */
+export const updateMasterData = (data: MasterDataForm) => {
+  return request({
+    url: '/system/masterData',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除主数据维护
+ * @param masterDataId
+ */
+export const delMasterData = (masterDataId: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/masterData/' + masterDataId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询主数据维护列表
+ * @param query
+ * @returns {*}
+ */
+export function getSysMasterDataList (query) {
+    return request({
+        url: '/system/masterData/getSysMasterDataList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/system/masterData/types.ts b/src/api/system/masterData/types.ts
new file mode 100644
index 0000000..f711dc9
--- /dev/null
+++ b/src/api/system/masterData/types.ts
@@ -0,0 +1,281 @@
+export interface MasterDataVO {
+  /**
+   * 主键标识
+   */
+  masterDataId: string | number;
+
+  /**
+   * 所属模块（1MES 2WMS 3DMS 4QMS 5EMS）
+   */
+  moduleType: string;
+
+  /**
+   * 父级标识;（1是 0否）
+   */
+  parentFlag: string;
+
+  /**
+   * 菜单ID
+   */
+  menuId: string | number;
+
+  /**
+   * 路由参数
+   */
+  queryParam: string;
+
+  /**
+   * 主数据标题;例：品牌、层级、花纹
+   */
+  masterDataTitle: string;
+
+  /**
+   * 预留字段1名称
+   */
+  fieldName1: string;
+
+  /**
+   * 预留字段1显示标识;（1是 0否）
+   */
+  displayFlag1: string;
+
+  /**
+   * 预留字段2名称
+   */
+  fieldName2: string;
+
+  /**
+   * 预留字段2显示标识;（1是 0否）
+   */
+  displayFlag2: string;
+
+  /**
+   * 预留字段3名称
+   */
+  fieldName3: string;
+
+  /**
+   * 预留字段3显示标识;（1是 0否）
+   */
+  displayFlag3: string;
+
+  /**
+   * 预留字段4名称
+   */
+  fieldName4: string;
+
+  /**
+   * 预留字段4显示标识;（1是 0否）
+   */
+  displayFlag4: string;
+
+  /**
+   * 预留字段5名称
+   */
+  fieldName5: string;
+
+  /**
+   * 预留字段5显示标识;（1是 0否）
+   */
+  displayFlag5: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MasterDataForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 所属模块（1MES 2WMS 3DMS 4QMS 5EMS）
+   */
+  moduleType?: string;
+
+  /**
+   * 父级标识;（1是 0否）
+   */
+  parentFlag?: string;
+
+  /**
+   * 菜单ID
+   */
+  menuId?: string | number;
+
+  /**
+   * 路由参数
+   */
+  queryParam?: string;
+
+  /**
+   * 主数据标题;例：品牌、层级、花纹
+   */
+  masterDataTitle?: string;
+
+  /**
+   * 预留字段1名称
+   */
+  fieldName1?: string;
+
+  /**
+   * 预留字段1显示标识;（1是 0否）
+   */
+  displayFlag1?: string;
+
+  /**
+   * 预留字段2名称
+   */
+  fieldName2?: string;
+
+  /**
+   * 预留字段2显示标识;（1是 0否）
+   */
+  displayFlag2?: string;
+
+  /**
+   * 预留字段3名称
+   */
+  fieldName3?: string;
+
+  /**
+   * 预留字段3显示标识;（1是 0否）
+   */
+  displayFlag3?: string;
+
+  /**
+   * 预留字段4名称
+   */
+  fieldName4?: string;
+
+  /**
+   * 预留字段4显示标识;（1是 0否）
+   */
+  displayFlag4?: string;
+
+  /**
+   * 预留字段5名称
+   */
+  fieldName5?: string;
+
+  /**
+   * 预留字段5显示标识;（1是 0否）
+   */
+  displayFlag5?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MasterDataQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 所属模块（1MES 2WMS 3DMS 4QMS 5EMS）
+   */
+  moduleType?: string;
+
+  /**
+   * 父级标识;（1是 0否）
+   */
+  parentFlag?: string;
+
+  /**
+   * 菜单ID
+   */
+  menuId?: string | number;
+
+  /**
+   * 路由参数
+   */
+  queryParam?: string;
+
+  /**
+   * 主数据标题;例：品牌、层级、花纹
+   */
+  masterDataTitle?: string;
+
+  /**
+   * 预留字段1名称
+   */
+  fieldName1?: string;
+
+  /**
+   * 预留字段1显示标识;（1是 0否）
+   */
+  displayFlag1?: string;
+
+  /**
+   * 预留字段2名称
+   */
+  fieldName2?: string;
+
+  /**
+   * 预留字段2显示标识;（1是 0否）
+   */
+  displayFlag2?: string;
+
+  /**
+   * 预留字段3名称
+   */
+  fieldName3?: string;
+
+  /**
+   * 预留字段3显示标识;（1是 0否）
+   */
+  displayFlag3?: string;
+
+  /**
+   * 预留字段4名称
+   */
+  fieldName4?: string;
+
+  /**
+   * 预留字段4显示标识;（1是 0否）
+   */
+  displayFlag4?: string;
+
+  /**
+   * 预留字段5名称
+   */
+  fieldName5?: string;
+
+  /**
+   * 预留字段5显示标识;（1是 0否）
+   */
+  displayFlag5?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/system/masterDataDetail/index.ts b/src/api/system/masterDataDetail/index.ts
new file mode 100644
index 0000000..6cabb45
--- /dev/null
+++ b/src/api/system/masterDataDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MasterDataDetailVO, MasterDataDetailForm, MasterDataDetailQuery } from '@/api/system/masterDataDetail/types';
+
+/**
+ * 查询主数据维护明细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMasterDataDetail = (query?: MasterDataDetailQuery): AxiosPromise<MasterDataDetailVO[]> => {
+  return request({
+    url: '/system/masterDataDetail/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询主数据维护明细详细
+ * @param masterDataDetailId
+ */
+export const getMasterDataDetail = (masterDataDetailId: string | number): AxiosPromise<MasterDataDetailVO> => {
+  return request({
+    url: '/system/masterDataDetail/' + masterDataDetailId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增主数据维护明细
+ * @param data
+ */
+export const addMasterDataDetail = (data: MasterDataDetailForm) => {
+  return request({
+    url: '/system/masterDataDetail',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改主数据维护明细
+ * @param data
+ */
+export const updateMasterDataDetail = (data: MasterDataDetailForm) => {
+  return request({
+    url: '/system/masterDataDetail',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除主数据维护明细
+ * @param masterDataDetailId
+ */
+export const delMasterDataDetail = (masterDataDetailId: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/masterDataDetail/' + masterDataDetailId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询主数据维护明细列表
+ * @param query
+ * @returns {*}
+ */
+export function getSysMasterDataDetailList(query) {
+  return request({
+    url: '/system/masterDataDetail/getSysMasterDataDetailList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/system/masterDataDetail/types.ts b/src/api/system/masterDataDetail/types.ts
new file mode 100644
index 0000000..c4a96d1
--- /dev/null
+++ b/src/api/system/masterDataDetail/types.ts
@@ -0,0 +1,221 @@
+export interface MasterDataDetailVO {
+  /**
+   * 主键标识
+   */
+  masterDataDetailId: string | number;
+
+  /**
+   * 主数据ID
+   */
+  masterDataId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 主数据明细编号
+   */
+  dataDetailCode: string;
+
+  /**
+   * 主数据明细名称
+   */
+  dataDetailName: string;
+
+  /**
+   * 预留字段1数据
+   */
+  fieldData1: string;
+
+  /**
+   * 预留字段2数据
+   */
+  fieldData2: string;
+
+  /**
+   * 预留字段3数据
+   */
+  fieldData3: string;
+
+  /**
+   * 预留字段4数据
+   */
+  fieldData4: string;
+
+  /**
+   * 预留字段5数据
+   */
+  fieldData5: string;
+
+  /**
+   * 显示排序
+   */
+  displaySort: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+}
+
+export interface MasterDataDetailForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  masterDataDetailId?: string | number;
+
+  /**
+   * 主数据ID
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 主数据明细编号
+   */
+  dataDetailCode?: string;
+
+  /**
+   * 主数据明细名称
+   */
+  dataDetailName?: string;
+
+  /**
+   * 预留字段1数据
+   */
+  fieldData1?: string;
+
+  /**
+   * 预留字段2数据
+   */
+  fieldData2?: string;
+
+  /**
+   * 预留字段3数据
+   */
+  fieldData3?: string;
+
+  /**
+   * 预留字段4数据
+   */
+  fieldData4?: string;
+
+  /**
+   * 预留字段5数据
+   */
+  fieldData5?: string;
+
+  /**
+   * 显示排序
+   */
+  displaySort?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+}
+
+export interface MasterDataDetailQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  masterDataDetailId?: string | number;
+
+  /**
+   * 主数据ID
+   */
+  masterDataId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 主数据明细编号
+   */
+  dataDetailCode?: string;
+
+  /**
+   * 主数据明细名称
+   */
+  dataDetailName?: string;
+
+  /**
+   * 预留字段1数据
+   */
+  fieldData1?: string;
+
+  /**
+   * 预留字段2数据
+   */
+  fieldData2?: string;
+
+  /**
+   * 预留字段3数据
+   */
+  fieldData3?: string;
+
+  /**
+   * 预留字段4数据
+   */
+  fieldData4?: string;
+
+  /**
+   * 预留字段5数据
+   */
+  fieldData5?: string;
+
+  /**
+   * 显示排序
+   */
+  displaySort?: number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/wms/baseLocation/index.ts b/src/api/wms/baseLocation/index.ts
index d7fa1c4..c75a1ab 100644
--- a/src/api/wms/baseLocation/index.ts
+++ b/src/api/wms/baseLocation/index.ts
@@ -70,8 +70,15 @@ export const delBaseLocation = (locationId: string | number | Array<string | num
  */
 export function getBaseLocationList (query) {
     return request({
-        url: '/wms/baseLocation/getBaseLocationList',
+        url: '/wms/baseLocation/getWmsBaseLocationList',
         method: 'get',
         params: query
     });
 }
+export function getWmsBaseLocationVoList (query) {
+  return request({
+      url: '/wms/baseLocation/getWmsBaseLocationVoList',
+      method: 'get',
+      params: query
+  });
+}
diff --git a/src/api/wms/inventory/index.ts b/src/api/wms/inventory/index.ts
index 80fe5f9..29c95af 100644
--- a/src/api/wms/inventory/index.ts
+++ b/src/api/wms/inventory/index.ts
@@ -61,3 +61,11 @@ export const delInventory = (inventoryId: string | number | Array<string | numbe
     method: 'delete'
   });
 };
+
+export const getMaterialInfoList = (query) => {
+  return request({
+    url: '/wms/inventory/getMaterialInfoList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/wms/inventoryCheck/index.ts b/src/api/wms/inventoryCheck/index.ts
new file mode 100644
index 0000000..bd27c64
--- /dev/null
+++ b/src/api/wms/inventoryCheck/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { InventoryCheckVO, InventoryCheckForm, InventoryCheckQuery } from '@/api/wms/inventoryCheck/types';
+
+/**
+ * 查询库存盘点列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listInventoryCheck = (query?: InventoryCheckQuery): AxiosPromise<InventoryCheckVO[]> => {
+  return request({
+    url: '/wms/inventoryCheck/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询库存盘点详细
+ * @param inventoryCheckId
+ */
+export const getInventoryCheck = (inventoryCheckId: string | number): AxiosPromise<InventoryCheckVO> => {
+  return request({
+    url: '/wms/inventoryCheck/' + inventoryCheckId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增库存盘点
+ * @param data
+ */
+export const addInventoryCheck = (data: InventoryCheckForm) => {
+  return request({
+    url: '/wms/inventoryCheck',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改库存盘点
+ * @param data
+ */
+export const updateInventoryCheck = (data: InventoryCheckForm) => {
+  return request({
+    url: '/wms/inventoryCheck',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除库存盘点
+ * @param inventoryCheckId
+ */
+export const delInventoryCheck = (inventoryCheckId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/inventoryCheck/' + inventoryCheckId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询库存盘点列表
+ * @param query
+ * @returns {*}
+ */
+export function getInventoryCheckList (query) {
+    return request({
+        url: '/wms/inventoryCheck/getInventoryCheckList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/wms/inventoryCheck/types.ts b/src/api/wms/inventoryCheck/types.ts
new file mode 100644
index 0000000..f2bc411
--- /dev/null
+++ b/src/api/wms/inventoryCheck/types.ts
@@ -0,0 +1,196 @@
+export interface InventoryCheckVO {
+  /**
+   * 表主键
+   */
+  inventoryCheckId: string | number;
+
+  /**
+   * 盘点单号
+   */
+  checkCode: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories: string;
+
+  /**
+   * 计划仓库ID
+   */
+  planWarehouseId: string | number;
+
+  /**
+   * 盘点类型（1全部，2货架，3物料））
+   */
+  checkType: string;
+
+  /**
+   * 盘点状态（0计划，2盘点中，3盘点完成）
+   */
+  checkStatus: string;
+
+  /**
+   * 审核人
+   */
+  auditBy: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments: string;
+
+  /**
+   * 开始时间
+   */
+  beginTime: string;
+
+  /**
+   * 结束时间
+   */
+  endTime: string;
+
+}
+
+export interface InventoryCheckForm extends BaseEntity {
+  /**
+   * 表主键
+   */
+  inventoryCheckId?: string | number;
+
+  /**
+   * 盘点单号
+   */
+  checkCode?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 计划仓库ID
+   */
+  planWarehouseId?: string | number;
+
+  /**
+   * 盘点类型（1全部，2货架，3物料））
+   */
+  checkType?: string;
+
+  /**
+   * 盘点状态（0计划，2盘点中，3盘点完成）
+   */
+  checkStatus?: string;
+
+  /**
+   * 审核人
+   */
+  auditBy?: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime?: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus?: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments?: string;
+
+  /**
+   * 开始时间
+   */
+  beginTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+}
+
+export interface InventoryCheckQuery extends PageQuery {
+
+  /**
+   * 表主键
+   */
+  inventoryCheckId?: string | number;
+
+  /**
+   * 盘点单号
+   */
+  checkCode?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 计划仓库ID
+   */
+  planWarehouseId?: string | number;
+
+  /**
+   * 盘点类型（1全部，2货架，3物料））
+   */
+  checkType?: string;
+
+  /**
+   * 盘点状态（0计划，2盘点中，3盘点完成）
+   */
+  checkStatus?: string;
+
+  /**
+   * 审核人
+   */
+  auditBy?: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime?: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus?: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments?: string;
+
+  /**
+   * 开始时间
+   */
+  beginTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/wms/inventoryCheckRecord/index.ts b/src/api/wms/inventoryCheckRecord/index.ts
new file mode 100644
index 0000000..e32d63b
--- /dev/null
+++ b/src/api/wms/inventoryCheckRecord/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { InventoryCheckRecordVO, InventoryCheckRecordForm, InventoryCheckRecordQuery } from '@/api/wms/inventoryCheckRecord/types';
+
+/**
+ * 查询盘点记录和调整工单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listInventoryCheckRecord = (query?: InventoryCheckRecordQuery): AxiosPromise<InventoryCheckRecordVO[]> => {
+  return request({
+    url: '/wms/inventoryCheckRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询盘点记录和调整工单详细
+ * @param icRecordId
+ */
+export const getInventoryCheckRecord = (icRecordId: string | number): AxiosPromise<InventoryCheckRecordVO> => {
+  return request({
+    url: '/wms/inventoryCheckRecord/' + icRecordId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增盘点记录和调整工单
+ * @param data
+ */
+export const addInventoryCheckRecord = (data: InventoryCheckRecordForm) => {
+  return request({
+    url: '/wms/inventoryCheckRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改盘点记录和调整工单
+ * @param data
+ */
+export const updateInventoryCheckRecord = (data: InventoryCheckRecordForm) => {
+  return request({
+    url: '/wms/inventoryCheckRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除盘点记录和调整工单
+ * @param icRecordId
+ */
+export const delInventoryCheckRecord = (icRecordId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/inventoryCheckRecord/' + icRecordId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询盘点记录和调整工单列表
+ * @param query
+ * @returns {*}
+ */
+export function getInventoryCheckRecordList (query) {
+    return request({
+        url: '/wms/inventoryCheckRecord/getInventoryCheckRecordList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/wms/inventoryCheckRecord/types.ts b/src/api/wms/inventoryCheckRecord/types.ts
new file mode 100644
index 0000000..02aca53
--- /dev/null
+++ b/src/api/wms/inventoryCheckRecord/types.ts
@@ -0,0 +1,316 @@
+export interface InventoryCheckRecordVO {
+  /**
+   * 盘点记录主键
+   */
+  icRecordId: string | number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories: string;
+
+  /**
+   * 盘点单号
+   */
+  checkCode: string;
+
+  /**
+   * 批次码
+   */
+  batchCode: string;
+
+  /**
+   * 物料id
+   */
+  materialId: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 物料名称
+   */
+  materialName: string;
+
+  /**
+   * 库存数量
+   */
+  inventoryQty: string;
+
+  /**
+   * 盘点数量
+   */
+  checkQty: number;
+
+  /**
+   * 盘点状态(0异常，1正常)
+   */
+  checkStatus: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty: number;
+
+  /**
+   * 是否发起调整（0否，1是）
+   */
+  isAdjust: string;
+
+  /**
+   * 审核人
+   */
+  auditBy: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments: string;
+
+  /**
+   * 调整状态（0待执行，1完成）
+   */
+  adjustStatus: string;
+
+  /**
+   * 调整类型（1库存调整）
+   */
+  adjustType: string;
+
+}
+
+export interface InventoryCheckRecordForm extends BaseEntity {
+  /**
+   * 盘点记录主键
+   */
+  icRecordId?: string | number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 盘点单号
+   */
+  checkCode?: string;
+
+  /**
+   * 批次码
+   */
+  batchCode?: string;
+
+  /**
+   * 物料id
+   */
+  materialId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 库存数量
+   */
+  inventoryQty?: string;
+
+  /**
+   * 盘点数量
+   */
+  checkQty?: number;
+
+  /**
+   * 盘点状态(0异常，1正常)
+   */
+  checkStatus?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+  /**
+   * 是否发起调整（0否，1是）
+   */
+  isAdjust?: string;
+
+  /**
+   * 审核人
+   */
+  auditBy?: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime?: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus?: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments?: string;
+
+  /**
+   * 调整状态（0待执行，1完成）
+   */
+  adjustStatus?: string;
+
+  /**
+   * 调整类型（1库存调整）
+   */
+  adjustType?: string;
+
+}
+
+export interface InventoryCheckRecordQuery extends PageQuery {
+
+  /**
+   * 盘点记录主键
+   */
+  icRecordId?: string | number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 盘点单号
+   */
+  checkCode?: string;
+
+  /**
+   * 批次码
+   */
+  batchCode?: string;
+
+  /**
+   * 物料id
+   */
+  materialId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 库存数量
+   */
+  inventoryQty?: string;
+
+  /**
+   * 盘点数量
+   */
+  checkQty?: number;
+
+  /**
+   * 盘点状态(0异常，1正常)
+   */
+  checkStatus?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+  /**
+   * 是否发起调整（0否，1是）
+   */
+  isAdjust?: string;
+
+  /**
+   * 审核人
+   */
+  auditBy?: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime?: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus?: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments?: string;
+
+  /**
+   * 调整状态（0待执行，1完成）
+   */
+  adjustStatus?: string;
+
+  /**
+   * 调整类型（1库存调整）
+   */
+  adjustType?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/wms/moveOrder/index.ts b/src/api/wms/moveOrder/index.ts
new file mode 100644
index 0000000..21bb486
--- /dev/null
+++ b/src/api/wms/moveOrder/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MoveOrderVO, MoveOrderForm, MoveOrderQuery } from '@/api/wms/moveOrder/types';
+
+/**
+ * 查询移库工单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMoveOrder = (query?: MoveOrderQuery): AxiosPromise<MoveOrderVO[]> => {
+  return request({
+    url: '/wms/moveOrder/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询移库工单详细
+ * @param moveId
+ */
+export const getMoveOrder = (moveId: string | number): AxiosPromise<MoveOrderVO> => {
+  return request({
+    url: '/wms/moveOrder/' + moveId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增移库工单
+ * @param data
+ */
+export const addMoveOrder = (data: MoveOrderForm) => {
+  return request({
+    url: '/wms/moveOrder',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改移库工单
+ * @param data
+ */
+export const updateMoveOrder = (data: MoveOrderForm) => {
+  return request({
+    url: '/wms/moveOrder',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除移库工单
+ * @param moveId
+ */
+export const delMoveOrder = (moveId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/moveOrder/' + moveId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询移库工单列表
+ * @param query
+ * @returns {*}
+ */
+export function getMoveOrderList (query) {
+    return request({
+        url: '/wms/moveOrder/getMoveOrderList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/wms/moveOrder/types.ts b/src/api/wms/moveOrder/types.ts
new file mode 100644
index 0000000..3afb30c
--- /dev/null
+++ b/src/api/wms/moveOrder/types.ts
@@ -0,0 +1,211 @@
+export interface MoveOrderVO {
+  /**
+   * 表主键
+   */
+  moveId: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId: string | number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories: string;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId: string | number;
+
+  /**
+   * 计划库位
+   */
+  planLocationCode: number;
+
+  /**
+   * 工单状态(0执行中，1完成，2关闭)
+   */
+  orderStatus: string;
+
+  /**
+   * 目标库位
+   */
+  targetLocationCode: number;
+
+  /**
+   * 审核人
+   */
+  auditBy: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty: number;
+
+}
+
+export interface MoveOrderForm extends BaseEntity {
+  /**
+   * 表主键
+   */
+  moveId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 计划库位
+   */
+  planLocationCode?: number;
+
+  /**
+   * 工单状态(0执行中，1完成，2关闭)
+   */
+  orderStatus?: string;
+
+  /**
+   * 目标库位
+   */
+  targetLocationCode?: number;
+
+  /**
+   * 审核人
+   */
+  auditBy?: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime?: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus?: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+}
+
+export interface MoveOrderQuery extends PageQuery {
+
+  /**
+   * 表主键
+   */
+  moveId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 计划库位
+   */
+  planLocationCode?: number;
+
+  /**
+   * 工单状态(0执行中，1完成，2关闭)
+   */
+  orderStatus?: string;
+
+  /**
+   * 目标库位
+   */
+  targetLocationCode?: number;
+
+  /**
+   * 审核人
+   */
+  auditBy?: string;
+
+  /**
+   * 审核时间
+   */
+  auditTime?: string;
+
+  /**
+   * 审核状态(0待审核,1审核通过,2审核未通过)
+   */
+  auditStatus?: string;
+
+  /**
+   * 审核意见
+   */
+  auditComments?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 1ad4509..145d391 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -16,9 +16,9 @@
 <!--            <el-form-item label="物料BOM" prop="materialBomId">-->
 <!--              <el-input v-model="queryParams.materialBomId" placeholder="请输入物料BOM" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
-            <el-form-item label="工序ID" prop="processId">
-              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+<!--            <el-form-item label="工序ID" prop="processId">-->
+<!--              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
 <!--            <el-form-item label="下达ID" prop="releaseId">-->
 <!--              <el-input v-model="queryParams.releaseId" placeholder="请输入下达ID" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
@@ -35,11 +35,11 @@
                 <el-option v-for="dict in mes_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="班次ID" prop="shiftId">-->
-<!--              <el-input v-model="queryParams.shiftId" placeholder="请输入班次ID" clearable @keyup.enter="handleQuery" />-->
+<!--            <el-form-item label="班次" prop="shiftId">-->
+<!--              <el-input v-model="queryParams.shiftId" placeholder="请输入班次" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
-<!--            <el-form-item label="班组ID" prop="classTeamId">-->
-<!--              <el-input v-model="queryParams.classTeamId" placeholder="请输入班组ID" clearable @keyup.enter="handleQuery" />-->
+<!--            <el-form-item label="班组" prop="classTeamId">-->
+<!--              <el-input v-model="queryParams.classTeamId" placeholder="请输入班组" clearable @keyup.enter="handleQuery" />-->
 <!--            </el-form-item>-->
             <el-form-item label="模号" prop="modelCode">
               <el-select v-model="queryParams.modelCode" placeholder="请选择模号" clearable >
@@ -82,9 +82,9 @@
         <el-table-column label="销售订单编号" align="center" prop="saleorderCode" v-if="columns[4].visible"/>
         <el-table-column label="计划编号" align="center" prop="planCode" v-if="columns[5].visible" width="100"/>
         <el-table-column label="派工单号" align="center" prop="dispatchCode" v-if="columns[6].visible"/>
-        <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[7].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible" width="160"/>
         <el-table-column label="物料BOM" align="center" prop="materialBomId" v-if="columns[8].visible"  width="100"/>
-        <el-table-column label="工序ID" align="center" prop="processId" v-if="columns[9].visible"/>
+        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[9].visible"/>
         <el-table-column label="顺序" align="center" prop="processOrder" v-if="columns[10].visible"/>
         <el-table-column label="上一工序ID" align="center" prop="lastProcessId" v-if="columns[11].visible"  width="100"/>
         <el-table-column label="最后工序标识" align="center" prop="finalProcessFlag" v-if="columns[12].visible"  width="110">
@@ -139,8 +139,8 @@
           </template>
         </el-table-column>
         <el-table-column label="优先级" align="center" prop="priority" v-if="columns[27].visible"/>
-        <el-table-column label="班次ID" align="center" prop="shiftId" v-if="columns[28].visible"/>
-        <el-table-column label="班组ID" align="center" prop="classTeamId" v-if="columns[29].visible"/>
+        <el-table-column label="班次" align="center" prop="shiftName" v-if="columns[28].visible"/>
+        <el-table-column label="班组" align="center" prop="teamName" v-if="columns[29].visible"/>
         <el-table-column label="模号" align="center" prop="modelCode" v-if="columns[30].visible">
           <template #default="scope">
             <dict-tag :options="mes_model_code" :value="scope.row.modelCode"/>
@@ -179,18 +179,18 @@
         <el-form-item label="派工单号" prop="dispatchCode">
           <el-input v-model="form.dispatchCode" placeholder="请输入派工单号" />
         </el-form-item>
-        <el-form-item label="物料ID" prop="materialId">
-          <el-input v-model="form.materialId" placeholder="请输入物料ID" />
+        <el-form-item label="物料名称" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入物料名称" />
         </el-form-item>
         <el-form-item label="物料BOM" prop="materialBomId">
           <el-input v-model="form.materialBomId" placeholder="请输入物料BOM" />
         </el-form-item>
-        <el-form-item label="工序ID" prop="processId">
-          <el-input v-model="form.processId" placeholder="请输入工序ID" />
-        </el-form-item>
-        <el-form-item label="顺序" prop="processOrder">
-          <el-input-number v-model="form.processOrder" placeholder="请输入顺序" style="width: 200px;"/>
+        <el-form-item label="工序名称" prop="processId">
+          <el-input v-model="form.processId" placeholder="请输入工序名称" />
         </el-form-item>
+<!--        <el-form-item label="顺序" prop="processOrder">-->
+<!--          <el-input-number v-model="form.processOrder" placeholder="请输入顺序" style="width: 200px;"/>-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="上一工序ID" prop="lastProcessId">-->
 <!--          <el-input v-model="form.lastProcessId" placeholder="请输入上一工序ID" />-->
 <!--        </el-form-item>-->
@@ -246,11 +246,24 @@
         <el-form-item label="优先级" prop="priority">
           <el-input-number v-model="form.priority" placeholder="请输入优先级" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="班次ID" prop="shiftId">
-          <el-input v-model="form.shiftId" placeholder="请输入班次ID" />
+        <el-form-item label="班次" prop="shiftId">
+          <el-radio-group v-model="form.shiftId">
+            <el-radio
+              v-for="dict in shiftList"
+              :key="dict.shiftId"
+              :value="dict.shiftId"
+            >{{dict.shiftName}}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="班组ID" prop="classTeamId">
-          <el-input v-model="form.classTeamId" placeholder="请输入班组ID" />
+        <el-form-item label="班组" prop="classTeamId">
+          <el-select v-model="form.classTeamId" placeholder="请选择班组">
+            <el-option
+              v-for="item in classTeamList"
+              :key="item.classTeamId"
+              :label="item.teamName"
+              :value="item.classTeamId"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="模号" prop="modelCode">
           <el-radio-group v-model="form.modelCode">
@@ -278,6 +291,8 @@
 <script setup name="PlanInfo" lang="ts">
 import { listPlanInfo, getPlanInfo, delPlanInfo, addPlanInfo, updatePlanInfo } from '@/api/mes/planInfo';
 import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/types';
+import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
+import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code'));
@@ -299,6 +314,22 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const shiftList = ref([]);
+const classTeamList = ref([]);
+
+/*获取班次下拉框*/
+const getShiftSelect = async () => {
+  let res = await getBaseShiftInfoList(null);
+  shiftList.value = res.data;
+};
+
+/*获取班组下拉框*/
+const getClassTeamSelect = async () => {
+  let res = await getBaseClassTeamInfoList(null);
+  classTeamList.value = res.data;
+};
+
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
         { key: 0, label: `主键标识`, visible: false },
@@ -308,9 +339,9 @@ const columns = ref<FieldOption[]>([
         { key: 4, label: `销售订单编号`, visible: false },
         { key: 5, label: `计划编号`, visible: true },
         { key: 6, label: `派工单号`, visible: true },
-        { key: 7, label: `物料ID`, visible: true },
+        { key: 7, label: `物料名称`, visible: true },
         { key: 8, label: `物料BOM`, visible: true },
-        { key: 9, label: `工序ID`, visible: true },
+        { key: 9, label: `工序名称`, visible: true },
         { key: 10, label: `顺序`, visible: true },
         { key: 11, label: `上一工序ID`, visible: true },
         { key: 12, label: `最后工序标识`, visible: true },
@@ -326,11 +357,11 @@ const columns = ref<FieldOption[]>([
         { key: 22, label: `实际完成时间`, visible: true },
         { key: 23, label: `附件信息`, visible: true },
         { key: 24, label: `计划状态`, visible: true },
-        { key: 25, label: `导入类型`, visible: true },
+        { key: 25, label: `导入类型`, visible: false },
         { key: 26, label: `完成标识`, visible: true },
         { key: 27, label: `优先级`, visible: true },
-        { key: 28, label: `班次ID`, visible: true },
-        { key: 29, label: `班组ID`, visible: true },
+        { key: 28, label: `班次`, visible: true },
+        { key: 29, label: `班组`, visible: true },
         { key: 30, label: `模号`, visible: true },
         { key: 31, label: `备注`, visible: false },
         { key: 32, label: `创建部门`, visible: false },
@@ -367,7 +398,7 @@ const initFormData: PlanInfoForm = {
   planStatus: undefined,
   importFlag: undefined,
   finishFlag: [],
-  priority: undefined,
+  priority: 1,
   shiftId: undefined,
   classTeamId: undefined,
   modelCode: undefined,
@@ -416,7 +447,7 @@ const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
       { required: true, message: "计划编号不能为空", trigger: "blur" }
     ],
     materialId: [
-      { required: true, message: "物料ID不能为空", trigger: "blur" }
+      { required: true, message: "物料名称不能为空", trigger: "blur" }
     ],
     materialBomId: [
       { required: true, message: "物料BOM不能为空", trigger: "blur" }
@@ -525,6 +556,8 @@ const handleExport = () => {
 }
 
 onMounted(() => {
+  getShiftSelect();
+  getClassTeamSelect();
   getList();
 });
 </script>
diff --git a/src/views/system/masterData/index.vue b/src/views/system/masterData/index.vue
new file mode 100644
index 0000000..40b3dc9
--- /dev/null
+++ b/src/views/system/masterData/index.vue
@@ -0,0 +1,477 @@
+<template>
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true' >
+            <el-form-item label='所属模块' prop='moduleType'>
+              <el-select v-model='queryParams.moduleType' placeholder='请选择所属模块' clearable>
+                <el-option v-for='dict in sys_module_type' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='主数据标题' prop='masterDataTitle' label-width="90px">
+              <el-input v-model='queryParams.masterDataTitle' placeholder='请输入主数据标题' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+            <el-form-item label='激活标识' prop='activeFlag'>
+              <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
+                <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow='never'>
+      <template #header>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['system:masterData:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['system:masterData:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['system:masterData:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['system:masterData:export']">导出
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading='loading' :data='masterDataList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='masterDataId' v-if='columns[0].visible' />
+        <el-table-column label='所属模块' align='center' prop='moduleType' v-if='columns[2].visible'>
+          <template #default='scope'>
+            <dict-tag :options='sys_module_type' :value='scope.row.moduleType' />
+          </template>
+        </el-table-column>
+        <el-table-column label='父级标识' align='center' prop='parentFlag' v-if='columns[3].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.parentFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='菜单ID' align='center' prop='menuId' v-if='columns[4].visible' />
+        <el-table-column label='路由参数' align='center' prop='queryParam' v-if='columns[5].visible' />
+        <el-table-column label='主数据标题' align='center' prop='masterDataTitle' v-if='columns[6].visible'  width="100"/>
+        <el-table-column label='预留字段1名称' align='center' prop='fieldName1' v-if='columns[7].visible' />
+        <el-table-column label='预留字段1显示标识' align='center' prop='displayFlag1' v-if='columns[8].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag1' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段2名称' align='center' prop='fieldName2' v-if='columns[9].visible' />
+        <el-table-column label='预留字段2显示标识' align='center' prop='displayFlag2' v-if='columns[10].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag2' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段3名称' align='center' prop='fieldName3' v-if='columns[11].visible' />
+        <el-table-column label='预留字段3显示标识' align='center' prop='displayFlag3' v-if='columns[12].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag3' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段4名称' align='center' prop='fieldName4' v-if='columns[13].visible' />
+        <el-table-column label='预留字段4显示标识' align='center' prop='displayFlag4' v-if='columns[14].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag4' />
+          </template>
+        </el-table-column>
+        <el-table-column label='预留字段5名称' align='center' prop='fieldName5' v-if='columns[15].visible' />
+        <el-table-column label='预留字段5显示标识' align='center' prop='displayFlag5' v-if='columns[16].visible' width="90">
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.displayFlag5' />
+          </template>
+        </el-table-column>
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[17].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[18].visible' />
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+          <template #default='scope'>
+            <el-tooltip content='修改' placement='top'>
+              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
+                         v-hasPermi="['system:masterData:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['system:masterData:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
+                  v-model:limit='queryParams.pageSize' @pagination='getList' />
+    </el-card>
+    <!-- 添加或修改主数据维护对话框 -->
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='600px' append-to-body>
+      <el-form ref='masterDataFormRef' :model='form' :rules='rules' label-width='150px'>
+        <el-form-item label='所属模块' prop='moduleType'>
+          <el-radio-group v-model='form.moduleType'>
+            <el-radio
+              v-for='dict in sys_module_type'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='父级标识' prop='parentFlag'>
+          <el-radio-group v-model='form.parentFlag'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='菜单ID' prop='menuId'>
+          <el-input v-model='form.menuId' placeholder='请输入菜单ID' />
+        </el-form-item>
+        <el-form-item label='路由参数' prop='queryParam'>
+          <el-input v-model='form.queryParam' placeholder='请输入路由参数' />
+        </el-form-item>
+        <el-form-item label='主数据标题' prop='masterDataTitle'>
+          <el-input v-model='form.masterDataTitle' placeholder='请输入主数据标题' />
+        </el-form-item>
+        <el-form-item label='预留字段1名称' prop='fieldName1'>
+          <el-input v-model='form.fieldName1' placeholder='请输入预留字段1名称' />
+        </el-form-item>
+        <el-form-item label='预留字段1显示标识' prop='displayFlag1'>
+          <el-radio-group v-model='form.displayFlag1'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段2名称' prop='fieldName2'>
+          <el-input v-model='form.fieldName2' placeholder='请输入预留字段2名称' />
+        </el-form-item>
+        <el-form-item label='预留字段2显示标识' prop='displayFlag2'>
+          <el-radio-group v-model='form.displayFlag2'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段3名称' prop='fieldName3'>
+          <el-input v-model='form.fieldName3' placeholder='请输入预留字段3名称' />
+        </el-form-item>
+        <el-form-item label='预留字段3显示标识' prop='displayFlag3'>
+          <el-radio-group v-model='form.displayFlag3'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段4名称' prop='fieldName4'>
+          <el-input v-model='form.fieldName4' placeholder='请输入预留字段4名称' />
+        </el-form-item>
+        <el-form-item label='预留字段4显示标识' prop='displayFlag4'>
+          <el-radio-group v-model='form.displayFlag4'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='预留字段5名称' prop='fieldName5'>
+          <el-input v-model='form.fieldName5' placeholder='请输入预留字段5名称' />
+        </el-form-item>
+        <el-form-item label='预留字段5显示标识' prop='displayFlag5'>
+          <el-radio-group v-model='form.displayFlag5'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='激活标识' prop='activeFlag'>
+          <el-radio-group v-model='form.activeFlag'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name='MasterData' lang='ts'>
+import { listMasterData, getMasterData, delMasterData, addMasterData, updateMasterData } from '@/api/system/masterData';
+import { MasterDataVO, MasterDataQuery, MasterDataForm } from '@/api/system/masterData/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {
+  active_flag,
+  sys_yes_no,
+  sys_module_type
+} = toRefs<any>(proxy?.useDict('active_flag', 'sys_yes_no', 'sys_module_type'));
+
+const masterDataList = ref<MasterDataVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const masterDataFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `所属模块`, visible: true },
+  { key: 3, label: `父级标识`, visible: true },
+  { key: 4, label: `菜单ID`, visible: false },
+  { key: 5, label: `路由参数`, visible: true },
+  { key: 6, label: `主数据标题`, visible: true },
+  { key: 7, label: `预留字段1名称`, visible: true },
+  { key: 8, label: `预留字段1显示标识`, visible: true },
+  { key: 9, label: `预留字段2名称`, visible: true },
+  { key: 10, label: `预留字段2显示标识`, visible: true },
+  { key: 11, label: `预留字段3名称`, visible: true },
+  { key: 12, label: `预留字段3显示标识`, visible: true },
+  { key: 13, label: `预留字段4名称`, visible: true },
+  { key: 14, label: `预留字段4显示标识`, visible: true },
+  { key: 15, label: `预留字段5名称`, visible: true },
+  { key: 16, label: `预留字段5显示标识`, visible: true },
+  { key: 17, label: `激活标识`, visible: true },
+  { key: 18, label: `备注`, visible: true },
+  { key: 19, label: `创建部门`, visible: false },
+  { key: 20, label: `创建人`, visible: false },
+  { key: 21, label: `创建时间`, visible: false },
+  { key: 22, label: `更新人`, visible: false },
+  { key: 23, label: `更新时间`, visible: false }
+]);
+
+const initFormData: MasterDataForm = {
+  masterDataId: undefined,
+  moduleType: undefined,
+  parentFlag: '0',
+  menuId: undefined,
+  queryParam: undefined,
+  masterDataTitle: undefined,
+  fieldName1: undefined,
+  displayFlag1: '0',
+  fieldName2: undefined,
+  displayFlag2: '0',
+  fieldName3: undefined,
+  displayFlag3: '0',
+  fieldName4: undefined,
+  displayFlag4: '0',
+  fieldName5: undefined,
+  displayFlag5: '0',
+  activeFlag: '1',
+  remark: undefined
+};
+const data = reactive<PageData<MasterDataForm, MasterDataQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    masterDataId: undefined,
+    moduleType: undefined,
+    parentFlag: undefined,
+    menuId: undefined,
+    queryParam: undefined,
+    masterDataTitle: undefined,
+    fieldName1: undefined,
+    displayFlag1: undefined,
+    fieldName2: undefined,
+    displayFlag2: undefined,
+    fieldName3: undefined,
+    displayFlag3: undefined,
+    fieldName4: undefined,
+    displayFlag4: undefined,
+    fieldName5: undefined,
+    displayFlag5: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    moduleType: [
+      { required: true, message: '所属模块不能为空', trigger: 'change' }
+    ],
+    parentFlag: [
+      { required: true, message: '父级标识不能为空', trigger: 'change' }
+    ],
+    queryParam: [
+      { required: true, message: '路由参数不能为空', trigger: 'blur' }
+    ],
+    masterDataTitle: [
+      { required: true, message: '主数据标题不能为空', trigger: 'blur' }
+    ],
+    displayFlag1: [
+      { required: true, message: '预留字段1显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag2: [
+      { required: true, message: '预留字段2显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag3: [
+      { required: true, message: '预留字段3显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag4: [
+      { required: true, message: '预留字段4显示标识不能为空', trigger: 'change' }
+    ],
+    displayFlag5: [
+      { required: true, message: '预留字段5显示标识不能为空', trigger: 'change' }
+    ],
+    activeFlag: [
+      { required: true, message: '激活标识不能为空', trigger: 'change' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询主数据维护列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMasterData(queryParams.value);
+  masterDataList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  masterDataFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MasterDataVO[]) => {
+  ids.value = selection.map(item => item.masterDataId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加主数据维护';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MasterDataVO) => {
+  reset();
+  const _masterDataId = row?.masterDataId || ids.value[0];
+  const res = await getMasterData(_masterDataId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改主数据维护';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  masterDataFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.masterDataId) {
+        await updateMasterData(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMasterData(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MasterDataVO) => {
+  const _masterDataIds = row?.masterDataId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除主数据维护编号为"' + _masterDataIds + '"的数据项？').finally(() => loading.value = false);
+  await delMasterData(_masterDataIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/masterData/export', {
+    ...queryParams.value
+  }, `masterData_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/system/masterDataDetail/index.vue b/src/views/system/masterDataDetail/index.vue
new file mode 100644
index 0000000..541ab75
--- /dev/null
+++ b/src/views/system/masterDataDetail/index.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
+            <el-form-item label='主键标识' prop='masterDataDetailId'>
+              <el-input v-model='queryParams.masterDataDetailId' placeholder='请输入主键标识' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+            <el-form-item label='主数据ID' prop='masterDataId'>
+              <el-input v-model='queryParams.masterDataId' placeholder='请输入主数据ID' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+<!--            <el-form-item label='父级标识' prop='parentId'>-->
+<!--              <el-input v-model='queryParams.parentId' placeholder='请输入父级标识' clearable @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='祖级列表' prop='ancestors'>-->
+<!--              <el-input v-model='queryParams.ancestors' placeholder='请输入祖级列表' clearable @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='主数据明细编号' prop='dataDetailCode'>-->
+<!--              <el-input v-model='queryParams.dataDetailCode' placeholder='请输入主数据明细编号' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='主数据明细名称' prop='dataDetailName'>-->
+<!--              <el-input v-model='queryParams.dataDetailName' placeholder='请输入主数据明细名称' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段1数据' prop='fieldData1'>-->
+<!--              <el-input v-model='queryParams.fieldData1' placeholder='请输入预留字段1数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段2数据' prop='fieldData2'>-->
+<!--              <el-input v-model='queryParams.fieldData2' placeholder='请输入预留字段2数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段3数据' prop='fieldData3'>-->
+<!--              <el-input v-model='queryParams.fieldData3' placeholder='请输入预留字段3数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段4数据' prop='fieldData4'>-->
+<!--              <el-input v-model='queryParams.fieldData4' placeholder='请输入预留字段4数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='预留字段5数据' prop='fieldData5'>-->
+<!--              <el-input v-model='queryParams.fieldData5' placeholder='请输入预留字段5数据' clearable-->
+<!--                        @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label='显示排序' prop='displaySort'>-->
+<!--              <el-input v-model='queryParams.displaySort' placeholder='请输入显示排序' clearable @keyup.enter='handleQuery' />-->
+<!--            </el-form-item>-->
+            <el-form-item label='激活标识' prop='activeFlag'>
+              <el-select v-model='queryParams.activeFlag' placeholder='请选择激活标识' clearable>
+                <el-option v-for='dict in active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow='never'>
+      <template #header>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['system:masterDataDetail:add']">
+              新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['system:masterDataDetail:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['system:masterDataDetail:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['system:masterDataDetail:export']">导出
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading='loading' :data='masterDataDetailList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='masterDataDetailId' v-if='columns[0].visible' />
+        <el-table-column label='主数据ID' align='center' prop='masterDataId' v-if='columns[1].visible' />
+        <el-table-column label='父级标识' align='center' prop='parentId' v-if='columns[2].visible' />
+        <el-table-column label='祖级列表' align='center' prop='ancestors' v-if='columns[3].visible' />
+        <el-table-column label='主数据明细编号' align='center' prop='dataDetailCode' v-if='columns[4].visible' />
+        <el-table-column label='主数据明细名称' align='center' prop='dataDetailName' v-if='columns[5].visible' />
+        <el-table-column label='预留字段1数据' align='center' prop='fieldData1' v-if='columns[6].visible' />
+        <el-table-column label='预留字段2数据' align='center' prop='fieldData2' v-if='columns[7].visible' />
+        <el-table-column label='预留字段3数据' align='center' prop='fieldData3' v-if='columns[8].visible' />
+        <el-table-column label='预留字段4数据' align='center' prop='fieldData4' v-if='columns[9].visible' />
+        <el-table-column label='预留字段5数据' align='center' prop='fieldData5' v-if='columns[10].visible' />
+        <el-table-column label='显示排序' align='center' prop='displaySort' v-if='columns[11].visible' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[12].visible' />
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[13].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+          <template #default='scope'>
+            <el-tooltip content='修改' placement='top'>
+              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
+                         v-hasPermi="['system:masterDataDetail:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['system:masterDataDetail:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
+                  v-model:limit='queryParams.pageSize' @pagination='getList' />
+    </el-card>
+    <!-- 添加或修改主数据维护明细对话框 -->
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='masterDataDetailFormRef' :model='form' :rules='rules' label-width='80px'>
+        <el-form-item label='主键标识' prop='masterDataDetailId'>
+          <el-input v-model='form.masterDataDetailId' placeholder='请输入主键标识' />
+        </el-form-item>
+        <el-form-item label='主数据ID' prop='masterDataId'>
+          <el-input v-model='form.masterDataId' placeholder='请输入主数据ID' />
+        </el-form-item>
+        <el-form-item label='父级标识' prop='parentId'>
+          <el-input v-model='form.parentId' placeholder='请输入父级标识' />
+        </el-form-item>
+        <el-form-item label='祖级列表' prop='ancestors'>
+          <el-input v-model='form.ancestors' placeholder='请输入祖级列表' />
+        </el-form-item>
+        <el-form-item label='主数据明细编号' prop='dataDetailCode'>
+          <el-input v-model='form.dataDetailCode' placeholder='请输入主数据明细编号' />
+        </el-form-item>
+        <el-form-item label='主数据明细名称' prop='dataDetailName'>
+          <el-input v-model='form.dataDetailName' placeholder='请输入主数据明细名称' />
+        </el-form-item>
+        <el-form-item label='预留字段1数据' prop='fieldData1'>
+          <el-input v-model='form.fieldData1' placeholder='请输入预留字段1数据' />
+        </el-form-item>
+        <el-form-item label='预留字段2数据' prop='fieldData2'>
+          <el-input v-model='form.fieldData2' placeholder='请输入预留字段2数据' />
+        </el-form-item>
+        <el-form-item label='预留字段3数据' prop='fieldData3'>
+          <el-input v-model='form.fieldData3' placeholder='请输入预留字段3数据' />
+        </el-form-item>
+        <el-form-item label='预留字段4数据' prop='fieldData4'>
+          <el-input v-model='form.fieldData4' placeholder='请输入预留字段4数据' />
+        </el-form-item>
+        <el-form-item label='预留字段5数据' prop='fieldData5'>
+          <el-input v-model='form.fieldData5' placeholder='请输入预留字段5数据' />
+        </el-form-item>
+        <el-form-item label='显示排序' prop='displaySort'>
+          <el-input v-model='form.displaySort' placeholder='请输入显示排序' />
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
+        </el-form-item>
+        <el-form-item label='激活标识' prop='activeFlag'>
+          <el-radio-group v-model='form.activeFlag'>
+            <el-radio
+              v-for='dict in active_flag'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name='MasterDataDetail' lang='ts'>
+import {
+  listMasterDataDetail,
+  getMasterDataDetail,
+  delMasterDataDetail,
+  addMasterDataDetail,
+  updateMasterDataDetail
+} from '@/api/system/masterDataDetail';
+import { MasterDataDetailVO, MasterDataDetailQuery, MasterDataDetailForm } from '@/api/system/masterDataDetail/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const masterDataDetailList = ref<MasterDataDetailVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const masterDataDetailFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: true },
+  { key: 1, label: `主数据ID`, visible: true },
+  { key: 2, label: `父级标识`, visible: true },
+  { key: 3, label: `祖级列表`, visible: true },
+  { key: 4, label: `主数据明细编号`, visible: true },
+  { key: 5, label: `主数据明细名称`, visible: true },
+  { key: 6, label: `预留字段1数据`, visible: true },
+  { key: 7, label: `预留字段2数据`, visible: true },
+  { key: 8, label: `预留字段3数据`, visible: true },
+  { key: 9, label: `预留字段4数据`, visible: true },
+  { key: 10, label: `预留字段5数据`, visible: true },
+  { key: 11, label: `显示排序`, visible: true },
+  { key: 12, label: `备注`, visible: true },
+  { key: 13, label: `激活标识`, visible: true },
+  { key: 14, label: `创建部门`, visible: true },
+  { key: 15, label: `创建人`, visible: true },
+  { key: 16, label: `创建时间`, visible: true },
+  { key: 17, label: `更新人`, visible: true },
+  { key: 18, label: `更新时间`, visible: true }
+]);
+
+const initFormData: MasterDataDetailForm = {
+  masterDataDetailId: undefined,
+  masterDataId: undefined,
+  parentId: undefined,
+  ancestors: undefined,
+  dataDetailCode: undefined,
+  dataDetailName: undefined,
+  fieldData1: undefined,
+  fieldData2: undefined,
+  fieldData3: undefined,
+  fieldData4: undefined,
+  fieldData5: undefined,
+  displaySort: undefined,
+  remark: undefined,
+  activeFlag: undefined
+};
+const data = reactive<PageData<MasterDataDetailForm, MasterDataDetailQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    masterDataDetailId: undefined,
+    masterDataId: undefined,
+    parentId: undefined,
+    ancestors: undefined,
+    dataDetailCode: undefined,
+    dataDetailName: undefined,
+    fieldData1: undefined,
+    fieldData2: undefined,
+    fieldData3: undefined,
+    fieldData4: undefined,
+    fieldData5: undefined,
+    displaySort: undefined,
+    activeFlag: undefined,
+    params: {}
+  },
+  rules: {
+    dataDetailCode: [
+      { required: true, message: '主数据明细编号不能为空', trigger: 'blur' }
+    ],
+    dataDetailName: [
+      { required: true, message: '主数据明细名称不能为空', trigger: 'blur' }
+    ],
+    activeFlag: [
+      { required: true, message: '激活标识不能为空', trigger: 'change' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询主数据维护明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMasterDataDetail(queryParams.value);
+  masterDataDetailList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  masterDataDetailFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MasterDataDetailVO[]) => {
+  ids.value = selection.map(item => item.masterDataDetailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加主数据维护明细';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MasterDataDetailVO) => {
+  reset();
+  const _masterDataDetailId = row?.masterDataDetailId || ids.value[0];
+  const res = await getMasterDataDetail(_masterDataDetailId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改主数据维护明细';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  masterDataDetailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.masterDataDetailId) {
+        await updateMasterDataDetail(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMasterDataDetail(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MasterDataDetailVO) => {
+  const _masterDataDetailIds = row?.masterDataDetailId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除主数据维护明细编号为"' + _masterDataDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await delMasterDataDetail(_masterDataDetailIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('system/masterDataDetail/export', {
+    ...queryParams.value
+  }, `masterDataDetail_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/wms/inventoryCheck/index.vue b/src/views/wms/inventoryCheck/index.vue
new file mode 100644
index 0000000..8c61a80
--- /dev/null
+++ b/src/views/wms/inventoryCheck/index.vue
@@ -0,0 +1,478 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="表主键" prop="inventoryCheckId">
+              <el-input v-model="queryParams.inventoryCheckId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="盘点单号" prop="checkCode">
+              <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="物料大类" prop="materialCategories">
+              <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-form-item label="计划仓库ID" prop="planWarehouseId">
+              <el-input v-model="queryParams.planWarehouseId" placeholder="请输入计划仓库ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="盘点类型" prop="checkType">
+              <el-select v-model="queryParams.checkType" placeholder="请选择盘点类型" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="盘点状态" prop="checkStatus">
+              <el-select v-model="queryParams.checkStatus" placeholder="请选择盘点状态" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="审核人" prop="auditBy">
+              <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="审核时间" prop="auditTime">
+              <el-date-picker clearable
+                v-model="queryParams.auditTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择审核时间"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
+              <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="审核意见" prop="auditComments">
+              <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="开始时间" prop="beginTime">
+              <el-date-picker clearable
+                v-model="queryParams.beginTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择开始时间"
+              />
+            </el-form-item>
+            <el-form-item label="结束时间" prop="endTime">
+              <el-date-picker clearable
+                v-model="queryParams.endTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择结束时间"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:inventoryCheck:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:inventoryCheck:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventoryCheck:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:inventoryCheck:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="inventoryCheckList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="表主键" align="center" prop="inventoryCheckId" v-if="columns[0].visible"/>
+        <el-table-column label="盘点单号" align="center" prop="checkCode" v-if="columns[2].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible">
+          <template #default="scope">
+            <dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划仓库" align="center" prop="warehouseCode" v-if="columns[4].visible"/>
+        <el-table-column label="盘点类型" align="center" prop="checkType" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_stocking_type" :value="scope.row.checkType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="盘点状态" align="center" prop="checkStatus" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_stocking_status" :value="scope.row.checkStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[9].visible"/>
+        <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[10].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" align="center" prop="auditStatus" v-if="columns[11].visible">
+          <template #default="scope">
+            <dict-tag :options="approve_status" :value="scope.row.auditStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[12].visible"/>
+        <el-table-column label="开始时间" align="center" prop="beginTime" width="180" v-if="columns[13].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center" prop="endTime" width="180" v-if="columns[14].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:inventoryCheck:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:inventoryCheck:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改库存盘点对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+       <el-form ref="inventoryCheckFormRef" :model="form" :rules="rules" label-width="80px">
+        <!--<el-form-item label="表主键" prop="inventoryCheckId">
+          <el-input v-model="form.inventoryCheckId" placeholder="请输入表主键" />
+        </el-form-item>
+        <el-form-item label="盘点单号" prop="checkCode">
+          <el-input v-model="form.checkCode" placeholder="请输入盘点单号" />
+        </el-form-item> -->
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+                v-for="dict in material_mategories"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计划仓库ID" prop="planWarehouseId">
+          <el-select v-model="form.planWarehouseId" placeholder="请选择所属仓库">
+            <el-option
+              v-for="item in baseStoreList"
+              :key="item.warehouseId"
+              :label="item.warehouseName"
+              :value="item.warehouseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="盘点类型" prop="checkType">
+          <el-select v-model="form.checkType" placeholder="请选择盘点类型">
+            <el-option
+                v-for="dict in wms_stocking_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="盘点状态" prop="checkStatus">
+          <el-radio-group v-model="form.checkStatus">
+            <el-radio
+              v-for="dict in wms_stocking_status"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="审核人" prop="auditBy">
+          <el-select v-model="form.auditBy" placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.userName"
+              :value="item.userName"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="审核时间" prop="auditTime">
+          <el-date-picker clearable
+            v-model="form.auditTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
+          <el-radio-group v-model="form.auditStatus">
+            <el-radio
+              v-for="dict in approve_status"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="auditComments">
+          <el-input v-model="form.auditComments" placeholder="请输入审核意见" />
+        </el-form-item> -->
+        <el-form-item label="开始时间" prop="beginTime">
+          <el-date-picker clearable
+            v-model="form.beginTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable
+            v-model="form.endTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择结束时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="InventoryCheck" lang="ts">
+import { listInventoryCheck, getInventoryCheck, delInventoryCheck, addInventoryCheck, updateInventoryCheck } from '@/api/wms/inventoryCheck';
+import { InventoryCheckVO, InventoryCheckQuery, InventoryCheckForm } from '@/api/wms/inventoryCheck/types';
+import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
+import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
+import api from '@/api/system/user';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { material_mategories, wms_stocking_type, approve_status, wms_stocking_status } = toRefs<any>(proxy?.useDict('material_mategories','wms_stocking_type','approve_status','wms_stocking_status'));
+const inventoryCheckList = ref<InventoryCheckVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const inventoryCheckFormRef = ref<ElFormInstance>();
+const userList = ref<UserVO[]>();
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `表主键`, visible: true },
+        { key: 1, label: `租户号`, visible: true },
+        { key: 2, label: `盘点单号`, visible: true },
+        { key: 3, label: `物料大类`, visible: true },
+        { key: 4, label: `计划仓库ID`, visible: true },
+        { key: 5, label: `盘点类型`, visible: true },
+        { key: 6, label: `盘点状态`, visible: true },
+        { key: 7, label: `创建人`, visible: true },
+        { key: 8, label: `创建时间`, visible: true },
+        { key: 9, label: `审核人`, visible: true },
+        { key: 10, label: `审核时间`, visible: true },
+        { key: 11, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
+        { key: 12, label: `审核意见`, visible: true },
+        { key: 13, label: `开始时间`, visible: true },
+        { key: 14, label: `结束时间`, visible: true },
+]);
+
+const initFormData: InventoryCheckForm = {
+  inventoryCheckId: undefined,
+  checkCode: undefined,
+  materialCategories: undefined,
+  planWarehouseId: undefined,
+  checkType: undefined,
+  checkStatus: undefined,
+  auditBy: undefined,
+  auditTime: undefined,
+  auditStatus: undefined,
+  auditComments: undefined,
+  beginTime: undefined,
+  endTime: undefined
+}
+const data = reactive<PageData<InventoryCheckForm, InventoryCheckQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    inventoryCheckId: undefined,
+    checkCode: undefined,
+    materialCategories: undefined,
+    planWarehouseId: undefined,
+    checkType: undefined,
+    checkStatus: undefined,
+    auditBy: undefined,
+    auditTime: undefined,
+    auditStatus: undefined,
+    auditComments: undefined,
+    beginTime: undefined,
+    endTime: undefined,
+    params: {
+    }
+  },
+  rules: {
+    inventoryCheckId: [
+      { required: true, message: "表主键不能为空", trigger: "blur" }
+    ],
+    checkCode: [
+      { required: true, message: "盘点单号不能为空", trigger: "blur" }
+    ],
+    materialCategories: [
+      { required: true, message: "物料大类不能为空", trigger: "blur" }
+    ],
+    planWarehouseId: [
+      { required: true, message: "计划仓库ID不能为空", trigger: "blur" }
+    ],
+    checkType: [
+      { required: true, message: "盘点类型不能为空", trigger: "change" }
+    ],
+    checkStatus: [
+      { required: true, message: "盘点状态不能为空", trigger: "change" }
+    ],
+    auditBy: [
+      { required: true, message: "审核人不能为空", trigger: "blur" }
+    ],
+    auditTime: [
+      { required: true, message: "审核时间不能为空", trigger: "blur" }
+    ],
+    auditStatus: [
+      { required: true, message: "审核状态(0待审核,1审核通过,2审核未通过)不能为空", trigger: "change" }
+    ],
+    auditComments: [
+      { required: true, message: "审核意见不能为空", trigger: "blur" }
+    ],
+    beginTime: [
+      { required: true, message: "开始时间不能为空", trigger: "blur" }
+    ],
+    endTime: [
+      { required: true, message: "结束时间不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+let baseStoreList = ref([]);
+/** 查询车间下拉树结构 */
+const getBaseWarehouseListsss = async () => {
+  let res = await getBaseWarehouseList(null);
+  baseStoreList.value = res.data;
+};
+/** 查询用户列表 */
+const getUserList = async () => {
+  const res = await api.listUser(null);
+  userList.value = res.rows;
+};
+/** 查询库存盘点列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listInventoryCheck(queryParams.value);
+  inventoryCheckList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  inventoryCheckFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: InventoryCheckVO[]) => {
+  ids.value = selection.map(item => item.inventoryCheckId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加库存盘点";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: InventoryCheckVO) => {
+  reset();
+  const _inventoryCheckId = row?.inventoryCheckId || ids.value[0]
+  const res = await getInventoryCheck(_inventoryCheckId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改库存盘点";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  inventoryCheckFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.inventoryCheckId) {
+        await updateInventoryCheck(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addInventoryCheck(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: InventoryCheckVO) => {
+  const _inventoryCheckIds = row?.inventoryCheckId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除库存盘点编号为"' + _inventoryCheckIds + '"的数据项？').finally(() => loading.value = false);
+  await delInventoryCheck(_inventoryCheckIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/inventoryCheck/export', {
+    ...queryParams.value
+  }, `inventoryCheck_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getUserList();
+  getBaseWarehouseListsss();
+  getList();
+});
+</script>
diff --git a/src/views/wms/inventoryCheckRecord/index.vue b/src/views/wms/inventoryCheckRecord/index.vue
new file mode 100644
index 0000000..2336e7e
--- /dev/null
+++ b/src/views/wms/inventoryCheckRecord/index.vue
@@ -0,0 +1,557 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="盘点记录主键" prop="icRecordId">
+              <el-input v-model="queryParams.icRecordId" placeholder="请输入盘点记录主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料大类" prop="materialCategories">
+              <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="盘点单号" prop="checkCode">
+              <el-input v-model="queryParams.checkCode" placeholder="请输入盘点单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="批次码" prop="batchCode">
+              <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料id" prop="materialId">
+              <el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="库位编码" prop="locationCode">
+              <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料编码" prop="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="库存数量" prop="inventoryQty">
+              <el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="盘点数量" prop="checkQty">
+              <el-input v-model="queryParams.checkQty" placeholder="请输入盘点数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="盘点状态(0异常，1正常)" prop="checkStatus">
+              <el-select v-model="queryParams.checkStatus" placeholder="请选择盘点状态(0异常，1正常)" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="erp同步状态" prop="erpSynchronousStatus">
+              <el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+              <el-input v-model="queryParams.erpSynchronousQty" placeholder="请输入erp同步数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="是否发起调整" prop="isAdjust">
+              <el-input v-model="queryParams.isAdjust" placeholder="请输入是否发起调整" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="审核人" prop="auditBy">
+              <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="审核时间" prop="auditTime">
+              <el-date-picker clearable
+                v-model="queryParams.auditTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择审核时间"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
+              <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审核意见" prop="auditComments">
+              <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="调整状态" prop="adjustStatus">
+              <el-select v-model="queryParams.adjustStatus" placeholder="请选择调整状态" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="调整类型" prop="adjustType">
+              <el-select v-model="queryParams.adjustType" placeholder="请选择调整类型" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:inventoryCheckRecord:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:inventoryCheckRecord:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventoryCheckRecord:remove']">删除</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:inventoryCheckRecord:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="inventoryCheckRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="盘点记录主键" align="center" prop="icRecordId" v-if="columns[0].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[1].visible">
+          <template #default="scope">
+            <dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="盘点单号" align="center" prop="checkCode" v-if="columns[2].visible"/>
+        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[3].visible"/>
+        <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[5].visible"/>
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[6].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
+        <el-table-column label="库存数量" align="center" prop="inventoryQty" v-if="columns[8].visible"/>
+        <el-table-column label="盘点数量" align="center" prop="checkQty" v-if="columns[9].visible"/>
+        <el-table-column label="盘点状态" align="center" prop="checkStatus" v-if="columns[12].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_stockadjust_status" :value="scope.row.checkStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[13].visible">
+          <template #default="scope">
+            <dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[14].visible"/>
+        <el-table-column label="是否发起调整" align="center" prop="isAdjust" v-if="columns[15].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_stock_if" :value="scope.row.isAdjust"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[16].visible"/>
+        <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[17].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" align="center" prop="auditStatus" v-if="columns[18].visible">
+          <template #default="scope">
+            <dict-tag :options="approve_status" :value="scope.row.auditStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[19].visible"/>
+        <el-table-column label="调整状态" align="center" prop="adjustStatus" v-if="columns[20].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_stockadjust_status" :value="scope.row.adjustStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="调整类型" align="center" prop="adjustType" v-if="columns[21].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_stockadjust_type" :value="scope.row.adjustType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:inventoryCheckRecord:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:inventoryCheckRecord:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改盘点记录和调整工单对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="inventoryCheckRecordFormRef" :model="form" :rules="rules" label-width="80px">
+        <!-- <el-form-item label="盘点记录主键" prop="icRecordId">
+          <el-input v-model="form.icRecordId" placeholder="请输入盘点记录主键" />
+        </el-form-item> -->
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+                v-for="dict in material_mategories"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="盘点单号" prop="checkCode">
+          <el-input v-model="form.checkCode" placeholder="请输入盘点单号" />
+        </el-form-item> -->
+        <el-form-item label="批次码" prop="batchCode">
+          <el-input v-model="form.batchCode" placeholder="请输入批次码" />
+        </el-form-item>
+        <el-form-item label="物料id" prop="materialId">
+          <el-input v-model="form.materialId" placeholder="请输入物料id" />
+        </el-form-item>
+        <el-form-item label="库位编码" prop="locationCode">
+          <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
+        </el-form-item>
+        <!-- <el-form-item label="物料编码" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="库存数量" prop="inventoryQty">
+          <el-input v-model="form.inventoryQty" placeholder="请输入库存数量" />
+        </el-form-item> -->
+        <el-form-item label="盘点数量" prop="checkQty">
+          <el-input v-model="form.checkQty" placeholder="请输入盘点数量" />
+        </el-form-item>
+        <!-- <el-form-item label="盘点结果" prop="checkStatus">
+          <el-radio-group v-model="form.checkStatus">
+            <el-radio
+              v-for="dict in wms_stock_result"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <!-- <el-form-item label="erp同步状态" prop="erpSynchronousStatus">
+          <el-radio-group v-model="form.erpSynchronousStatus">
+            <el-radio
+              v-for="dict in erp_synchronous_status"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+          <el-input v-model="form.erpSynchronousQty" placeholder="请输入erp同步数量" />
+        </el-form-item>
+        <el-form-item label="是否发起调整" prop="isAdjust">
+          <el-radio-group v-model="form.isAdjust">
+            <el-radio
+              v-for="dict in wms_stock_if"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核人" prop="auditBy">
+          <el-input v-model="form.auditBy" placeholder="请输入审核人" />
+        </el-form-item>
+        <!-- <el-form-item label="审核时间" prop="auditTime">
+          <el-date-picker clearable
+            v-model="form.auditTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择审核时间">
+          </el-date-picker>
+        </el-form-item> -->
+        <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
+          <el-radio-group v-model="form.auditStatus">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <!-- <el-form-item label="审核意见" prop="auditComments">
+          <el-input v-model="form.auditComments" placeholder="请输入审核意见" />
+        </el-form-item> -->
+        <!-- <el-form-item label="调整状态" prop="adjustStatus">
+          <el-radio-group v-model="form.adjustStatus">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="调整类型" prop="adjustType">
+          <el-radio-group v-model="form.adjustType">
+            <el-radio
+              v-for="dict in wms_stockadjust_type"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="InventoryCheckRecord" lang="ts">
+import { listInventoryCheckRecord, getInventoryCheckRecord, delInventoryCheckRecord, addInventoryCheckRecord, updateInventoryCheckRecord } from '@/api/wms/inventoryCheckRecord';
+import { InventoryCheckRecordVO, InventoryCheckRecordQuery, InventoryCheckRecordForm } from '@/api/wms/inventoryCheckRecord/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { material_mategories, wms_stocking_type, wms_stockadjust_type, approve_status, erp_synchronous_status, wms_stockadjust_status, wms_stock_if } = toRefs<any>(proxy?.useDict('material_mategories','wms_stocking_type','wms_stockadjust_type','approve_status','erp_synchronous_status','wms_stockadjust_status','wms_stock_if'));
+const inventoryCheckRecordList = ref<InventoryCheckRecordVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const inventoryCheckRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `盘点记录主键`, visible: true },
+        { key: 1, label: `物料大类`, visible: true },
+        { key: 2, label: `盘点单号`, visible: true },
+        { key: 3, label: `批次码`, visible: true },
+        { key: 4, label: `物料id`, visible: true },
+        { key: 5, label: `库位编码`, visible: true },
+        { key: 6, label: `物料编码`, visible: true },
+        { key: 7, label: `物料名称`, visible: true },
+        { key: 8, label: `库存数量`, visible: true },
+        { key: 9, label: `盘点数量`, visible: true },
+        { key: 10, label: `盘点人`, visible: true },
+        { key: 11, label: `创建时间`, visible: true },
+        { key: 12, label: `盘点状态(0异常，1正常)`, visible: true },
+        { key: 13, label: `erp同步状态`, visible: true },
+        { key: 14, label: `erp同步数量`, visible: true },
+        { key: 15, label: `是否发起调整`, visible: true },
+        { key: 16, label: `审核人`, visible: true },
+        { key: 17, label: `审核时间`, visible: true },
+        { key: 18, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
+        { key: 19, label: `审核意见`, visible: true },
+        { key: 20, label: `调整状态`, visible: true },
+        { key: 21, label: `调整类型`, visible: true },
+]);
+
+const initFormData: InventoryCheckRecordForm = {
+  icRecordId: undefined,
+  materialCategories: undefined,
+  checkCode: undefined,
+  batchCode: undefined,
+  materialId: undefined,
+  locationCode: undefined,
+  materialCode: undefined,
+  materialName: undefined,
+  inventoryQty: undefined,
+  checkQty: undefined,
+  checkStatus: undefined,
+  erpSynchronousStatus: undefined,
+  erpSynchronousQty: undefined,
+  isAdjust: undefined,
+  auditBy: undefined,
+  auditTime: undefined,
+  auditStatus: undefined,
+  auditComments: undefined,
+  adjustStatus: undefined,
+  adjustType: undefined
+}
+const data = reactive<PageData<InventoryCheckRecordForm, InventoryCheckRecordQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    icRecordId: undefined,
+    materialCategories: undefined,
+    checkCode: undefined,
+    batchCode: undefined,
+    materialId: undefined,
+    locationCode: undefined,
+    materialCode: undefined,
+    materialName: undefined,
+    inventoryQty: undefined,
+    checkQty: undefined,
+    checkStatus: undefined,
+    erpSynchronousStatus: undefined,
+    erpSynchronousQty: undefined,
+    isAdjust: undefined,
+    auditBy: undefined,
+    auditTime: undefined,
+    auditStatus: undefined,
+    auditComments: undefined,
+    adjustStatus: undefined,
+    adjustType: undefined,
+    params: {
+    }
+  },
+  rules: {
+    icRecordId: [
+      { required: true, message: "盘点记录主键不能为空", trigger: "blur" }
+    ],
+    materialCategories: [
+      { required: true, message: "物料大类不能为空", trigger: "blur" }
+    ],
+    checkCode: [
+      { required: true, message: "盘点单号不能为空", trigger: "blur" }
+    ],
+    batchCode: [
+      { required: true, message: "批次码不能为空", trigger: "blur" }
+    ],
+    materialId: [
+      { required: true, message: "物料id不能为空", trigger: "blur" }
+    ],
+    locationCode: [
+      { required: true, message: "库位编码不能为空", trigger: "blur" }
+    ],
+    materialCode: [
+      { required: true, message: "物料编码不能为空", trigger: "blur" }
+    ],
+    materialName: [
+      { required: true, message: "物料名称不能为空", trigger: "blur" }
+    ],
+    inventoryQty: [
+      { required: true, message: "库存数量不能为空", trigger: "blur" }
+    ],
+    checkQty: [
+      { required: true, message: "盘点数量不能为空", trigger: "blur" }
+    ],
+    checkStatus: [
+      { required: true, message: "盘点状态(0异常，1正常)不能为空", trigger: "change" }
+    ],
+    erpSynchronousStatus: [
+      { required: true, message: "erp同步状态不能为空", trigger: "change" }
+    ],
+    erpSynchronousQty: [
+      { required: true, message: "erp同步数量不能为空", trigger: "blur" }
+    ],
+    isAdjust: [
+      { required: true, message: "是否发起调整不能为空", trigger: "blur" }
+    ],
+    auditBy: [
+      { required: true, message: "审核人不能为空", trigger: "blur" }
+    ],
+    auditTime: [
+      { required: true, message: "审核时间不能为空", trigger: "blur" }
+    ],
+    auditStatus: [
+      { required: true, message: "审核状态(0待审核,1审核通过,2审核未通过)不能为空", trigger: "change" }
+    ],
+    auditComments: [
+      { required: true, message: "审核意见不能为空", trigger: "blur" }
+    ],
+    adjustStatus: [
+      { required: true, message: "调整状态不能为空", trigger: "change" }
+    ],
+    adjustType: [
+      { required: true, message: "调整类型不能为空", trigger: "change" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询盘点记录和调整工单列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listInventoryCheckRecord(queryParams.value);
+  inventoryCheckRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  inventoryCheckRecordFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: InventoryCheckRecordVO[]) => {
+  ids.value = selection.map(item => item.icRecordId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加盘点记录和调整工单";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: InventoryCheckRecordVO) => {
+  reset();
+  const _icRecordId = row?.icRecordId || ids.value[0]
+  const res = await getInventoryCheckRecord(_icRecordId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改盘点记录和调整工单";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  inventoryCheckRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.icRecordId) {
+        await updateInventoryCheckRecord(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addInventoryCheckRecord(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: InventoryCheckRecordVO) => {
+  const _icRecordIds = row?.icRecordId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除盘点记录和调整工单编号为"' + _icRecordIds + '"的数据项？').finally(() => loading.value = false);
+  await delInventoryCheckRecord(_icRecordIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/inventoryCheckRecord/export', {
+    ...queryParams.value
+  }, `inventoryCheckRecord_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/wms/moveOrder/index.vue b/src/views/wms/moveOrder/index.vue
new file mode 100644
index 0000000..74c28d4
--- /dev/null
+++ b/src/views/wms/moveOrder/index.vue
@@ -0,0 +1,502 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="表主键" prop="moveId">
+              <el-input v-model="queryParams.moveId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料ID" prop="materialId">
+              <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料大类" prop="materialCategories">
+              <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库ID" prop="warehouseId">
+              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="计划库位" prop="planLocationCode">
+              <el-input v-model="queryParams.planLocationCode" placeholder="请输入计划库位" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="工单状态(0执行中，1完成，2关闭)" prop="orderStatus">
+              <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态(0执行中，1完成，2关闭)" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="目标库位" prop="targetLocationCode">
+              <el-input v-model="queryParams.targetLocationCode" placeholder="请输入目标库位" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="审核人" prop="auditBy">
+              <el-input v-model="queryParams.auditBy" placeholder="请输入审核人" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="审核时间" prop="auditTime">
+              <el-date-picker clearable
+                v-model="queryParams.auditTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择审核时间"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="审核状态(0待审核,1审核通过,2审核未通过)" prop="auditStatus">
+              <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态(0待审核,1审核通过,2审核未通过)" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select> -->
+            <!-- </el-form-item> -->
+            <el-form-item label="审核意见" prop="auditComments">
+              <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="erp同步状态" prop="erpSynchronousStatus">
+              <el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+              <el-input v-model="queryParams.erpSynchronousQty" placeholder="请输入erp同步数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:moveOrder:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:moveOrder:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:moveOrder:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:moveOrder:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="moveOrderList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="表主键" align="center" prop="moveId" v-if="columns[0].visible"/>
+        <el-table-column label="物料" align="center" prop="materialCode" v-if="columns[2].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible">
+          <template #default="scope">
+            <dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[4].visible"/>
+        <el-table-column label="计划库位" align="center" prop="planLocationCode" v-if="columns[5].visible"/>
+        <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_order_status" :value="scope.row.orderStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="目标库位" align="center" prop="targetLocationCode" v-if="columns[7].visible"/>
+        <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[8].visible"/>
+        <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[9].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" align="center" prop="auditStatus" v-if="columns[10].visible">
+          <template #default="scope">
+            <dict-tag :options="approve_status" :value="scope.row.auditStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[11].visible"/>
+        <el-table-column label="同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[16].visible">
+          <template #default="scope">
+            <dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="同步数量" align="center" prop="erpSynchronousQty" v-if="columns[17].visible"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:moveOrder:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:moveOrder:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改移库工单对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="moveOrderFormRef" :model="form" :rules="rules" label-width="120px">
+        <!-- <el-form-item label="表主键" prop="moveId">
+          <el-input v-model="form.moveId" placeholder="请输入表主键" />
+        </el-form-item> -->
+        
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+                v-for="dict in material_mategories"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库" prop="warehouseId">
+          <el-select v-model="form.warehouseId" placeholder="请选择所属仓库" @change="getLocationList">
+            <el-option
+              v-for="item in baseStoreList"
+              :key="item.warehouseId"
+              :label="item.warehouseName"
+              :value="item.warehouseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计划库位" prop="planLocationCode">
+          <el-select v-model="form.planLocationCode" placeholder="请选择计划库位" @change="getMaterialList">
+            <el-option
+              v-for="item in locationList"
+              :key="item.locationId"
+              :label="item.locationCode"
+              :value="item.locationCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料" prop="materialId">
+          <el-select v-model="form.materialId" placeholder="请选择物料">
+            <el-option
+              v-for="item in materialList"
+              :key="item.materialId"
+              :label="item.materialCode"
+              :value="item.materialId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="工单状态" prop="orderStatus">
+          <el-radio-group v-model="form.orderStatus">
+            <el-radio
+              v-for="dict in wms_order_status"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="目标库位" prop="targetLocationCode">
+          <el-select v-model="form.targetLocationCode" placeholder="请选择目标库位">
+            <el-option
+              v-for="item in locationList"
+              :key="item.locationId"
+              :label="item.locationCode"
+              :value="item.locationCode"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核人" prop="auditBy">
+          <el-select v-model="form.auditBy" placeholder="请选择审核人">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.userName"
+              :value="item.userName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="审核时间" prop="auditTime">
+          <el-date-picker clearable
+            v-model="form.auditTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="auditStatus">
+          <el-radio-group v-model="form.auditStatus">
+            <el-radio
+              v-for="dict in approve_status"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="auditComments">
+          <el-input v-model="form.auditComments" placeholder="请输入审核意见" />
+        </el-form-item>
+        <el-form-item label="erp同步状态" prop="erpSynchronousStatus">
+          <el-radio-group v-model="form.erpSynchronousStatus">
+            <el-radio
+              v-for="dict in erp_synchronous_status"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+          <el-input v-model="form.erpSynchronousQty" placeholder="请输入erp同步数量" />
+        </el-form-item> -->
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MoveOrder" lang="ts">
+import { listMoveOrder, getMoveOrder, delMoveOrder, addMoveOrder, updateMoveOrder } from '@/api/wms/moveOrder';
+import { MoveOrderVO, MoveOrderQuery, MoveOrderForm } from '@/api/wms/moveOrder/types';
+import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
+import {getMaterialInfoList} from "@/api/wms/inventory";
+import {getBaseLocationList, getWmsBaseLocationVoList} from "@/api/wms/baseLocation";
+import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
+import api from '@/api/system/user';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { material_mategories, erp_synchronous_status, approve_status, wms_order_status } = toRefs<any>(proxy?.useDict('material_mategories','erp_synchronous_status','approve_status','wms_order_status'));
+const moveOrderList = ref<MoveOrderVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const userList = ref<UserVO[]>();
+const queryFormRef = ref<ElFormInstance>();
+const moveOrderFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `表主键`, visible: true },
+        { key: 1, label: `租户号`, visible: true },
+        { key: 2, label: `物料ID`, visible: true },
+        { key: 3, label: `物料大类`, visible: true },
+        { key: 4, label: `仓库ID`, visible: true },
+        { key: 5, label: `计划库位`, visible: true },
+        { key: 6, label: `工单状态(0执行中，1完成，2关闭)`, visible: true },
+        { key: 7, label: `目标库位`, visible: true },
+        { key: 8, label: `审核人`, visible: true },
+        { key: 9, label: `审核时间`, visible: true },
+        { key: 10, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
+        { key: 11, label: `审核意见`, visible: true },
+        { key: 12, label: `工单创建人`, visible: true },
+        { key: 13, label: `工单创建时间`, visible: true },
+        { key: 14, label: `实际接收人`, visible: true },
+        { key: 15, label: `实际接收时间`, visible: true },
+        { key: 16, label: `erp同步状态`, visible: true },
+        { key: 17, label: `erp同步数量`, visible: true },
+]);
+
+const initFormData: MoveOrderForm = {
+  moveId: undefined,
+  materialId: undefined,
+  materialCategories: undefined,
+  warehouseId: undefined,
+  planLocationCode: undefined,
+  orderStatus: undefined,
+  targetLocationCode: undefined,
+  auditBy: undefined,
+  auditTime: undefined,
+  auditStatus: undefined,
+  auditComments: undefined,
+  erpSynchronousStatus: undefined,
+  erpSynchronousQty: undefined
+}
+const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    moveId: undefined,
+    materialId: undefined,
+    materialCategories: undefined,
+    warehouseId: undefined,
+    planLocationCode: undefined,
+    orderStatus: undefined,
+    targetLocationCode: undefined,
+    auditBy: undefined,
+    auditTime: undefined,
+    auditStatus: undefined,
+    auditComments: undefined,
+    erpSynchronousStatus: undefined,
+    erpSynchronousQty: undefined,
+    params: {
+    }
+  },
+  rules: {
+    moveId: [
+      { required: true, message: "表主键不能为空", trigger: "blur" }
+    ],
+    materialId: [
+      { required: true, message: "物料ID不能为空", trigger: "blur" }
+    ],
+    materialCategories: [
+      { required: true, message: "物料大类不能为空", trigger: "blur" }
+    ],
+    warehouseId: [
+      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+    ],
+    planLocationCode: [
+      { required: true, message: "计划库位不能为空", trigger: "blur" }
+    ],
+    orderStatus: [
+      { required: true, message: "工单状态(0执行中，1完成，2关闭)不能为空", trigger: "change" }
+    ],
+    targetLocationCode: [
+      { required: true, message: "目标库位不能为空", trigger: "blur" }
+    ],
+    auditBy: [
+      { required: true, message: "审核人不能为空", trigger: "blur" }
+    ],
+    auditTime: [
+      { required: true, message: "审核时间不能为空", trigger: "blur" }
+    ],
+    auditStatus: [
+      { required: true, message: "审核状态(0待审核,1审核通过,2审核未通过)不能为空", trigger: "change" }
+    ],
+    auditComments: [
+      { required: true, message: "审核意见不能为空", trigger: "blur" }
+    ],
+    erpSynchronousStatus: [
+      { required: true, message: "erp同步状态不能为空", trigger: "change" }
+    ],
+    erpSynchronousQty: [
+      { required: true, message: "erp同步数量不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+let baseStoreList = ref([]);
+let locationList = ref([]);
+let materialList = ref([]);
+/** 查询车间下拉树结构 */
+const getBaseWarehouseListsss = async () => {
+  let res = await getBaseWarehouseList(null);
+  baseStoreList.value = res.data;
+};
+const getLocationList = async () => {
+  const warehouseId = form.value.warehouseId;
+  let res = await getWmsBaseLocationVoList({'warehouseId':warehouseId});
+  locationList.value = res.data;
+};
+/** 查询用户列表 */
+const getUserList = async () => {
+  const res = await api.listUser(null);
+  userList.value = res.rows;
+};
+const getMaterialList = async () => {
+  const locationCode = form.value.planLocationCode;
+  console.log(locationCode)
+  let res = await getMaterialInfoList({'locationCode':locationCode});
+  materialList.value = res.data;
+  console.log(materialList.value)
+};
+/** 查询移库工单列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMoveOrder(queryParams.value);
+  moveOrderList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  moveOrderFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MoveOrderVO[]) => {
+  ids.value = selection.map(item => item.moveId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加移库工单";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MoveOrderVO) => {
+  reset();
+  const _moveId = row?.moveId || ids.value[0]
+  const res = await getMoveOrder(_moveId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改移库工单";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  moveOrderFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.moveId) {
+        await updateMoveOrder(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addMoveOrder(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MoveOrderVO) => {
+  const _moveIds = row?.moveId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除移库工单编号为"' + _moveIds + '"的数据项？').finally(() => loading.value = false);
+  await delMoveOrder(_moveIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/moveOrder/export', {
+    ...queryParams.value
+  }, `moveOrder_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getUserList();
+  getBaseWarehouseListsss();
+  getList();
+});
+</script>
diff --git a/src/views/wms/returnOrder/index.vue b/src/views/wms/returnOrder/index.vue
index b57aad2..b42c36c 100644
--- a/src/views/wms/returnOrder/index.vue
+++ b/src/views/wms/returnOrder/index.vue
@@ -149,7 +149,14 @@
           <el-input v-model="form.materialId" placeholder="请输入物料ID" />
         </el-form-item>
         <el-form-item label="物料大类" prop="materialCategories">
-          <el-input v-model="form.materialCategories" placeholder="请输入物料大类" />
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+                v-for="dict in material_mategories"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="批次条码" prop="batchCode">
           <el-input v-model="form.batchCode" placeholder="请输入批次条码" />