feat(wms): WMS新增物料大类相关接口和页面

- 新增 WMS 物料大类相关接口，包括列表、详情、新增、修改、删除等
- 更新多个页面，使用新的 WMS 物料大类接口(InWMS)替代 MES 物料大类接口
- 优化物料大类下拉框的数据获取逻辑

src/api/wms/baseMaterialCategory/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseMaterialCategoryVO, BaseMaterialCategoryForm, BaseMaterialCategoryQuery } from '@/api/wms/baseMaterialCategory/types';
+
+/**
+ * 查询物料大类信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseMaterialCategoryInWMS = (query?: BaseMaterialCategoryQuery): AxiosPromise<BaseMaterialCategoryVO[]> => {
+  return request({
+    url: '/wms/baseMaterialCategory/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物料大类信息详细
+ * @param materialCategoryId
+ */
+export const getBaseMaterialCategoryInWMS = (materialCategoryId: string | number): AxiosPromise<BaseMaterialCategoryVO> => {
+  return request({
+    url: '/wms/baseMaterialCategory/' + materialCategoryId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物料大类信息
+ * @param data
+ */
+export const addBaseMaterialCategoryInWMS = (data: BaseMaterialCategoryForm) => {
+  return request({
+    url: '/wms/baseMaterialCategory',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物料大类信息
+ * @param data
+ */
+export const updateBaseMaterialCategoryInWMS = (data: BaseMaterialCategoryForm) => {
+  return request({
+    url: '/wms/baseMaterialCategory',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物料大类信息
+ * @param materialCategoryId
+ */
+export const delBaseMaterialCategoryInWMS = (materialCategoryId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/baseMaterialCategory/' + materialCategoryId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询物料大类信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseMaterialCategoryListInWMS (query) {
+    return request({
+        url: '/wms/baseMaterialCategory/getBaseMaterialCategoryList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/baseMaterialCategory/types.ts

@@ -0,0 +1,86 @@
+export interface BaseMaterialCategoryVO {
+  /**
+   * 大类ID
+   */
+  materialCategoryId: string | number;
+
+  /**
+   * 大类编号
+   */
+  materialCategoryCode: string;
+
+  /**
+   * 大类名称
+   */
+  materialCategoryName: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface BaseMaterialCategoryForm extends BaseEntity {
+  /**
+   * 大类ID
+   */
+  materialCategoryId?: string | number;
+
+  /**
+   * 大类编号
+   */
+  materialCategoryCode?: string;
+
+  /**
+   * 大类名称
+   */
+  materialCategoryName?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseMaterialCategoryQuery extends PageQuery {
+
+  /**
+   * 大类ID
+   */
+  materialCategoryId?: string | number;
+
+  /**
+   * 大类编号
+   */
+  materialCategoryCode?: string;
+
+  /**
+   * 大类名称
+   */
+  materialCategoryName?: string;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/wms/baseMaterialInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseMaterialInfoVO, BaseMaterialInfoForm, BaseMaterialInfoQuery } from '@/api/wms/baseMaterialInfo/types';
+
+/**
+ * 查询物料信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseMaterialInfoInWMS = (query?: BaseMaterialInfoQuery): AxiosPromise<BaseMaterialInfoVO[]> => {
+  return request({
+    url: '/wms/baseMaterialInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物料信息详细
+ * @param materialId
+ */
+export const getBaseMaterialInfoInWMS = (materialId: string | number): AxiosPromise<BaseMaterialInfoVO> => {
+  return request({
+    url: '/wms/baseMaterialInfo/' + materialId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物料信息
+ * @param data
+ */
+export const addBaseMaterialInfoInWMS = (data: BaseMaterialInfoForm) => {
+  return request({
+    url: '/wms/baseMaterialInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物料信息
+ * @param data
+ */
+export const updateBaseMaterialInfoInWMS = (data: BaseMaterialInfoForm) => {
+  return request({
+    url: '/wms/baseMaterialInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物料信息
+ * @param materialId
+ */
+export const delBaseMaterialInfoInWMS = (materialId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/baseMaterialInfo/' + materialId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询物料信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseMaterialInfoListInWMS (query) {
+    return request({
+        url: '/wms/baseMaterialInfo/getBaseMaterialInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/baseMaterialInfo/types.ts

@@ -0,0 +1,805 @@
+export interface BaseMaterialInfoVO {
+  /**
+   * 主键标识
+   */
+  materialId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * ERP信息
+   */
+  erpId: string | number;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 旧物料编码
+   */
+  oldMaterialCode: string;
+
+  /**
+   * 物料名称
+   */
+  materialName: string;
+
+  /**
+   * 物料类型ID
+   */
+  materialTypeId: string | number;
+
+  /**
+   * 物料大类(字典改为从数据库中获得)
+   */
+  materialCategoryId: string;
+  materialCategories: string;//暂时保留
+
+  /**
+   * 物料小类
+   */
+  materialSubclass: string;
+
+  /**
+   * 批次标识(0否 1是)
+   */
+  batchFlag: string;
+
+  /**
+   * 小批次数量
+   */
+  batchAmount: number;
+
+  /**
+   * 计量单位ID
+   */
+  materialUnitId: string | number;
+
+  /**
+   * 计量单位名称
+   */
+  materialUnit: string;
+
+  /**
+   * 物料组
+   */
+  materialMatkl: string;
+
+  /**
+   * 物料规格
+   */
+  materialSpec: string;
+
+  /**
+   * 净重
+   */
+  netWeight: number;
+
+  /**
+   * 毛重
+   */
+  grossWeight: number;
+
+  /**
+   * 绑定标识(1是 0否)
+   */
+  alwaysFlag: string;
+
+  /**
+   * 所属工厂
+   */
+  factoryId: string | number;
+
+  /**
+   * 创建组织
+   */
+  createOrgId: string | number;
+
+  /**
+   * 使用组织
+   */
+  useOrgId: string | number;
+
+  /**
+   * 所属产线
+   */
+  prodLineId: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 删除标识(0否 1是)
+   */
+  deletedFlag: string;
+
+  /**
+   * 采购计价单位
+   */
+  purchasePriceUnitId: string | number;
+
+  /**
+   * 审核日期
+   */
+  approveDate: string;
+
+  /**
+   * erp最后更新日期
+   */
+  erpModifyDate: string;
+
+  /**
+   * 最大库存数量
+   */
+  maxStockAmount: number;
+
+  /**
+   * 最小库存数量
+   */
+  minStockAmount: number;
+
+  /**
+   * 安全库存数量
+   */
+  safeStockAmount: number;
+
+  /**
+   * 申请标识(1是 0否)
+   */
+  applyFlag: string;
+
+  /**
+   * 物料分类（1ERP同步 2虚拟物料 3MES物料）
+   */
+  materialClassfication: string;
+
+  /**
+   * 自动出库标识(1是 0否)
+   */
+  autoOutstockFlag: string;
+
+  /**
+   * 辅料标识(1是 0否)
+   */
+  accessoriesFlag: string;
+
+  /**
+   * 低值易耗品标识(1是 0否)
+   */
+  lowValueConsumableFlag: string;
+
+  /**
+   * 品牌
+   */
+  brand: string;
+
+  /**
+   * 层级
+   */
+  plyrating: string;
+
+  /**
+   * 花纹
+   */
+  pattern: string;
+
+  /**
+   * 速度级别
+   */
+  speedLevel: string;
+
+  /**
+   * 负荷载重
+   */
+  load: string;
+
+  /**
+   * 轮胎标记（1全钢胎 2半钢胎 3工程胎）
+   */
+  tireMarkings: string;
+
+  /**
+   * 最小停放时间（秒）
+   */
+  minParkingTime: number;
+
+  /**
+   * 最大停放时间（秒）
+   */
+  maxParkingTime: number;
+
+  /**
+   * 标准重量
+   */
+  standardWeight: number;
+
+  /**
+   * 标准重量上限
+   */
+  weightUpperLimit: number;
+
+  /**
+   * 标准重量下限
+   */
+  weightLowerLimit: number;
+
+  /**
+   * 内胎标记(0无 1有)
+   */
+  innerTubeFlag: string;
+
+  /**
+   * 销售类型(0内销 1外销)
+   */
+  saleType: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+
+  /**
+   * 所属工厂
+   */
+  factoryName: string;//连表查询映射字段
+
+
+  //注意"e":以下两个物料类型名称！BaseMaterialType实体类中为matrialTypeId，BaseMaterialInfo实体类中为materialTypeId
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName: string;//连表查询映射字段
+
+  /**
+   * 物料类型名称
+   */
+  materialTypeName: string;//连表查询映射字段
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName: string;
+
+}
+
+export interface BaseMaterialInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  materialId?: string | number;
+
+  /**
+   * ERP信息
+   */
+  erpId?: string | number;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 旧物料编码
+   */
+  oldMaterialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 物料类型ID
+   */
+  materialTypeId?: string | number;
+
+  /**
+   * 物料大类(字典改为从数据库中获得)
+   */
+  materialCategoryId: string;
+  materialCategories: string;//暂时保留
+
+  /**
+   * 物料小类
+   */
+  materialSubclass?: string;
+
+  /**
+   * 批次标识(0否 1是)
+   */
+  batchFlag?: string;
+
+  /**
+   * 小批次数量
+   */
+  batchAmount?: number;
+
+  /**
+   * 计量单位ID
+   */
+  materialUnitId?: string | number;
+
+  /**
+   * 计量单位名称
+   */
+  materialUnit?: string;
+
+  /**
+   * 物料组
+   */
+  materialMatkl?: string;
+
+  /**
+   * 物料规格
+   */
+  materialSpec?: string;
+
+  /**
+   * 净重
+   */
+  netWeight?: number;
+
+  /**
+   * 毛重
+   */
+  grossWeight?: number;
+
+  /**
+   * 绑定标识(1是 0否)
+   */
+  alwaysFlag?: string;
+
+  /**
+   * 所属工厂
+   */
+  factoryId?: string | number;
+
+  /**
+   * 创建组织
+   */
+  createOrgId?: string | number;
+
+  /**
+   * 使用组织
+   */
+  useOrgId?: string | number;
+
+  /**
+   * 所属产线
+   */
+  prodLineId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 删除标识(0否 1是)
+   */
+  deletedFlag?: string;
+
+  /**
+   * 采购计价单位
+   */
+  purchasePriceUnitId?: string | number;
+
+  /**
+   * 审核日期
+   */
+  approveDate?: string;
+
+  /**
+   * erp最后更新日期
+   */
+  erpModifyDate?: string;
+
+  /**
+   * 最大库存数量
+   */
+  maxStockAmount?: number;
+
+  /**
+   * 最小库存数量
+   */
+  minStockAmount?: number;
+
+  /**
+   * 安全库存数量
+   */
+  safeStockAmount?: number;
+
+  /**
+   * 申请标识(1是 0否)
+   */
+  applyFlag?: string;
+
+  /**
+   * 物料分类（1ERP同步 2虚拟物料 3MES物料）
+   */
+  materialClassfication?: string;
+
+  /**
+   * 自动出库标识(1是 0否)
+   */
+  autoOutstockFlag?: string;
+
+  /**
+   * 辅料标识(1是 0否)
+   */
+  accessoriesFlag?: string;
+
+  /**
+   * 低值易耗品标识(1是 0否)
+   */
+  lowValueConsumableFlag?: string;
+
+  /**
+   * 品牌
+   */
+  brand?: string;
+
+  /**
+   * 层级
+   */
+  plyrating?: string;
+
+  /**
+   * 花纹
+   */
+  pattern?: string;
+
+  /**
+   * 速度级别
+   */
+  speedLevel?: string;
+
+  /**
+   * 负荷载重
+   */
+  load?: string;
+
+  /**
+   * 轮胎标记（1全钢胎 2半钢胎 3工程胎）
+   */
+  tireMarkings?: string;
+
+  /**
+   * 最小停放时间（秒）
+   */
+  minParkingTime?: number;
+
+  /**
+   * 最大停放时间（秒）
+   */
+  maxParkingTime?: number;
+
+  /**
+   * 标准重量
+   */
+  standardWeight?: number;
+
+  /**
+   * 标准重量上限
+   */
+  weightUpperLimit?: number;
+
+  /**
+   * 标准重量下限
+   */
+  weightLowerLimit?: number;
+
+  /**
+   * 内胎标记(0无 1有)
+   */
+  innerTubeFlag?: string;
+
+  /**
+   * 销售类型(0内销 1外销)
+   */
+  saleType?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  minParkingDays?: number;
+  minParkingHours?: number;
+  minParkingMinutes?: number;
+
+  maxParkingDays?: number;
+  maxParkingHours?: number;
+  maxParkingMinutes?: number;
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName: string;
+
+}
+
+export interface BaseMaterialInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  materialId?: string | number;
+
+  /**
+   * ERP信息
+   */
+  erpId?: string | number;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 旧物料编码
+   */
+  oldMaterialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 物料类型ID
+   */
+  materialTypeId?: string | number;
+
+  /**
+   * 物料大类(字典改为从数据库中获得)
+   */
+  materialCategoryId: string;
+  materialCategories: string;//暂时保留字典
+
+  /**
+   * 物料小类
+   */
+  materialSubclass?: string;
+
+  /**
+   * 批次标识(0否 1是)
+   */
+  batchFlag?: string;
+
+  /**
+   * 小批次数量
+   */
+  batchAmount?: number;
+
+  /**
+   * 计量单位ID
+   */
+  materialUnitId?: string | number;
+
+  /**
+   * 计量单位名称
+   */
+  materialUnit?: string;
+
+  /**
+   * 物料组
+   */
+  materialMatkl?: string;
+
+  /**
+   * 物料规格
+   */
+  materialSpec?: string;
+
+  /**
+   * 净重
+   */
+  netWeight?: number;
+
+  /**
+   * 毛重
+   */
+  grossWeight?: number;
+
+  /**
+   * 绑定标识(1是 0否)
+   */
+  alwaysFlag?: string;
+
+  /**
+   * 所属工厂
+   */
+  factoryId?: string | number;
+
+  /**
+   * 创建组织
+   */
+  createOrgId?: string | number;
+
+  /**
+   * 使用组织
+   */
+  useOrgId?: string | number;
+
+  /**
+   * 所属产线
+   */
+  prodLineId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 删除标识(0否 1是)
+   */
+  deletedFlag?: string;
+
+  /**
+   * 采购计价单位
+   */
+  purchasePriceUnitId?: string | number;
+
+  /**
+   * 审核日期
+   */
+  approveDate?: string;
+
+  /**
+   * erp最后更新日期
+   */
+  erpModifyDate?: string;
+
+  /**
+   * 最大库存数量
+   */
+  maxStockAmount?: number;
+
+  /**
+   * 最小库存数量
+   */
+  minStockAmount?: number;
+
+  /**
+   * 安全库存数量
+   */
+  safeStockAmount?: number;
+
+  /**
+   * 申请标识(1是 0否)
+   */
+  applyFlag?: string;
+
+  /**
+   * 物料分类（1ERP同步 2虚拟物料 3MES物料）
+   */
+  materialClassfication?: string;
+
+  /**
+   * 自动出库标识(1是 0否)
+   */
+  autoOutstockFlag?: string;
+
+  /**
+   * 辅料标识(1是 0否)
+   */
+  accessoriesFlag?: string;
+
+  /**
+   * 低值易耗品标识(1是 0否)
+   */
+  lowValueConsumableFlag?: string;
+
+  /**
+   * 品牌
+   */
+  brand?: string;
+
+  /**
+   * 层级
+   */
+  plyrating?: string;
+
+  /**
+   * 花纹
+   */
+  pattern?: string;
+
+  /**
+   * 速度级别
+   */
+  speedLevel?: string;
+
+  /**
+   * 负荷载重
+   */
+  load?: string;
+
+  /**
+   * 轮胎标记（1全钢胎 2半钢胎 3工程胎）
+   */
+  tireMarkings?: string;
+
+  /**
+   * 最小停放时间（秒）
+   */
+  minParkingTime?: number;
+
+  /**
+   * 最大停放时间（秒）
+   */
+  maxParkingTime?: number;
+
+  /**
+   * 标准重量
+   */
+  standardWeight?: number;
+
+  /**
+   * 标准重量上限
+   */
+  weightUpperLimit?: number;
+
+  /**
+   * 标准重量下限
+   */
+  weightLowerLimit?: number;
+
+  /**
+   * 内胎标记(0无 1有)
+   */
+  innerTubeFlag?: string;
+
+  /**
+   * 销售类型(0内销 1外销)
+   */
+  saleType?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName: string;
+}
+
+
+

src/views/mes/baseMaterialInfo/addMaterialInWMS.vue

@@ -10,7 +10,11 @@
             </el-form-item>
             <el-form-item label="物料大类" prop="materialCategoryId">
               <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
-                <el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                <el-option v-for="item in mategoryOptions"
+                           :key="item.materialCategoryId"
+                           :label="item.materialCategoryName"
+                           :value="item.materialCategoryId"
+                />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -160,11 +164,17 @@
 </template>
 
 <script setup name="BaseMaterialInfo" lang="ts">
-import { listBaseMaterialInfo, getBaseMaterialInfo, delBaseMaterialInfo, addBaseMaterialInfo, updateBaseMaterialInfo } from '@/api/mes/baseMaterialInfo';
+import {
-import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/mes/baseMaterialInfo/types';
+  listBaseMaterialInfoInWMS,
-import { getFactoryList } from "@/api/mes/baseFactoryInfo";
+  getBaseMaterialInfoInWMS,
+  delBaseMaterialInfoInWMS,
+  addBaseMaterialInfoInWMS,
+  updateBaseMaterialInfoInWMS,
+} from '@/api/wms/baseMaterialInfo';
+import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/wms/baseMaterialInfo/types';
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { apply_flag, inner_tube_flag,
@@ -381,12 +391,6 @@ const { materialTypeId, materialCategoryId } = toRefs(props);
 
 const emits = defineEmits(['selection']);  // 定义事件
 
-/** 下拉框查询工厂信息列表 */
-let factoryList = ref([])
-const getFactorySelect = async () => {
-  let res = await getFactoryList(null);
-  factoryList.value = res.data;
-}
 
 /** 查询物料信息列表 */
 const getList = async () => {
@@ -400,7 +404,7 @@ const getList = async () => {
   }
 
   proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate');
-  const res = await listBaseMaterialInfo(queryParams.value);
+  const res = await listBaseMaterialInfoInWMS(queryParams.value);
   baseMaterialInfoList.value = res.rows;
   total.value = res.total;
   loading.value = false;
@@ -449,7 +453,7 @@ const handleAdd = () => {
 const handleUpdate = async (row?: BaseMaterialInfoVO) => {
   reset();
   const _materialId = row?.materialId || ids.value[0]
-  const res = await getBaseMaterialInfo(_materialId);
+  const res = await getBaseMaterialInfoInWMS(_materialId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
   dialog.title = "修改物料信息";
@@ -461,9 +465,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.materialId) {
-        await updateBaseMaterialInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateBaseMaterialInfoInWMS(form.value).finally(() =>  buttonLoading.value = false);
       } else {
-        await addBaseMaterialInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addBaseMaterialInfoInWMS(form.value).finally(() =>  buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
@@ -476,14 +480,14 @@ const submitForm = () => {
 const handleDelete = async (row?: BaseMaterialInfoVO) => {
   const _materialIds = row?.materialId || ids.value;
   await proxy?.$modal.confirm('是否确认删除物料信息编号为"' + _materialIds + '"的数据项？').finally(() => loading.value = false);
-  await delBaseMaterialInfo(_materialIds);
+  await delBaseMaterialInfoInWMS(_materialIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
 }
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('mes/baseMaterialInfo/export', {
+  proxy?.download('wms/baseMaterialInfo/export', {
     ...queryParams.value
   }, `baseMaterialInfo_${new Date().getTime()}.xlsx`)
 }
@@ -498,13 +502,20 @@ const handleRowClick = (row) => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
+  mategoryOptions.value = res.data;
+};
+
+//获取物料大类下拉框
+let mategoryOptions = ref([]);
+const getMaterialCategorySelect = async () => {
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 
 defineExpose({tableRef})
 onMounted(() => {
-  getFactorySelect();
+  getMaterialCategorySelect();
   getList();
   getMaterialCategorySelect();
 });

src/views/wms/allocateOrder/index.vue

@@ -274,6 +274,8 @@ import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
 import api from '@/api/system/user';
 import { useRouter } from 'vue-router';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
 let router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { approve_status,  wms_out_type, wms_allocate_status, wms_allocate_create, wms_allocate_way } = toRefs<any>(proxy?.useDict('approve_status'   , 'wms_out_type','wms_allocate_status','wms_allocate_create','wms_allocate_way'));
@@ -522,7 +524,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/baseWarehouse/index.vue

@@ -166,7 +166,7 @@
 import { listBaseWarehouse, getBaseWarehouse, delBaseWarehouse, addBaseWarehouse, updateBaseWarehouse } from '@/api/wms/baseWarehouse';
 import { BaseWarehouseVO, BaseWarehouseQuery, BaseWarehouseForm } from '@/api/wms/baseWarehouse/types';
 import {getWorkshopList} from "@/api/mes/baseWorkshopInfo";
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {  wms_wharehouse_type } = toRefs<any>(proxy?.useDict(    'wms_wharehouse_type'));
@@ -360,7 +360,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/instockDetail/index.vue

@@ -166,6 +166,8 @@ import { listInstockDetail, getInstockDetail, delInstockDetail, addInstockDetail
 import { InstockDetailVO, InstockDetailQuery, InstockDetailForm } from '@/api/wms/instockDetail/types';
 import { Printer } from '@element-plus/icons-vue';
 import { useRoute } from 'vue-router';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {  wms_barcode_if } = toRefs<any>(proxy?.useDict(    'wms_barcode_if'));
 const router = useRoute();
@@ -415,7 +417,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/instockOrder/index.vue

@@ -215,6 +215,8 @@ import { listInstockOrder, getInstockOrder, delInstockOrder, addInstockOrder, up
 import { InstockOrderVO, InstockOrderQuery, InstockOrderForm } from '@/api/wms/instockOrder/types';
 import { useRouter } from 'vue-router';
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wms_instock_type, approve_status   } = toRefs<any>(proxy?.useDict('wms_instock_type', 'approve_status'   ));
 const instockOrderList = ref<InstockOrderVO[]>([]);
@@ -432,7 +434,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/instockOrderCopy/index.vue

@@ -546,7 +546,7 @@ import {
 
 import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 const {audit_behave,
@@ -619,7 +619,7 @@ const submitForm = async() => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/instockPrint/index.vue

@@ -184,7 +184,7 @@ import {
   getMaterialList
 } from '@/api/wms/linkage'
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { material_mategories, wms_barcode_if } = toRefs<any>(proxy?.useDict('material_mategories', 'wms_barcode_if'));
@@ -404,7 +404,7 @@ const handleExport = () => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/instockRecord/index.vue

@@ -183,7 +183,7 @@
 import { listInstockRecord, getInstockRecord, delInstockRecord, addInstockRecord, updateInstockRecord } from '@/api/wms/instockRecord';
 import { InstockRecordVO, InstockRecordQuery, InstockRecordForm } from '@/api/wms/instockRecord/types';
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { material_mategories, sys_common_status } = toRefs<any>(proxy?.useDict('material_mategories', 'sys_common_status'));
 
@@ -368,7 +368,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/inventory/index.vue

@@ -183,7 +183,7 @@ import {
   getMaterialList
 } from '@/api/wms/linkage'
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -245,7 +245,7 @@ const data = reactive<PageData<InventoryForm, InventoryQuery>>({
     materialId: undefined,
     locationCode: undefined,
     materialCategoryId: undefined,
-  materialCategoryName: undefined,//字段映射
+    materialCategoryName: undefined,//字段映射
     inventoryQty: undefined,
     lockState: undefined,
     inventoryStatus: undefined,
@@ -384,12 +384,11 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 
 onMounted(() => {
-
   getMaterialList().then(e => {
     materialList.value = e.data
   })

src/views/wms/inventoryAlarm/index.vue

@@ -173,7 +173,7 @@ import { listInventory, getInventory, delInventory, addInventory, updateInventor
 import { InventoryVO, InventoryQuery, InventoryForm } from '@/api/wms/inventory/types';
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { lock_state, inventory_status, material_mategories } = toRefs<any>(proxy?.useDict('lock_state', 'inventory_status', 'material_mategories'));
@@ -373,7 +373,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/inventoryCheck/index.vue

@@ -260,7 +260,7 @@ import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
 import api from '@/api/system/user';
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -482,7 +482,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/inventoryCheckRecord/index.vue

@@ -302,7 +302,7 @@
 import { listInventoryCheckRecord, getInventoryCheckRecord, delInventoryCheckRecord, addInventoryCheckRecord, updateInventoryCheckRecord } from '@/api/wms/inventoryCheckRecord';
 import { InventoryCheckRecordVO, InventoryCheckRecordQuery, InventoryCheckRecordForm } from '@/api/wms/inventoryCheckRecord/types';
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -561,7 +561,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/linkage/index.vue

@@ -453,7 +453,7 @@ import {UserVO} from "@/api/system/user/types";
 import {listUser} from "@/api/system/user";
 
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 
 
@@ -514,7 +514,7 @@ listUser().then(e => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/moveOrder/index.vue

@@ -273,7 +273,7 @@ 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';
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 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[]>([]);
@@ -518,7 +518,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/outstockDetail/index.vue

@@ -120,6 +120,7 @@
 import { getMaterialListVo, getMaterailCount } from '@/api/wms/instockDetail';
 import { listOutstockDetail, getOutstockDetail, delOutstockDetail, addOutstockDetail, updateOutstockDetail } from '@/api/wms/outstockDetail';
 import { OutstockDetailVO, OutstockDetailQuery, OutstockDetailForm } from '@/api/wms/outstockDetail/types';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -313,7 +314,7 @@ const handleExport = () => {
 //获取物料大类下拉框
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/outstockOrder/index.vue

@@ -224,7 +224,7 @@ import api from '@/api/system/user';
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import { useRouter } from 'vue-router';
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wms_instock_type, approve_status, material_mategories, wms_out_type } = toRefs<any>(proxy?.useDict('wms_instock_type', 'approve_status', 'material_mategories', 'wms_out_type'));
@@ -449,7 +449,7 @@ const HandleInfo = async (row?: OutstockOrderVO) => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/outstockOrderCopy/index.vue

@@ -486,7 +486,7 @@ import {
 
 import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterial.vue";
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 
 
@@ -566,7 +566,7 @@ const submitForm = () => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/outstockRecord/index.vue

@@ -64,7 +64,7 @@
         <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[5].visible"/>
         <el-table-column label="出库数量" align="center" prop="outstockQty" v-if="columns[6].visible"/>
         <el-table-column label="单位" align="center" prop="materialUnit" v-if="columns[4].visible"/>
-        <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[7].visible">
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[7].visible">
 
         </el-table-column>
         <el-table-column label="出库人" align="center" prop="createBy" v-if="columns[8].visible"/>
@@ -183,7 +183,7 @@ import { OutstockRecordVO, OutstockRecordQuery, OutstockRecordForm } from '@/api
 import { DocumentAdd } from '@element-plus/icons-vue';
 import {getWmsBaseLocationVoList} from "@/api/wms/baseLocation";
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -370,7 +370,7 @@ const handleExport = () => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/psmInStock/index.vue

@@ -130,6 +130,8 @@
 import { listPsmInStock, getPsmInStock, delPsmInStock, addPsmInStock, updatePsmInStock } from '@/api/wms/psmInStock';
 import { PsmInStockVO, PsmInStockQuery, PsmInStockForm } from '@/api/wms/psmInStock/types';
 import { useRouter } from 'vue-router';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const psmInStockList = ref<PsmInStockVO[]>([]);
@@ -334,7 +336,7 @@ const handleExport = () => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/returnOrder/index.vue

@@ -246,7 +246,7 @@ import { listReturnOrder, getReturnOrder, delReturnOrder, addReturnOrder, update
 import { ReturnOrderVO, ReturnOrderQuery, ReturnOrderForm } from '@/api/wms/returnOrder/types';
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {  wms_return_status, erp_synchronous_status, approve_status } = toRefs<any>(proxy?.useDict(   'wms_return_status','erp_synchronous_status','approve_status'));
@@ -486,7 +486,7 @@ const handleExport = () => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/wmsPurchaseOrder/index.vue

@@ -253,6 +253,7 @@
 import { listWmsPurchaseOrder, getWmsPurchaseOrder, delWmsPurchaseOrder, addWmsPurchaseOrder, updateWmsPurchaseOrder } from '@/api/wms/wmsPurchaseOrder';
 import { WmsPurchaseOrderVO, WmsPurchaseOrderQuery, WmsPurchaseOrderForm } from '@/api/wms/wmsPurchaseOrder/types';
 import { getBaseSupplierInfoList } from '@/api/mes/baseSupplierInfo'
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {  wms_po_status, wms_po_type, wms_audit_status } = toRefs<any>(proxy?.useDict(    'wms_po_status', 'wms_po_type', 'wms_audit_status'));
@@ -440,7 +441,7 @@ const getListSelect = async () => {
 
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };
 

src/views/wms/wmsPurchaseOrderCopy/index.vue

@@ -497,7 +497,7 @@ import { WmsPurchaseOrderDetailVO, WmsPurchaseOrderDetailQuery, WmsPurchaseOrder
 import {
   getMaterialList, getInstockMaterialList
 } from '@/api/wms/linkage'
-import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory';
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
 const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 const {
@@ -573,7 +573,7 @@ const submitForm = () => {
 //获取物料大类
 let mategoryOptions = ref([]);
 const getMaterialCategorySelect = async () => {
-  const res = await getBaseMaterialCategoryList(null);
+  const res = await getBaseMaterialCategoryListInWMS(null);
   mategoryOptions.value = res.data;
 };