Merge remote-tracking branch 'origin/master'

src/api/wms/allocateOrder/types.ts

@@ -76,6 +76,11 @@ export interface AllocateOrderVO {
    */
   inMethod: string;
 
+  /**
+   * 调拨原因
+   */
+  allocateReason: string;
+
 }
 
 export interface AllocateOrderForm extends BaseEntity {
@@ -156,6 +161,11 @@ export interface AllocateOrderForm extends BaseEntity {
    */
   inMethod?: string;
 
+  /**
+   * 调拨原因
+   */
+  allocateReason?: string;
+
 }
 
 export interface AllocateOrderQuery extends PageQuery {
@@ -237,6 +247,11 @@ export interface AllocateOrderQuery extends PageQuery {
    */
   inMethod?: string;
 
+  /**
+   * 调拨原因
+   */
+  allocateReason?: string;
+
     /**
      * 日期范围参数
      */

src/api/wms/baseMaterialInfo/types.ts

@@ -293,6 +293,17 @@ export interface BaseMaterialInfoVO {
    */
   materialCategoryName: string;
 
+
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest: string;
+
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue: string;
+
 }
 
 export interface BaseMaterialInfoForm extends BaseEntity {
@@ -550,6 +561,16 @@ export interface BaseMaterialInfoForm extends BaseEntity {
    */
   materialCategoryName: string;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest?: string;
+
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue?: string;
+
 }
 
 export interface BaseMaterialInfoQuery extends PageQuery {
@@ -790,6 +811,17 @@ export interface BaseMaterialInfoQuery extends PageQuery {
    */
   saleType?: string;
 
+  /**
+   * 质检要求(0必检,1免检)
+   */
+  inspectionRequest?: string;
+
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue?: string;
+
+
     /**
      * 日期范围参数
      */

src/api/wms/baseMaterialType/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseMaterialTypeVO, BaseMaterialTypeForm, BaseMaterialTypeQuery } from '@/api/wms/baseMaterialType/types';
+
+/**
+ * 查询物料类型信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseMaterialType = (query?: BaseMaterialTypeQuery): AxiosPromise<BaseMaterialTypeVO[]> => {
+  return request({
+    url: '/wms/baseMaterialType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物料类型信息详细
+ * @param matrialTypeId
+ */
+export const getBaseMaterialType = (matrialTypeId: string | number): AxiosPromise<BaseMaterialTypeVO> => {
+  return request({
+    url: '/wms/baseMaterialType/' + matrialTypeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物料类型信息
+ * @param data
+ */
+export const addBaseMaterialType = (data: BaseMaterialTypeForm) => {
+  return request({
+    url: '/wms/baseMaterialType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物料类型信息
+ * @param data
+ */
+export const updateBaseMaterialType = (data: BaseMaterialTypeForm) => {
+  return request({
+    url: '/wms/baseMaterialType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物料类型信息
+ * @param matrialTypeId
+ */
+export const delBaseMaterialType = (matrialTypeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/baseMaterialType/' + matrialTypeId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询物料类型信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseMaterialTypeList (query) {
+    return request({
+        url: '/wms/baseMaterialType/getBaseMaterialTypeList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/baseMaterialType/types.ts

@@ -0,0 +1,210 @@
+export interface BaseMaterialTypeVO {
+  /**
+   * 物料类型ID
+   */
+  matrialTypeId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 物料类型编号
+   */
+  matrialTypeCode: string;
+
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategoryId: string;
+
+  /**
+   * 物料小类
+   */
+  materialSubclass: string;
+
+  /**
+   * 工序ID
+   */
+  processId: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+  /**
+   * 子对象
+   */
+  children: BaseMaterialTypeVO[];
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName?: string;
+}
+
+export interface BaseMaterialTypeForm extends BaseEntity {
+  /**
+   * 物料类型ID
+   */
+  matrialTypeId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 物料类型编号
+   */
+  matrialTypeCode?: string;
+
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName?: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategoryId?: string;
+
+  /**
+   * 物料小类
+   */
+  materialSubclass?: string;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName?: string;
+
+}
+
+export interface BaseMaterialTypeQuery {
+
+  /**
+   * 物料类型ID
+   */
+  matrialTypeId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 物料类型编号
+   */
+  matrialTypeCode?: string;
+
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName?: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategoryId?: string;
+
+  /**
+   * 物料小类
+   */
+  materialSubclass?: string;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+
+  /**
+   * 物料大类名称
+   */
+  materialCategoryName?: string;
+}
+
+
+

src/api/wms/baseMeasurementUnitInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseMeasurementUnitInfoVO, BaseMeasurementUnitInfoForm, BaseMeasurementUnitInfoQuery } from '@/api/wms/baseMeasurementUnitInfo/types';
+
+/**
+ * 查询计量单位信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseMeasurementUnitInfo = (query?: BaseMeasurementUnitInfoQuery): AxiosPromise<BaseMeasurementUnitInfoVO[]> => {
+  return request({
+    url: '/wms/baseMeasurementUnitInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询计量单位信息详细
+ * @param unitId
+ */
+export const getBaseMeasurementUnitInfo = (unitId: string | number): AxiosPromise<BaseMeasurementUnitInfoVO> => {
+  return request({
+    url: '/wms/baseMeasurementUnitInfo/' + unitId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增计量单位信息
+ * @param data
+ */
+export const addBaseMeasurementUnitInfo = (data: BaseMeasurementUnitInfoForm) => {
+  return request({
+    url: '/wms/baseMeasurementUnitInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改计量单位信息
+ * @param data
+ */
+export const updateBaseMeasurementUnitInfo = (data: BaseMeasurementUnitInfoForm) => {
+  return request({
+    url: '/wms/baseMeasurementUnitInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除计量单位信息
+ * @param unitId
+ */
+export const delBaseMeasurementUnitInfo = (unitId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/baseMeasurementUnitInfo/' + unitId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询计量单位信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseMeasurementUnitInfoList (query) {
+    return request({
+        url: '/wms/baseMeasurementUnitInfo/getBaseMeasurementUnitInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/baseMeasurementUnitInfo/types.ts

@@ -0,0 +1,175 @@
+export interface BaseMeasurementUnitInfoVO {
+  /**
+   * 主键标识
+   */
+  unitId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 计量单位编号
+   */
+  unitCode: string;
+
+  /**
+   * 计量单位名称
+   */
+  unitName: string;
+
+  /**
+   * 计量单位转换（与最顶级转换关系，最顶级是1）
+   */
+  unitConversion: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 单位类型（1长度 2质量 3时间 4面积 5体积）
+   */
+  unitType: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+    /**
+     * 子对象
+     */
+    children: BaseMeasurementUnitInfoVO[];
+}
+
+export interface BaseMeasurementUnitInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  unitId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 计量单位编号
+   */
+  unitCode?: string;
+
+  /**
+   * 计量单位名称
+   */
+  unitName?: string;
+
+  /**
+   * 计量单位转换（与最顶级转换关系，最顶级是1）
+   */
+  unitConversion?: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 单位类型（1长度 2质量 3时间 4面积 5体积）
+   */
+  unitType?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+}
+
+export interface BaseMeasurementUnitInfoQuery {
+
+  /**
+   * 主键标识
+   */
+  unitId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 计量单位编号
+   */
+  unitCode?: string;
+
+  /**
+   * 计量单位名称
+   */
+  unitName?: string;
+
+  /**
+   * 计量单位转换（与最顶级转换关系，最顶级是1）
+   */
+  unitConversion?: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 单位类型（1长度 2质量 3时间 4面积 5体积）
+   */
+  unitType?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/wms/instockOrder/types.ts

@@ -1,3 +1,5 @@
+import { InstockDetailForm } from '@/api/wms/instockDetail/types';
+
 export interface InstockOrderVO {
   /**
    * 入库单 主键
@@ -116,6 +118,11 @@ export interface InstockOrderForm extends BaseEntity {
    */
     instockMethond?: string;
 
+  /**
+   * 入库单子表（与后端 WmsInstockOrderBo.detailListBo 对齐）
+   */
+  detailListBo?: InstockDetailForm[];
+
 }
 
 export interface InstockOrderQuery extends PageQuery {

src/api/wms/instockPrint/types.ts

@@ -61,6 +61,22 @@ export interface InstockPrintVO {
 
   materialCategoryName: string;
 
+  /**
+   * 推荐库位id
+   */
+  locationId: string | number;
+
+  /**
+   * 入库状态(0-待入库,1-已入库,2-入库中)
+   */
+  inboundStatus: string;
+
+  /**
+   * 实际入库时间
+   */
+  actualInboundTime: string;
+
+
 }
 
 export interface InstockPrintForm extends BaseEntity {
@@ -126,6 +142,21 @@ export interface InstockPrintForm extends BaseEntity {
 
   materialCategoryName?: string;
 
+    /**
+   * 推荐库位id
+   */
+    locationId?: string | number;
+
+    /**
+     * 入库状态(0-待入库,1-已入库,2-入库中)
+     */
+    inboundStatus?: string;
+  
+    /**
+     * 实际入库时间
+     */
+    actualInboundTime?: string;
+
 }
 
 export interface InstockPrintQuery extends PageQuery {
@@ -192,6 +223,23 @@ export interface InstockPrintQuery extends PageQuery {
 
   materialCategoryName?: string;
 
+
+    /**
+   * 推荐库位id
+   */
+      locationId?: string | number;
+
+      /**
+       * 入库状态(0-待入库,1-已入库,2-入库中)
+       */
+      inboundStatus?: string;
+    
+      /**
+       * 实际入库时间
+       */
+      actualInboundTime?: string;
+
+
     /**
      * 日期范围参数
      */

src/api/wms/outstockDetail/types.ts

@@ -37,6 +37,22 @@ export interface OutstockDetailVO {
    */
   materialCode: string;
 
+
+  /**
+   * 是否为AGV任务（0是，1否）
+   */
+  isAgv: string ;
+
+  /**
+   * 完成数量
+   */
+  completeQty: number | string;
+
+  /**
+   * AGV状态（0待拾取 / 1运输中 / 2完成）
+   */
+  agvStatus: string;
+
 }
 
 export interface OutstockDetailForm extends BaseEntity {
@@ -72,6 +88,22 @@ export interface OutstockDetailForm extends BaseEntity {
 
   materialCategoryName?: string;
 
+
+  /**
+   * 是否为AGV任务（0是，1否）
+   */
+  isAgv?: string ;
+
+  /**
+   * 完成数量
+   */
+  completeQty?: number | string;
+
+  /**
+   * AGV状态（0待拾取 / 1运输中 / 2完成）
+   */
+  agvStatus?: string;
+
 }
 
 export interface OutstockDetailQuery extends PageQuery {
@@ -108,6 +140,23 @@ export interface OutstockDetailQuery extends PageQuery {
 
   materialCategoryName?: string;
 
+
+  /**
+   * 是否为AGV任务（0是，1否）
+   */
+  isAgv?: string ;
+
+  /**
+   * 完成数量
+   */
+  completeQty?: number | string;
+
+  /**
+   * AGV状态（0待拾取 / 1运输中 / 2完成）
+   */
+  agvStatus?: string;
+
+
     /**
      * 日期范围参数
      */

src/api/wms/outstockOrder/index.ts

@@ -61,3 +61,15 @@ export const delOutstockOrder = (outstockId: string | number | Array<string | nu
     method: 'delete'
   });
 };
+
+/**
+ * 审批出库单：更新审核状态/意见（后端自动填写审核时间）
+ * @param data 需包含 outstockId, auditStatus(0/1/2), auditComments
+ */
+export const approveOutstockOrder = (data: Partial<OutstockOrderForm>) => {
+  return request({
+    url: '/wms/outstockOrder/approve',
+    method: 'put',
+    data: data
+  });
+};

src/utils/request.ts

@@ -25,6 +25,21 @@ export const globalHeaders = () => {
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
 axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
+
+//请求地址处理，兼容使用模块化，wms分为wms1\2\3多个微服务端口
+const getUrl = () =>{
+  let routeType = router.currentRoute.value.query.routeType
+  if(!routeType) return "/wms/"
+  if(routeType == '1'){
+    return "/wms1/"
+  }
+  if(routeType == '2'){
+    return "/wms2/"
+  }
+  if(routeType == '3'){
+    return "/wms3/"
+  }
+}
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
@@ -34,6 +49,12 @@ const service = axios.create({
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
+
+    // 请求地址处理，兼容使用模块化，wms分为wms1\2\3多个微服务端口
+    config.url = config.url.replaceAll('/wms/',getUrl())
+    console.log(config.url);
+
+
     // 对应国际化资源文件后缀
     config.headers['Content-Language'] = getLanguage();
 

src/views/wms/baseMaterialCategory/index.vue

@@ -0,0 +1,285 @@
+<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="大类ID" prop="materialCategoryId">
+              <el-input v-model="queryParams.materialCategoryId" placeholder="请输入大类ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="大类编号" prop="materialCategoryCode">
+              <el-input v-model="queryParams.materialCategoryCode" placeholder="请输入大类编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="大类名称" prop="materialCategoryName">
+              <el-input v-model="queryParams.materialCategoryName" placeholder="请输入大类名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!--            <el-form-item label="激活标识" prop="activeFlag">
+                          <el-input v-model="queryParams.activeFlag" 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="['mes:baseMaterialCategory:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseMaterialCategory:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseMaterialCategory:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseMaterialCategory: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="baseMaterialCategoryList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="大类ID" align="center" prop="materialCategoryId" v-if="columns[0].visible"/>
+        <el-table-column label="大类编号" align="center" prop="materialCategoryCode" v-if="columns[2].visible"/>
+        <el-table-column label="大类名称" align="center" prop="materialCategoryName" v-if="columns[3].visible"/>
+        <!--        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible"/>-->
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].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[5].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="['mes:baseMaterialCategory:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMaterialCategory: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="baseMaterialCategoryFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="大类编号" prop="materialCategoryCode">
+          <el-input v-model="form.materialCategoryCode" placeholder="请输入大类编号" />
+        </el-form-item>
+        <el-form-item label="大类名称" prop="materialCategoryName">
+          <el-input v-model="form.materialCategoryName" placeholder="请输入大类名称" />
+        </el-form-item>
+        <!--        <el-form-item label="激活标识" prop="activeFlag">
+                  <el-input v-model="form.activeFlag" 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-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="BaseMaterialCategory" lang="ts">
+import { listBaseMaterialCategoryInWMS, getBaseMaterialCategoryInWMS, delBaseMaterialCategoryInWMS, addBaseMaterialCategoryInWMS, updateBaseMaterialCategoryInWMS } from '@/api/wms/baseMaterialCategory';
+import { BaseMaterialCategoryVO, BaseMaterialCategoryQuery, BaseMaterialCategoryForm } from '@/api/wms/baseMaterialCategory/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const baseMaterialCategoryList = ref<BaseMaterialCategoryVO[]>([]);
+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 baseMaterialCategoryFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `大类ID`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `大类编号`, visible: true },
+  { key: 3, label: `大类名称`, visible: true },
+  { key: 4, label: `激活标识`, visible: true },
+  { key: 5, label: `备注`, visible: true },
+  { key: 6, label: `创建部门`, visible: false },
+  { key: 7, label: `创建人`, visible: false },
+  { key: 8, label: `创建时间`, visible: false },
+  { key: 9, label: `更新人`, visible: false },
+  { key: 10, label: `更新时间`, visible: false },
+]);
+
+const initFormData: BaseMaterialCategoryForm = {
+  materialCategoryId: undefined,
+  materialCategoryCode: undefined,
+  materialCategoryName: undefined,
+  activeFlag: '1',
+  remark: undefined,
+}
+const data = reactive<PageData<BaseMaterialCategoryForm, BaseMaterialCategoryQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    materialCategoryId: undefined,
+    materialCategoryCode: undefined,
+    materialCategoryName: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    /*    materialCategories: [
+          { required: true, message: "大类ID不能为空", trigger: "blur" }
+        ],*/
+    materialCategoryCode: [
+      { required: true, message: "大类编号不能为空", trigger: "blur" }
+    ],
+    materialCategoryName: [
+      { required: true, message: "大类名称不能为空", trigger: "blur" }
+    ],
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "blur" }
+    ],
+    /*    remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],*/
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物料大类信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseMaterialCategoryInWMS(queryParams.value);
+  baseMaterialCategoryList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseMaterialCategoryFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseMaterialCategoryVO[]) => {
+  ids.value = selection.map(item => item.materialCategoryId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加物料大类信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseMaterialCategoryVO) => {
+  reset();
+  const _materialCategoryId = row?.materialCategoryId || ids.value[0]
+  const res = await getBaseMaterialCategoryInWMS(_materialCategoryId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改物料大类信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMaterialCategoryFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.materialCategoryId) {
+        await updateBaseMaterialCategoryInWMS(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseMaterialCategoryInWMS(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseMaterialCategoryVO) => {
+  const _materialCategoryIds = row?.materialCategoryId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除物料大类信息编号为"' + _materialCategoryIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseMaterialCategoryInWMS(_materialCategoryIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/baseMaterialCategory/export', {
+    ...queryParams.value
+  }, `baseMaterialCategory_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/wms/baseMaterialInfo/addMaterialInWMS.vue

@@ -0,0 +1,476 @@
+<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="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料大类" prop="materialCategoryId">
+              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
+                <el-option v-for="item in mategoryOptions"
+                           :key="item.materialCategoryId"
+                           :label="item.materialCategoryName"
+                           :value="item.materialCategoryId"
+                />
+              </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">
+    <el-table v-loading="loading"
+              :data="baseMaterialInfoList"
+              ref="tableRef"
+              @selection-change="handleSelectionChange"
+              @row-click="handleRowClick"
+              highlight-current-row
+    >
+      <el-table-column label="ERP信息" align="center" prop="erpId" v-if="columns[0].visible"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" width="100"/>
+      <el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
+      <el-table-column label="物料类型" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
+      <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[5].visible">
+
+      </el-table-column>
+<!--      <el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[6].visible"/>-->
+<!--      <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[7].visible">-->
+<!--        <template #default="scope">-->
+<!--          <dict-tag :options="mes_batch_flag" :value="scope.row.batchFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="小批次数量" align="center" prop="batchAmount" v-if="columns[8].visible"/>-->
+<!--      <el-table-column label="计量单位ID" align="center" prop="materialUnitId" v-if="columns[9].visible"/>-->
+      <el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[6].visible" width="120"/>
+<!--      <el-table-column label="物料组" align="center" prop="materialMatkl" v-if="columns[11].visible"/>-->
+      <el-table-column label="物料规格" align="center" prop="materialSpec" v-if="columns[7].visible"/>
+<!--      <el-table-column label="净重" align="center" prop="netWeight" v-if="columns[13].visible"/>
+      <el-table-column label="毛重" align="center" prop="grossWeight" v-if="columns[14].visible"/>
+      <el-table-column label="绑定标识" align="center" prop="alwaysFlag" v-if="columns[15].visible">
+        <template #default="scope">
+          <dict-tag :options="always_flag" :value="scope.row.alwaysFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属工厂" align="center" prop="factoryName" v-if="columns[16].visible"/>
+      <el-table-column label="创建组织" align="center" prop="createOrgId" v-if="columns[17].visible"/>
+      <el-table-column label="使用组织" align="center" prop="useOrgId" v-if="columns[18].visible"/>
+      <el-table-column label="所属产线" align="center" prop="prodLineId" v-if="columns[19].visible"/>
+      <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[20].visible">
+        <template #default="scope">
+          <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标识" align="center" prop="deletedFlag" v-if="columns[21].visible">
+        <template #default="scope">
+          <dict-tag :options="deleted_flag" :value="scope.row.deletedFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="采购计价单位" align="center" prop="purchasePriceUnitId" v-if="columns[22].visible"/>
+      <el-table-column label="审核日期" align="center" prop="approveDate" width="180" v-if="columns[23].visible">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.approveDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="erp最后更新日期" align="center" prop="erpModifyDate" width="180" v-if="columns[24].visible">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.erpModifyDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="最大库存数量" align="center" prop="maxStockAmount" v-if="columns[25].visible"/>
+      <el-table-column label="最小库存数量" align="center" prop="minStockAmount" v-if="columns[26].visible"/>
+      <el-table-column label="安全库存数量" align="center" prop="safeStockAmount" v-if="columns[27].visible"/>
+      <el-table-column label="申请标识" align="center" prop="applyFlag" v-if="columns[28].visible">
+        <template #default="scope">
+          <dict-tag :options="apply_flag" :value="scope.row.applyFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料分类" align="center" prop="materialClassfication" v-if="columns[29].visible">
+        <template #default="scope">
+          <dict-tag :options="material_classfication" :value="scope.row.materialClassfication"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="自动出库标识" align="center" prop="autoOutstockFlag" v-if="columns[30].visible">
+        <template #default="scope">
+          <dict-tag :options="auto_outstock_flag" :value="scope.row.autoOutstockFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="辅料标识" align="center" prop="accessoriesFlag" v-if="columns[31].visible">
+        <template #default="scope">
+          <dict-tag :options="mes_accessories_flag" :value="scope.row.accessoriesFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="低值易耗品标识(1是 0否)" align="center" prop="lowValueConsumableFlag" v-if="columns[32].visible">
+        <template #default="scope">
+          <dict-tag :options="mes_low_value_consumable_flag" :value="scope.row.lowValueConsumableFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="品牌" align="center" prop="brand" v-if="columns[33].visible"/>
+      <el-table-column label="层级" align="center" prop="plyrating" v-if="columns[34].visible"/>
+      <el-table-column label="花纹" align="center" prop="pattern" v-if="columns[35].visible"/>
+      <el-table-column label="速度级别" align="center" prop="speedLevel" v-if="columns[36].visible"/>
+      <el-table-column label="负荷载重" align="center" prop="load" v-if="columns[37].visible"/>
+      <el-table-column label="轮胎标记" align="center" prop="tireMarkings" v-if="columns[38].visible">
+        <template #default="scope">
+          <dict-tag :options="tire_markings" :value="scope.row.tireMarkings"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[39].visible"/>
+      <el-table-column label="最大停放时间" align="center" prop="maxParkingTime" v-if="columns[40].visible"/>
+      <el-table-column label="标准重量" align="center" prop="standardWeight" v-if="columns[41].visible"/>
+      <el-table-column label="标准重量上限" align="center" prop="weightUpperLimit" v-if="columns[42].visible"/>
+      <el-table-column label="标准重量下限" align="center" prop="weightLowerLimit" v-if="columns[43].visible"/>
+      <el-table-column label="内胎标记" align="center" prop="innerTubeFlag" v-if="columns[44].visible">
+        <template #default="scope">
+          <dict-tag :options="inner_tube_flag" :value="scope.row.innerTubeFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="销售类型" align="center" prop="saleType" v-if="columns[45].visible">
+        <template #default="scope">
+          <dict-tag :options="sale_type" :value="scope.row.saleType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[46].visible"/>-->
+      <!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[49].visible"/>
+              <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[50].visible"/>
+              <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[51].visible">
+                <template #default="scope">
+                  <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[52].visible"/>
+              <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[53].visible">
+                <template #default="scope">
+                  <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                </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>
+  </div>
+</template>
+
+<script setup name="BaseMaterialInfo" lang="ts">
+import {
+  listBaseMaterialInfoInWMS,
+  getBaseMaterialInfoInWMS,
+  delBaseMaterialInfoInWMS,
+  addBaseMaterialInfoInWMS,
+  updateBaseMaterialInfoInWMS,
+} from '@/api/wms/baseMaterialInfo';
+import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/wms/baseMaterialInfo/types';
+
+
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { apply_flag, inner_tube_flag,
+  mes_material_categories, always_flag, mes_accessories_flag,
+  auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
+  material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'mes_material_categories', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
+
+const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
+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 dateRangeApproveDate = ref<[DateModelType, DateModelType]>(['', '']);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseMaterialInfoFormRef = ref<ElFormInstance>();
+const selectedRow = ref({});
+const tableRef = ref()
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  /*        { key: 0, label: `主键标识`, visible: true },
+          { key: 1, label: `租户编号`, visible: true },*/
+  { key: 0, label: `ERP信息`, visible: false },
+  { key: 1, label: `物料编码`, visible: true },
+  { 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: `物料规格`, visible: true },
+]);
+
+const initFormData: BaseMaterialInfoForm = {
+  materialId: undefined,
+  erpId: undefined,
+  materialCode: undefined,
+  oldMaterialCode: undefined,
+  materialName: undefined,
+  materialTypeId: undefined,
+  materialCategoryId: undefined,
+  materialCategoryName: undefined,
+  materialSubclass: undefined,
+  batchFlag: undefined,
+  batchAmount: undefined,
+  materialUnitId: undefined,
+  materialUnit: undefined,
+  materialMatkl: undefined,
+  materialSpec: undefined,
+  netWeight: undefined,
+  grossWeight: undefined,
+  alwaysFlag: undefined,
+  factoryId: undefined,
+  createOrgId: undefined,
+  useOrgId: undefined,
+  prodLineId: undefined,
+  activeFlag: '1',
+  deletedFlag: undefined,
+  purchasePriceUnitId: undefined,
+  approveDate: undefined,
+  erpModifyDate: undefined,
+  maxStockAmount: undefined,
+  minStockAmount: undefined,
+  safeStockAmount: undefined,
+  applyFlag: undefined,
+  materialClassfication: undefined,
+  autoOutstockFlag: undefined,
+  accessoriesFlag: undefined,
+  lowValueConsumableFlag: undefined,
+  brand: undefined,
+  plyrating: undefined,
+  pattern: undefined,
+  speedLevel: undefined,
+  load: undefined,
+  tireMarkings: undefined,
+  minParkingTime: undefined,
+  maxParkingTime: undefined,
+  standardWeight: undefined,
+  weightUpperLimit: undefined,
+  weightLowerLimit: undefined,
+  innerTubeFlag: undefined,
+  saleType: undefined,
+  remark: undefined,
+
+  isHighValue: undefined,
+  inspectionRequest: undefined,
+
+}
+const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    materialId: undefined,
+    erpId: undefined,
+    materialCode: undefined,
+    oldMaterialCode: undefined,
+    materialName: undefined,
+    materialTypeId: undefined,
+    materialCategoryId: undefined,
+    materialCategoryName: undefined,
+    materialSubclass: undefined,
+    batchFlag: undefined,
+    batchAmount: undefined,
+    materialUnitId: undefined,
+    materialUnit: undefined,
+    materialMatkl: undefined,
+    materialSpec: undefined,
+    netWeight: undefined,
+    grossWeight: undefined,
+    alwaysFlag: undefined,
+    factoryId: undefined,
+    createOrgId: undefined,
+    useOrgId: undefined,
+    prodLineId: undefined,
+    activeFlag: undefined,
+    deletedFlag: undefined,
+    purchasePriceUnitId: undefined,
+    erpModifyDate: undefined,
+    maxStockAmount: undefined,
+    minStockAmount: undefined,
+    safeStockAmount: undefined,
+    applyFlag: undefined,
+    materialClassfication: undefined,
+    autoOutstockFlag: undefined,
+    accessoriesFlag: undefined,
+    lowValueConsumableFlag: undefined,
+    brand: undefined,
+    plyrating: undefined,
+    pattern: undefined,
+    speedLevel: undefined,
+    load: undefined,
+    tireMarkings: undefined,
+    minParkingTime: undefined,
+    maxParkingTime: undefined,
+    standardWeight: undefined,
+    weightUpperLimit: undefined,
+    weightLowerLimit: undefined,
+    innerTubeFlag: undefined,
+    saleType: undefined,
+
+    isHighValue: undefined,
+    inspectionRequest: undefined,
+
+
+    params: {
+      approveDate: undefined,
+    }
+  },
+  rules: {
+    erpId: [
+      { required: true, message: "ERP信息不能为空", trigger: "blur" }
+    ],
+    materialCode: [
+      { required: true, message: "物料编码不能为空", trigger: "blur" }
+    ],
+    materialName: [
+      { required: true, message: "物料名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+const props = defineProps({
+  materialTypeId: String ,
+  materialCategoryId: String,// 新增接收物料大类参数
+});
+
+const { materialTypeId, materialCategoryId } = toRefs(props);
+
+const emits = defineEmits(['selection']);  // 定义事件
+
+
+/** 查询物料信息列表 */
+const getList = async () => {
+  loading.value = true;
+  queryParams.value.params = {};
+  queryParams.value.materialTypeId = materialTypeId.value;
+
+  // 如果传入了物料大类，则设置查询参数并禁用修改
+  if (materialCategoryId.value) {
+    queryParams.value.materialCategoryId = materialCategoryId.value;
+  }
+
+  proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate');
+  const res = await listBaseMaterialInfoInWMS(queryParams.value);
+  baseMaterialInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseMaterialInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRangeApproveDate.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+// /** 多选框选中数据 */
+// const handleSelectionChange = (selection: BaseMaterialInfoVO[]) => {
+//   ids.value = selection.map(item => item.materialId);
+//   single.value = selection.length != 1;
+//   multiple.value = !selection.length;
+// }
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加物料信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseMaterialInfoVO) => {
+  reset();
+  const _materialId = row?.materialId || ids.value[0]
+  const res = await getBaseMaterialInfoInWMS(_materialId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改物料信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMaterialInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.materialId) {
+        await updateBaseMaterialInfoInWMS(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseMaterialInfoInWMS(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseMaterialInfoVO) => {
+  const _materialIds = row?.materialId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除物料信息编号为"' + _materialIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseMaterialInfoInWMS(_materialIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/baseMaterialInfo/export', {
+    ...queryParams.value
+  }, `baseMaterialInfo_${new Date().getTime()}.xlsx`)
+}
+
+/** 选中列赋值 */
+const handleRowClick = (row) => {
+  selectedRow.value = row;
+  // 触发选择事件，将完整的行数据传递给父组件
+  emits('selection', row);
+};
+
+//获取物料大类下拉框
+let mategoryOptions = ref([]);
+const getMaterialCategorySelect = async () => {
+  const res = await getBaseMaterialCategoryListInWMS(null);
+  mategoryOptions.value = res.data;
+};
+
+
+defineExpose({tableRef})
+onMounted(() => {
+  getMaterialCategorySelect();
+  getList();
+});
+</script>

src/views/wms/baseMaterialInfo/index.vue

@@ -0,0 +1,753 @@
+<template>
+  <div class="p-2">
+<el-row :gutter="9">
+  <el-col :span="4" :xs="24">
+    <div class="head-container">
+      <el-input
+        v-model="filterBoxName"
+        placeholder="请输入名称"
+        clearable
+        size="small"
+        prefix-icon="el-icon-search"
+        style="margin-bottom: 20px"
+      />
+    </div>
+    <div class="head-container">
+      <div class="tree-container">
+        <el-tree
+          :data="InfoOptions"
+          :props="props"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="matrialTypeId"
+          default-expand-all
+          highlight-current
+          @node-click="handleTreeNodeClick"
+        />
+      </div>
+    </div>
+  </el-col>
+
+  <el-col :span="20" :xs="24">
+    <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="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" 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="['mes:baseMaterialInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseMaterialInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseMaterialInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseMaterialInfo: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="baseMaterialInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="60" align="center" />
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[0].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[1].visible" width="220px"/>
+        <el-table-column label="物料类型" align="center" prop="matrialTypeName" v-if="columns[2].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[3].visible"/>
+        <el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[4].visible"/>
+        <el-table-column label="物料规格" align="center" prop="materialCategoryName" v-if="columns[5].visible"/>
+        <el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[6].visible">
+          <template #default="scope">
+            <span>{{ formatDayHourMinutes(scope.row.minParkingTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最大停放时间" align="center" prop="maxParkingTime" v-if="columns[7].visible">
+          <template #default="scope">
+            <span>{{ formatDayHourMinutes(scope.row.maxParkingTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="质检要求" align="center" prop="inspectionRequest" v-if="columns[10].visible">
+          <template #default="scope">
+            <dict-tag :options="inspection_request" :value="scope.row.auditStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否高价值物料" align="center" prop="isHighValue" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="is_high_value" :value="scope.row.isHighValue"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].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="['mes:baseMaterialInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMaterialInfo: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-col>
+
+</el-row>
+
+    <!-- 添加或修改物料信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body>
+      <el-form ref="baseMaterialInfoFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="物料编码" prop="materialCode">
+              <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="物料类型" prop="materialTypeId">
+              <el-select v-model="form.materialTypeId" placeholder="请选择物料类型" @change="materialCategoryIdBymaterialTypeId">
+                <el-option
+                    v-for="item in materialTypeList"
+                    :key="item.matrialTypeId"
+                    :label="item.matrialTypeName"
+                    :value="item.matrialTypeId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="物料规格" prop="materialSpec">
+              <el-input v-model="form.materialSpec" placeholder="请输入物料规格" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="最小停放时间" prop="minParkingTime">
+              <el-input-number
+                v-model="form.minParkingDays"
+                placeholder="请输入天数"
+                :min="0"
+                :max="10000"
+                :controls="false"
+                :style="{ width: '50px' }"
+              />
+              <span>&nbsp;天&nbsp;</span>
+              <el-input-number v-model="form.minParkingHours" placeholder="请输入小时" :min="0" :max="23" :controls="false" :style="{ width: '50px' }" />
+              <span>&nbsp;小时&nbsp;</span>
+              <el-input-number
+                v-model="form.minParkingMinutes"
+                placeholder="请输入分钟"
+                :min="0"
+                :max="59"
+                :controls="false"
+                :style="{ width: '50px' }"
+              />
+              <span>&nbsp;分钟&nbsp;</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="最大停放时间" prop="maxParkingTime">
+              <el-input-number
+                v-model="form.maxParkingDays"
+                placeholder="请输入天数"
+                :min="0"
+                :max="10000"
+                :controls="false"
+                :style="{ width: '50px' }"
+              />
+              <span>&nbsp;天&nbsp;</span>
+              <el-input-number v-model="form.maxParkingHours" placeholder="请输入小时" :min="0" :max="23" :controls="false" :style="{ width: '50px' }" />
+              <span>&nbsp;小时&nbsp;</span>
+              <el-input-number
+                v-model="form.maxParkingMinutes"
+                placeholder="请输入分钟"
+                :min="0"
+                :max="59"
+                :controls="false"
+                :style="{ width: '50px' }"
+              />
+              <span>&nbsp;分钟&nbsp;</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="质检要求" prop="inspectionRequest">
+              <el-select v-model="form.inspectionRequest" placeholder="请选择质检要求">
+                <el-option
+                    v-for="item in inspection_request"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否高价值" prop="isHighValue" >
+              <el-select v-model="form.isHighValue" placeholder="请选择是否高价值">
+                <el-option
+                    v-for="item in is_high_value"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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="BaseMaterialInfo" lang="ts">
+import { listBaseMaterialInfoInWMS, getBaseMaterialInfoInWMS, delBaseMaterialInfoInWMS, addBaseMaterialInfoInWMS, updateBaseMaterialInfoInWMS } from '@/api/wms/baseMaterialInfo';
+import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/wms/baseMaterialInfo/types';
+// import { getFactoryList } from "@/api/wms/baseFactoryInfo";
+import { getBaseMaterialTypeList } from "@/api/wms/baseMaterialType";
+import {getBaseMaterialCategoryListInWMS} from "@/api/wms/baseMaterialCategory";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { apply_flag, inner_tube_flag,
+   always_flag, mes_accessories_flag,
+  auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
+  material_classfication, mes_low_value_consumable_flag,
+  is_high_value,inspection_request
+} = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag',   'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag',
+  'is_high_value', 'inspection_request'
+));
+
+const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
+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 dateRangeApproveDate = ref<[DateModelType, DateModelType]>(['', '']);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseMaterialInfoFormRef = ref<ElFormInstance>();
+
+/*type MeasureUnitList = {
+  unitId: number;
+  unitName: string;
+  children? : MeasureUnitList[];
+}*/
+
+
+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: `计量单位名称`, visible: true },
+
+          { key: 5, label: `物料规格`, visible: true },
+            { key: 6, label: `最小停放时间`, visible: false },
+            { key: 7, label: `最大停放时间`, visible: true },
+            { key: 8, label: `备注`, visible: false },
+            { key: 9, label: `"是否高价值`, visible: true },
+            { key: 10, label: `质检要求`, visible: true },
+]);
+
+const initFormData: BaseMaterialInfoForm = {
+  materialId: undefined,
+  erpId: undefined,
+  materialCode: undefined,
+  oldMaterialCode: undefined,
+  materialName: undefined,
+  materialTypeId: undefined,
+
+  materialCategoryId: undefined,// 物料大类id
+  materialCategoryName: undefined,// 物料大类名称
+
+  materialSubclass: undefined,
+  batchFlag: undefined,
+  batchAmount: undefined,
+  materialUnitId: undefined,
+  materialUnit: undefined,
+  materialMatkl: undefined,
+  materialSpec: undefined,
+  netWeight: undefined,
+  grossWeight: undefined,
+  alwaysFlag: undefined,
+  factoryId: undefined,
+  createOrgId: undefined,
+  useOrgId: undefined,
+  prodLineId: undefined,
+  activeFlag: '1',
+  deletedFlag: undefined,
+  purchasePriceUnitId: undefined,
+  approveDate: undefined,
+  erpModifyDate: undefined,
+  maxStockAmount: undefined,
+  minStockAmount: undefined,
+  safeStockAmount: undefined,
+  applyFlag: undefined,
+  materialClassfication: undefined,
+  autoOutstockFlag: undefined,
+  accessoriesFlag: undefined,
+  lowValueConsumableFlag: undefined,
+  brand: undefined,
+  plyrating: undefined,
+  pattern: undefined,
+  speedLevel: undefined,
+  load: undefined,
+  tireMarkings: undefined,
+  minParkingTime: undefined,
+  maxParkingTime: undefined,
+  standardWeight: undefined,
+  weightUpperLimit: undefined,
+  weightLowerLimit: undefined,
+  innerTubeFlag: undefined,
+  saleType: undefined,
+  remark: undefined,
+  minParkingDays:0,
+  minParkingHours:0,
+  minParkingMinutes:0,
+  maxParkingDays:0,
+  maxParkingHours:0,
+  maxParkingMinutes:0,
+
+  isHighValue: undefined,
+  inspectionRequest: undefined,
+
+}
+const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    materialId: undefined,
+    erpId: undefined,
+    materialCode: undefined,
+    oldMaterialCode: undefined,
+    materialName: undefined,
+    materialTypeId: undefined,
+
+    materialCategoryId: undefined,
+    materialCategoryName: undefined,
+
+    materialSubclass: undefined,
+    batchFlag: undefined,
+    batchAmount: undefined,
+    materialUnitId: undefined,
+    materialUnit: undefined,
+    materialMatkl: undefined,
+    materialSpec: undefined,
+    netWeight: undefined,
+    grossWeight: undefined,
+    alwaysFlag: undefined,
+    factoryId: undefined,
+    createOrgId: undefined,
+    useOrgId: undefined,
+    prodLineId: undefined,
+    activeFlag: undefined,
+    deletedFlag: undefined,
+    purchasePriceUnitId: undefined,
+    erpModifyDate: undefined,
+    maxStockAmount: undefined,
+    minStockAmount: undefined,
+    safeStockAmount: undefined,
+    applyFlag: undefined,
+    materialClassfication: undefined,
+    autoOutstockFlag: undefined,
+    accessoriesFlag: undefined,
+    lowValueConsumableFlag: undefined,
+    brand: undefined,
+    plyrating: undefined,
+    pattern: undefined,
+    speedLevel: undefined,
+    load: undefined,
+    tireMarkings: undefined,
+    minParkingTime: undefined,
+    maxParkingTime: undefined,
+    standardWeight: undefined,
+    weightUpperLimit: undefined,
+    weightLowerLimit: undefined,
+    innerTubeFlag: undefined,
+    saleType: undefined,
+
+    isHighValue: undefined,
+    inspectionRequest: undefined,
+
+    params: {
+      approveDate: undefined,
+    }
+  },
+  rules: {
+/*    erpId: [
+      { required: true, message: "ERP信息不能为空", trigger: "blur" }
+    ],*/
+    materialCode: [
+      { required: true, message: "物料编码不能为空", trigger: "blur" }
+    ],
+    materialName: [
+      { required: true, message: "物料名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+// /** 下拉框查询工厂信息列表 */
+// let factoryList = ref([])
+// const getFactorySelect = async () => {
+//   let res = await getFactoryList(null);
+//   factoryList.value = res.data;
+// }
+
+/** 查询物料信息列表 */
+const getList = async () => {
+  loading.value = true;
+  queryParams.value.params = {};
+  proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate');
+  const res = await listBaseMaterialInfoInWMS(queryParams.value);
+  baseMaterialInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseMaterialInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryParams.value.materialTypeId = undefined; // 清除物料类型ID查询条件（树状结构）
+  if (tree.value) {
+    tree.value.setCurrentKey(null);
+  }
+  dateRangeApproveDate.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseMaterialInfoVO[]) => {
+  ids.value = selection.map(item => item.materialId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+
+  // getFactorySelect();
+  // getbrandList();
+  // getplyratingList();
+  // getpatternList();
+  // getspeedLevelList();
+  // getloadList();
+  // getMeasureUnit();
+
+
+  getMaterialType();
+  dialog.visible = true;
+  dialog.title = "添加物料信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseMaterialInfoVO) => {
+  reset();
+  // getFactorySelect();
+
+  getMaterialType();
+  const _materialId = row?.materialId || ids.value[0]
+  const res = await getBaseMaterialInfoInWMS(_materialId);
+  Object.assign(form.value, res.data);
+  convertToTime();
+  dialog.visible = true;
+  dialog.title = "修改物料信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMaterialInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      convertToSeconds();
+      if (form.value.materialId) {
+        await updateBaseMaterialInfoInWMS(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseMaterialInfoInWMS(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseMaterialInfoVO) => {
+  const _materialIds = row?.materialId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除物料信息编号为"' + _materialIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseMaterialInfoInWMS(_materialIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/baseMaterialInfo/export', {
+    ...queryParams.value
+  }, `baseMaterialInfo_${new Date().getTime()}.xlsx`)
+}
+
+// //获取计量单位下拉框
+// let MeasureUnitList = ref<BaseMeasurementUnitInfoVO[]>([]);
+// const getMeasureUnit = async() => {
+//   const res = await getBaseMeasurementUnitInfoList(null);
+//   const data = proxy?.handleTree<BaseMeasurementUnitInfoVO>(res.data, "unitId", "parentId");
+//   if (data){
+//     MeasureUnitList.value = data;
+//   }
+// }
+//
+//
+// //点击计量单位，根据id同时将unitName赋值给form.value.materialUnit
+// const handleNodeClick = (data: BaseMeasurementUnitInfoVO) => {
+//   form.value.materialUnitId = data.unitId;
+//   form.value.materialUnit = data.unitName;
+// }
+
+//物料类型对话框
+let materialTypeList = ref([]);
+const getMaterialType = async () => {
+  const res = await getBaseMaterialTypeList(null);
+  materialTypeList.value = res.data;
+}
+
+
+//左侧物料类型树
+let InfoOptions = ref([]);
+const getInfoOptions = async () => {
+  const res = await getBaseMaterialTypeList(null);
+  InfoOptions.value = proxy?.handleTree(res.data, "matrialTypeId", "parentId");
+}
+
+//点击左侧物料类型树节点,(选中左侧物料类型，点击"新增"，新增页面物料类型绑定)
+const handleTreeNodeClick = async (data: any) => {
+  queryParams.value.materialTypeId = data.matrialTypeId;
+  initFormData.materialTypeId = data.matrialTypeId;
+  handleQuery();
+}
+
+/**
+ * 过滤节点函数
+ * 用于筛选或显示数据节点，基于提供的值和数据对象
+ *
+ * @param {string} value - 用户输入的过滤值如果为空，则显示所有节点
+ * @param {any} data - 当前数据节点对象，包含需要过滤的属性
+ * @returns {boolean} - 返回一个布尔值，决定节点是否应该显示
+ */
+const filterNode = (value: string, data: any) => {
+  // 当没有输入值时，显示所有节点
+  if (!value) return true;
+  // 检查数据节点的类型名称是否包含输入值，不区分大小写
+  return data.matrialTypeName.toLowerCase().includes(value.toLowerCase());
+}
+
+
+/**
+ * 树形组件过滤功能相关逻辑
+ *
+ * @var filterBoxName 用于绑定过滤关键词的响应式字符串，控制树节点过滤条件
+ * @var props 树形组件配置对象，包含字段映射配置：
+ *   @property {string} children 子节点字段名（默认：'children'）
+ *   @property {string} label 节点显示文本字段名（默认：'matrialTypeName'）
+ *   @property {string} value 节点值字段名（默认：'matrialTypeId'）
+ */
+const filterBoxName = ref('');
+const props = reactive({
+  children: 'children',
+  label: 'matrialTypeName',
+  value: 'matrialTypeId'
+});
+
+/**
+ * 树形组件实例引用，用于调用组件方法
+ */
+const tree = ref();
+
+/**
+ * 监听过滤关键词变化，实时执行树节点过滤
+ * @param newVal 新的过滤关键词，将传递给树组件的filter方法
+ */
+watch(filterBoxName, (newVal) => {
+  if (tree.value) {
+    tree.value.filter(newVal);
+  }
+});
+
+
+/** 天小时分钟转换为秒 */
+const convertToSeconds = () => {
+  const maxDaysInSeconds = form.value.maxParkingDays * 24 * 60 * 60;
+  const maxHoursInSeconds = form.value.maxParkingHours * 60 * 60;
+  const maxMinutesInSeconds = form.value.maxParkingMinutes * 60;
+  form.value.maxParkingTime = maxDaysInSeconds + maxHoursInSeconds + maxMinutesInSeconds;
+
+  const minDaysInSeconds = form.value.minParkingDays * 24 * 60 * 60;
+  const minHoursInSeconds = form.value.minParkingHours * 60 * 60;
+  const minMinutesInSeconds = form.value.minParkingMinutes * 60;
+  form.value.minParkingTime = minDaysInSeconds + minHoursInSeconds + minMinutesInSeconds;
+
+}
+
+/** 秒转换为天小时分钟 */
+const convertToTime = () => {
+  // 处理最大停放时间
+  const maxTotalSeconds = form.value.maxParkingTime || 0;
+  const maxDays = Math.floor(maxTotalSeconds / (24 * 60 * 60));
+  const maxHours = Math.floor((maxTotalSeconds % (24 * 60 * 60)) / 3600);
+  const maxMinutes = Math.floor((maxTotalSeconds % 3600) / 60);
+  // 更新到表单中
+  form.value.maxParkingDays = maxDays;
+  form.value.maxParkingHours = maxHours;
+  form.value.maxParkingMinutes = maxMinutes;
+
+  // 处理最小停放时间
+  const minTotalSeconds = form.value.minParkingTime || 0;
+  const minDays = Math.floor(minTotalSeconds / (24 * 60 * 60));
+  const minHours = Math.floor((minTotalSeconds % (24 * 60 * 60)) / 3600);
+  const minMinutes = Math.floor((minTotalSeconds % 3600) / 60);
+  form.value.minParkingDays = minDays;
+  form.value.minParkingHours = minHours;
+  form.value.minParkingMinutes = minMinutes;
+}
+
+/*brand、plyrating、pattern、speed_level、load*/
+//获取品牌列表
+// let brandList = ref([]);
+// const getbrandList = async () => {
+//   const res = await getSysMasterDataDetailList({masterDataId: 1});
+//   brandList.value = res.data;
+// };
+// //获取层级列表
+// let plyratingList = ref([]);
+// const getplyratingList = async () => {
+//   const res = await getSysMasterDataDetailList({masterDataId: 4});
+//   plyratingList.value = res.data;
+// };
+//
+// //获取花纹列表
+// let patternList = ref([]);
+// const getpatternList = async () => {
+//   const res = await getSysMasterDataDetailList({masterDataId: 5});
+//   patternList.value = res.data;
+// };
+//
+// //获取速度等级列表
+// let speedLevelList = ref([]);
+// const getspeedLevelList = async () => {
+//   const res = await getSysMasterDataDetailList({masterDataId: 7});
+//   speedLevelList.value = res.data;
+// };
+//
+// //获取负荷载重列表
+// let loadList = ref([]);
+// const getloadList = async () => {
+//   const res = await getSysMasterDataDetailList({masterDataId: 6});
+//   loadList.value = res.data;
+// };
+
+//获取物料大类
+let materialCategoryOptions = ref([]);
+const getBaseMaterialCategorySelect = async () => {
+  const res = await getBaseMaterialCategoryListInWMS(null);
+  materialCategoryOptions.value = res.data;
+}
+
+//根据物料类型id获取物料大类，选择物料类型时自动绑定该物料类型的物料大类;
+const materialCategoryIdBymaterialTypeId = (materialTypeId: string | number) => {
+  const selectmaterialTypeId = materialTypeList.value.find(item => item.matrialTypeId === materialTypeId);
+  if (selectmaterialTypeId){
+    form.value.materialCategoryId = selectmaterialTypeId.materialCategoryId;
+  }
+}
+
+onMounted(() => {
+  getBaseMaterialCategorySelect();
+  getInfoOptions();
+  getList();
+});
+</script>

src/views/wms/baseMaterialType/index.vue

@@ -0,0 +1,420 @@
+<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="物料类型ID" prop="matrialTypeId">
+                          <el-input v-model="queryParams.matrialTypeId" 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="matrialTypeCode">
+                          <el-input v-model="queryParams.matrialTypeCode" placeholder="请输入物料类型编号" clearable @keyup.enter="handleQuery" />
+                        </el-form-item>-->
+            <el-form-item label="物料类型名称" prop="matrialTypeName" label-width="100px">
+              <el-input v-model="queryParams.matrialTypeName" 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="materialCategories">
+                          <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable>
+                            <el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                          </el-select>
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料大类" prop="materialCategoryId">
+                          <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable>
+                            <el-option
+                              v-for="item in materialCategoryList "
+                              :key="item.materialCategoryId"
+                              :label="item.materialCategoryName"
+                              :value="item.materialCategoryId"
+                            />
+                          </el-select>
+                        </el-form-item>-->
+            <!--            <el-form-item label="物料小类" prop="materialSubclass">
+                          <el-input v-model="queryParams.materialSubclass" placeholder="请输入物料小类" 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="激活标识" 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="['mes:baseMaterialType:add']">新增</el-button>
+          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>-->
+<!--          </el-col>-->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="baseMaterialTypeTableRef"
+        v-loading="loading"
+        :data="baseMaterialTypeList"
+        row-key="matrialTypeId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+        <!--        <el-table-column label="物料类型ID" align="center" prop="matrialTypeId" />
+                <el-table-column label="租户编号" prop="tenantId" />-->
+        <!--        <el-table-column label="父级标识" align="center" prop="parentId" />-->
+        <el-table-column label="物料类型编号" align="center" prop="matrialTypeCode" />
+        <el-table-column label="物料类型名称" align="center" prop="matrialTypeName" />
+        <!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName"/>
+
+        <!--        <el-table-column label="物料小类" align="center" prop="materialSubclass" />-->
+        <!--        <el-table-column label="工序ID" align="center" prop="processId" />-->
+        <el-table-column label="激活标识" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</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="['mes:baseMaterialType:edit']" />
+            </el-tooltip>
+<!--            <el-tooltip content="新增" placement="top">-->
+<!--              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMaterialType:add']" />-->
+<!--            </el-tooltip>-->
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMaterialType:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改物料类型信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseMaterialTypeFormRef" :model="form" :rules="rules" label-width="120px">
+        <!--        <el-form-item label="物料类型ID" prop="matrialTypeId">
+                  <el-input v-model="form.matrialTypeId" placeholder="请输入物料类型ID" />
+                </el-form-item>-->
+        <!--        <el-form-item label="父级标识" prop="parentId">
+                  <el-tree-select
+                    v-model="form.parentId"
+                    :data="baseMaterialTypeOptions"
+                    :props="{ value: 'matrialTypeId', label: 'matrialTypeName', children: 'children' }"
+                    value-key="matrialTypeId"
+                    placeholder="请选择父级标识"
+                    check-strictly
+                  />
+                </el-form-item>-->
+        <el-form-item label="物料类型编号" prop="matrialTypeCode">
+          <el-input v-model="form.matrialTypeCode" placeholder="请输入物料类型编号" />
+        </el-form-item>
+        <el-form-item label="物料类型名称" prop="matrialTypeName">
+          <el-input v-model="form.matrialTypeName" 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="materialCategoryId">
+          <el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
+            <el-option
+              v-for="item in materialCategoryList "
+              :key="item.materialCategoryId"
+              :label="item.materialCategoryName"
+              :value="item.materialCategoryId"
+            />
+          </el-select>
+        </el-form-item>
+        <!--        <el-form-item label="物料小类" prop="materialSubclass">
+                  <el-input v-model="form.materialSubclass" placeholder="请输入物料小类" />
+                </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="processId">
+                  <el-select v-model="form.processId" placeholder="请选择工序">
+                    <el-option
+                      v-for="item in processList"
+                      :key="item.processId"
+                      :label="item.processName"
+                      :value="item.processId"
+                    />
+                  </el-select>
+                </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="BaseMaterialType" lang="ts">
+import { listBaseMaterialType, getBaseMaterialType, delBaseMaterialType, addBaseMaterialType, updateBaseMaterialType } from "@/api/wms/baseMaterialType";
+import { BaseMaterialTypeVO, BaseMaterialTypeQuery, BaseMaterialTypeForm } from '@/api/wms/baseMaterialType/types';
+import {getBaseMaterialCategoryListInWMS} from "@/api/wms/baseMaterialCategory";
+
+type BaseMaterialTypeOption = {
+  matrialTypeId: number;
+  matrialTypeName: string;
+  children?: BaseMaterialTypeOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+
+const { active_flag   } = toRefs<any>(proxy?.useDict('active_flag'  ));
+
+const baseMaterialTypeList = ref<BaseMaterialTypeVO[]>([]);
+const baseMaterialTypeOptions = ref<BaseMaterialTypeOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseMaterialTypeFormRef = ref<ElFormInstance>();
+const baseMaterialTypeTableRef = ref<ElTableInstance>()
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: BaseMaterialTypeForm = {
+    matrialTypeId: undefined,
+    parentId: undefined,
+    matrialTypeCode: undefined,
+    matrialTypeName: undefined,
+    ancestors: undefined,
+    materialCategoryId: undefined,
+    materialSubclass: undefined,
+    processId: undefined,
+    activeFlag: '1',
+    remark: undefined,
+}
+
+const data = reactive<PageData<BaseMaterialTypeForm, BaseMaterialTypeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    matrialTypeId: undefined,
+    parentId: undefined,
+    matrialTypeCode: undefined,
+    matrialTypeName: undefined,
+    ancestors: undefined,
+    materialCategoryId: undefined,
+    materialSubclass: undefined,
+    processId: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+/*    matrialTypeId: [
+      { required: true, message: "物料类型ID不能为空", trigger: "blur" }
+    ],*/
+    parentId: [
+      { required: true, message: "父级标识不能为空", trigger: "blur" }
+    ],
+    matrialTypeCode: [
+      { required: true, message: "物料类型编号不能为空", trigger: "blur" }
+    ],
+    matrialTypeName: [
+      { required: true, message: "物料类型名称不能为空", trigger: "blur" }
+    ],
+   /* ancestors: [
+      { required: true, message: "祖级列表不能为空", trigger: "blur" }
+    ],
+    materialCategories: [
+      { required: true, message: "物料大类(1原材料  2半成品 3成品)不能为空", trigger: "change" }
+    ],
+    materialSubclass: [
+      { required: true, message: "物料小类不能为空", trigger: "blur" }
+    ],
+    processId: [
+      { required: true, message: "工序ID不能为空", trigger: "blur" }
+    ],
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "change" }
+    ],
+    remark: [
+      { required: true, message: "备注不能为空", trigger: "blur" }
+    ],*/
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物料类型信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseMaterialType(queryParams.value);
+  const data = proxy?.handleTree<BaseMaterialTypeVO>(res.data, "matrialTypeId", "parentId");
+  if (data) {
+    baseMaterialTypeList.value = data;
+    loading.value = false;
+  }
+}
+
+// let processList = ref([]);
+//   /*获取工序下拉框*/
+//   const getProcessSelect = async () => {
+//   let res = await getProcessInfoList(null);
+//   processList.value = res.data;
+// };
+
+/** 查询物料类型信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listBaseMaterialType();
+  baseMaterialTypeOptions.value = [];
+  const data: BaseMaterialTypeOption = { matrialTypeId: 0, matrialTypeName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<BaseMaterialTypeOption>(res.data, "matrialTypeId", "parentId");
+  baseMaterialTypeOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  baseMaterialTypeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: BaseMaterialTypeVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.matrialTypeId) {
+    form.value.parentId = row.matrialTypeId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加物料类型信息";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(baseMaterialTypeList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: BaseMaterialTypeVO[], status: boolean) => {
+  data.forEach((item) => {
+    baseMaterialTypeTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: BaseMaterialTypeVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getBaseMaterialType(row.matrialTypeId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改物料类型信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMaterialTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.matrialTypeId) {
+        await updateBaseMaterialType(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addBaseMaterialType(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: BaseMaterialTypeVO) => {
+  await proxy?.$modal.confirm('是否确认删除物料类型信息编号为"' + row.matrialTypeId + '"的数据项？');
+  loading.value = true;
+  await delBaseMaterialType(row.matrialTypeId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+
+let materialCategoryList = ref([]);
+const getMaterialCategory = async () => {
+  const res = await getBaseMaterialCategoryListInWMS(null);
+  materialCategoryList.value = res.data;
+}
+
+
+onMounted(() => {
+  getMaterialCategory();
+  // getProcessSelect();
+  getList();
+});
+</script>

src/views/wms/baseMeasurementUnitInfo/index.vue

@@ -0,0 +1,351 @@
+<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="unitId">
+              <el-input v-model="queryParams.unitId" placeholder="请输入主键标识" 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="unitCode" label-width="100px">
+              <el-input v-model="queryParams.unitCode" placeholder="请输入计量单位编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="计量单位名称" prop="unitName">
+              <el-input v-model="queryParams.unitName" placeholder="请输入计量单位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="计量单位转换" prop="unitConversion">
+              <el-input v-model="queryParams.unitConversion" 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="unitType">
+              <el-select v-model="queryParams.unitType" placeholder="请选择单位类型" clearable>
+                <el-option v-for="dict in unit_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" 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="['mes:baseMeasurementUnitInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="baseMeasurementUnitInfoTableRef"
+        v-loading="loading"
+        :data="baseMeasurementUnitInfoList"
+        row-key="unitId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="主键标识" align="center" prop="unitId" />-->
+<!--        <el-table-column label="父级标识" prop="parentId" />-->
+        <el-table-column label="计量单位编号" align="center" prop="unitCode" />
+        <el-table-column label="计量单位名称" align="center" prop="unitName" />
+        <el-table-column label="计量单位转换" align="center" prop="unitConversion" />
+<!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+        <el-table-column label="单位类型" align="center" prop="unitType">
+          <template #default="scope">
+            <dict-tag :options="unit_type" :value="scope.row.unitType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</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="['mes:baseMeasurementUnitInfo:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMeasurementUnitInfo:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMeasurementUnitInfo:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改计量单位信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseMeasurementUnitInfoFormRef" :model="form" :rules="rules" label-width="120px">
+<!--        <el-form-item label="主键标识" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="父级标识" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="baseMeasurementUnitInfoOptions"
+            :props="{ value: 'unitId', label: 'unitName', children: 'children' }"
+            value-key="unitId"
+            placeholder="请选择父级标识"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="计量单位编号" prop="unitCode">
+          <el-input v-model="form.unitCode" placeholder="请输入计量单位编号" />
+        </el-form-item>
+        <el-form-item label="计量单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入计量单位名称" />
+        </el-form-item>
+        <el-form-item label="计量单位转换" prop="unitConversion">
+<!--          <el-input v-model="form.unitConversion" placeholder="请输入计量单位转换" />-->
+          <el-input-number v-model="form.unitConversion"   />
+        </el-form-item>
+<!--        <el-form-item label="祖级列表" prop="ancestors">
+          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
+        </el-form-item>-->
+        <el-form-item label="单位类型" prop="unitType">
+          <el-select v-model="form.unitType" placeholder="请选择单位类型">
+            <el-option
+              v-for="dict in unit_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </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="BaseMeasurementUnitInfo" lang="ts">
+import { listBaseMeasurementUnitInfo, getBaseMeasurementUnitInfo, delBaseMeasurementUnitInfo, addBaseMeasurementUnitInfo, updateBaseMeasurementUnitInfo } from "@/api/wms/baseMeasurementUnitInfo";
+import { BaseMeasurementUnitInfoVO, BaseMeasurementUnitInfoQuery, BaseMeasurementUnitInfoForm } from '@/api/wms/baseMeasurementUnitInfo/types';
+
+type BaseMeasurementUnitInfoOption = {
+  unitId: number;
+  unitName: string;
+  children?: BaseMeasurementUnitInfoOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+
+const { unit_type } = toRefs<any>(proxy?.useDict('unit_type'));
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const baseMeasurementUnitInfoList = ref<BaseMeasurementUnitInfoVO[]>([]);
+const baseMeasurementUnitInfoOptions = ref<BaseMeasurementUnitInfoOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseMeasurementUnitInfoFormRef = ref<ElFormInstance>();
+const baseMeasurementUnitInfoTableRef = ref<ElTableInstance>()
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: BaseMeasurementUnitInfoForm = {
+    unitId: undefined,
+    parentId: undefined,
+    unitCode: undefined,
+    unitName: undefined,
+    unitConversion: undefined,
+    ancestors: undefined,
+    unitType: undefined,
+    remark: undefined,
+    activeFlag: '1',
+}
+
+const data = reactive<PageData<BaseMeasurementUnitInfoForm, BaseMeasurementUnitInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    unitId: undefined,
+    parentId: undefined,
+    unitCode: undefined,
+    unitName: undefined,
+    unitConversion: undefined,
+    ancestors: undefined,
+    unitType: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    unitCode: [
+      { required: true, message: "计量单位编号不能为空", trigger: "blur" }
+    ],
+    unitName: [
+      { required: true, message: "计量单位名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询计量单位信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseMeasurementUnitInfo(queryParams.value);
+  const data = proxy?.handleTree<BaseMeasurementUnitInfoVO>(res.data, "unitId", "parentId");
+  if (data) {
+    baseMeasurementUnitInfoList.value = data;
+    loading.value = false;
+  }
+}
+
+/** 查询计量单位信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listBaseMeasurementUnitInfo();
+  baseMeasurementUnitInfoOptions.value = [];
+  const data: BaseMeasurementUnitInfoOption = { unitId: 0, unitName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<BaseMeasurementUnitInfoOption>(res.data, "unitId", "parentId");
+  baseMeasurementUnitInfoOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  baseMeasurementUnitInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: BaseMeasurementUnitInfoVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.unitId) {
+    form.value.parentId = row.unitId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加计量单位信息";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(baseMeasurementUnitInfoList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: BaseMeasurementUnitInfoVO[], status: boolean) => {
+  data.forEach((item) => {
+    baseMeasurementUnitInfoTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: BaseMeasurementUnitInfoVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getBaseMeasurementUnitInfo(row.unitId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改计量单位信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMeasurementUnitInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.unitId) {
+        await updateBaseMeasurementUnitInfo(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addBaseMeasurementUnitInfo(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: BaseMeasurementUnitInfoVO) => {
+  await proxy?.$modal.confirm('是否确认删除计量单位信息编号为"' + row.unitId + '"的数据项？');
+  loading.value = true;
+  await delBaseMeasurementUnitInfo(row.unitId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/wms/instockOrderCopy/backup.vue

@@ -583,7 +583,7 @@ import {
   getMaterialList, getInstockMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
+import MaterialSelectInWMS from "@/views/wms/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 

src/views/wms/instockOrderCopy/index.vue

@@ -6,15 +6,15 @@
           <el-input v-model="queryForm.instockCode" placeholder="输入调拨单号" clearable/>
         </el-form-item>
         <el-form-item label="工单类型" prop="instockType">
-          <el-select v-model="queryForm.instockType" placeholder="请选择工单类型(1采购订单,2生产订单,3手工,4系统生成)" clearable >
+          <el-select v-model="queryForm.instockType" placeholder="请选择工单类型" clearable >
             <el-option v-for="dict in wms_instock_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="入库方式" prop="instockMethond">
-          <el-select v-model="queryForm.instockMethond" placeholder="请选择入库方式" clearable >
-            <el-option v-for="dict in instock_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="入库方式" prop="instockMethond">-->
+<!--          <el-select v-model="queryForm.instockMethond" placeholder="请选择入库方式" clearable >-->
+<!--            <el-option v-for="dict in instock_methond" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="审核状态" prop="auditStatus">
           <el-select v-model="queryForm.auditStatus" placeholder="请选择审核状态" clearable >
             <el-option v-for="dict in approve_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -426,7 +426,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工单类型" prop="instockType">
-          <el-select v-model="parentTableInfoForm.instockType" placeholder="请选择工单类型(1采购订单,2生产订单,3手工,4系统生成)">
+          <el-select v-model="parentTableInfoForm.instockType" placeholder="请选择工单类型">
             <el-option
               v-for="dict in wms_instock_type"
               :key="dict.value"
@@ -448,7 +448,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="parentTableInfoForm.warehouseCode" placeholder="请选择所属仓库" :disabled="true">
             <el-option
               v-for="item in baseStoreList"
@@ -577,13 +577,13 @@ import {ElMessage, ElMessageBox} from 'element-plus'
 import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
 import {UserVO} from "@/api/system/user/types";
 import {listUser} from "@/api/system/user";
-import { listInstockDetail, getInstockDetail, delInstockDetail, addInstockDetail, updateInstockDetail, getMaterialListVo } from '@/api/wms/instockDetail';
+import { listInstockDetail, getInstockDetail, delInstockDetail, updateInstockDetail, addInstockDetail } from '@/api/wms/instockDetail';
 import { InstockDetailVO, InstockDetailQuery, InstockDetailForm } from '@/api/wms/instockDetail/types';
 import {
   getMaterialList, getInstockMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
+import MaterialSelectInWMS from "@/views/wms/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 
@@ -626,15 +626,31 @@ const parentTableInfoForm = ref({})
 const parentTableApproveForm = ref({})
 const childrenTableInfoForm = ref({})
 
+
 const queryForm = ref({
   instockCode: '',
   materialCategoryId: '',
   materialCategoryName: '',
   warehouseId: '',
   instockType: '',
+  instockMethond: '',
   pageNum: 1,
   pageSize: 10
 })
+
+// 获取路由实例
+const route = useRoute();// 获取路由实例
+// 初始化时获取路由参数并设置到查询表单
+let routeInstockMethondValue = '';
+if (route.query.instockMethond) {
+  // 确保值是字符串类型，如果是数组则取第一个元素
+  const instockMethondValue = Array.isArray(route.query.instockMethond)
+    ? route.query.instockMethond[0]
+    : route.query.instockMethond;
+  queryForm.value.instockMethond = instockMethondValue;
+  routeInstockMethondValue = instockMethondValue; // 保存路由参数值
+}
+
 const parentTableRef = ref()
 const parentTableData = ref([])
 const ids = ref([])
@@ -764,7 +780,8 @@ const query = async () => {
 }
 const reset = () => {
   queryForm.value = {
-    instockId: ''
+    instockId: '',
+    instockMethond: routeInstockMethondValue, // 使用保存的路由参数值
   }
   getParentTable()
 }
@@ -870,18 +887,35 @@ const addDialogTableCell = () => {
 
 // 新增提交
 const dialogSubmit = () => {
+  // 将前端行映射为后端明细字段，并进行基本校验与过滤
+  const detailList = (dialogtable.value || [])
+    .map((item: any) => ({
+      materialId: item.materialId,
+      materialCode: item.materialCode,
+      materialName: item.materialName,
+      materialSpe: item.materialSpec, // 前端 materialSpec -> 后端 materialSpe
+      unitName: item.materialUnit,   // 前端 materialUnit -> 后端 unitName
+      instockQty: item.instockQty,
+      codeYesNo: item.codeYesNo || '0',
+      materialCategoryId: dialogForm.value.materialCategoryId
+    }))
+    .filter(d => d.materialId && d.materialCode && Number(d.instockQty) > 0);
 
-  addInstockOrder(dialogForm.value).then(e => {
-    addInstockDetail(dialogtable.value.map(item => {
-          return {...item, instockCode: e.data.instockCode,instockId: e.data.instockId, materialCategoryId: e.data.materialCategoryId}
-        }
-      )
-    ).then(v => {
-      dialogVisible.value = false
-      getParentTable()
-    })
+  if (!detailList.length) {
+    ElMessage.error('请添加至少一条入库明细且数量>0');
+    return;
+  }
 
-  })
+  const payload: InstockOrderForm = {
+    ...dialogForm.value,
+    detailListBo: detailList
+  };
+
+  addInstockOrder(payload).then(() => {
+    ElMessage.success('保存成功');
+    dialogVisible.value = false;
+    getParentTable();
+  });
 }
 /**
  * 入库单审批
@@ -1000,8 +1034,8 @@ const submitMaterialForm = () => {
         dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId;
         dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName;
         dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
-        dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit;
-        dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec;
+        dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
+        dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
         // 可以根据需要添加更多字段
       }
     }

src/views/wms/instockPrint/index.vue

@@ -38,10 +38,10 @@
             <el-form-item label="物料规格" prop="materialSpe">
               <el-input v-model="queryParams.materialSpe" placeholder="请输入物料规格" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="计量单位名称" prop="unitName">
+            <el-form-item label="计量单位名称" prop="unitName" label-width="120px">
               <el-input v-model="queryParams.unitName" placeholder="请输入计量单位名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否有条码" prop="codeYesNo">
+            <el-form-item label="是否有条码" prop="codeYesNo" label-width="120px">
               <el-select v-model="queryParams.codeYesNo" placeholder="请选择物料大类">
             <el-option
                 v-for="dict in wms_barcode_if"
@@ -111,7 +111,18 @@
           </template>
         </el-table-column>
         <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[12].visible">
-
+        </el-table-column>
+        <!-- <el-table-column label="推荐库位id" align="center" prop="recommendWarehouseId" v-if="inboundStatusdVisble.value">
+        </el-table-column>
+        <el-table-column label="入库状态(0-待入库,1-已入库,2-入库中)" align="center" prop="inboundStatus" v-if="inboundStatusdVisble.value">
+          <template #default="scope">
+            <dict-tag :options="wms_inbound_status" :value="scope.row.inboundStatus"/>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="实际入库时间" align="center" prop="actualInboundTime"  width="120px" v-if="inboundStatusdVisble">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.actualInboundTime, '{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">
@@ -201,27 +212,7 @@ const materialList = ref([]);
 const queryFormRef = ref<ElFormInstance>();
 const instockPrintFormRef = 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: `条码数量`, visible: true },
-        { key: 5, label: `分包数量`, visible: true },
-        { key: 6, label: `物料id`, 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: `物料大类`, visible: true },
-]);
 
 const initFormData: InstockPrintForm = {
   instockPrintId: undefined,
@@ -237,6 +228,9 @@ const initFormData: InstockPrintForm = {
   codeYesNo: undefined,
   materialCategoryId: undefined,
   materialCategoryName: undefined,
+  locationId: undefined,
+  inboundStatus: undefined,
+  actualInboundTime: undefined,
 }
 const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
   form: {...initFormData},
@@ -256,6 +250,9 @@ const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
     codeYesNo: undefined,
     materialCategoryId: undefined,
     materialCategoryName: undefined,//字段映射
+    locationId: undefined,
+    inboundStatus: undefined,
+    actualInboundTime: undefined,
     params: {
     }
   },
@@ -301,6 +298,49 @@ const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
+
+// 获取路由实例
+const route = useRoute();
+// 控制入库状态相关列的显示
+const inboundStatusdVisble = ref(false);
+// 初始化时获取路由参数并设置到查询表单
+let routeInboundStatusValue = '';
+if (route.query.inboundStatus ) {
+  // 确保值是字符串类型，如果是数组则取第一个元素
+  const inboundStatusdValue = Array.isArray(route.query.inboundStatus )
+    ? route.query.inboundStatus[0]
+    : route.query.inboundStatus;
+  queryParams.value.inboundStatus = inboundStatusdValue;
+  routeInboundStatusValue = inboundStatusdValue; // 保存路由参数值
+  // 设置入库状态相关列显示
+  inboundStatusdVisble.value = true;
+}
+
+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: `条码数量`, visible: true },
+  { key: 5, label: `分包数量`, visible: true },
+  { key: 6, label: `物料id`, 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: `物料大类`, visible: true },
+  // { key: 13, label: `推荐库位id`, visible: inboundStatusdVisble.value },
+  // { key: 14, label: `入库状态(0-待入库,1-已入库,2-入库中)`, visible: inboundStatusdVisble.value },
+  // { key: 15, label: `实际入库时间`, visible: inboundStatusdVisble.value },
+]);
+
 /** 查询入库单-物料打印条码列表 */
 const getList = async () => {
   loading.value = true;
@@ -319,18 +359,21 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = {...initFormData};
+  queryParams.value.inboundStatus = routeInboundStatusValue;
   instockPrintFormRef.value?.resetFields();
 }
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
+  queryParams.value.inboundStatus = routeInboundStatusValue;
   getList();
 }
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  queryParams.value.inboundStatus = routeInboundStatusValue;
   handleQuery();
 }
 

src/views/wms/linkage/index.vue

@@ -444,7 +444,7 @@ import {
   getMaterialList, viewAllocateOrderDetail, delAllocateOrderDetail, allocateOrderUpdate
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
+import MaterialSelectInWMS from "@/views/wms/baseMaterialInfo/addMaterialInWMS.vue";
 
 import {reactive} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'

src/views/wms/outstockDetail/index.vue

@@ -4,24 +4,24 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="表主键" prop="outstockDetailId">
-              <el-input v-model="queryParams.outstockDetailId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="出库单号" prop="outstockCode">
-              <el-input v-model="queryParams.outstockCode" placeholder="请输入出库单号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="出库单 主键" prop="outstockId">
-              <el-input v-model="queryParams.outstockId" 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="outstockQty">
-              <el-input v-model="queryParams.outstockQty" placeholder="请输入出库数量" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="物料大类" prop="materialCategoryId">
-              <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+<!--            <el-form-item label="表主键" prop="outstockDetailId">-->
+<!--              <el-input v-model="queryParams.outstockDetailId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="出库单号" prop="outstockCode">-->
+<!--              <el-input v-model="queryParams.outstockCode" placeholder="请输入出库单号" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="出库单 主键" prop="outstockId">-->
+<!--              <el-input v-model="queryParams.outstockId" 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="outstockQty">-->
+<!--              <el-input v-model="queryParams.outstockQty" placeholder="请输入出库数量" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="物料大类" prop="materialCategoryId">-->
+<!--              <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" 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>
@@ -55,11 +55,17 @@
         <!-- <el-table-column label="表主键" align="center" prop="outstockDetailId" v-if="columns[0].visible"/> -->
         <el-table-column label="出库单号" align="center" prop="outstockCode" v-if="columns[1].visible"/>
         <!-- <el-table-column label="出库单 主键" align="center" prop="outstockId" v-if="columns[2].visible"/> -->
-        <el-table-column label="物料" align="center" prop="materialCode" v-if="columns[4].visible"/>
+        <el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[4].visible"/>
         <el-table-column label="出库数量" align="center" prop="outstockQty" v-if="columns[5].visible"/>
         <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[6].visible">
-
         </el-table-column>
+        <el-table-column label="完成数量" align="center" prop="completeQty" v-if="columns[7].visible"/>
+        <el-table-column label="AGV状态" align="center" prop="agvStatus" v-if="columns[8].visible">
+          <template #default="scope">
+            <dict-tag :options="agv_status" :value="scope.row.agvStatus"/>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -124,6 +130,12 @@ import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
+const {
+  agv_status,
+  is_agv
+} = toRefs<any>(proxy?.useDict('agv_status', 'is_agv'));
+
+
 const outstockDetailList = ref<OutstockDetailVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -151,6 +163,8 @@ const columns = ref<FieldOption[]>([
         { key: 4, label: `物料id`, visible: true },
         { key: 5, label: `出库数量`, visible: true },
         { key: 6, label: `物料大类`, visible: true },
+        { key: 7, label: `完成数量`, visible: true },
+        { key: 8, label: `AGV状态`, visible: true },
 ]);
 
 const initFormData: OutstockDetailForm = {
@@ -159,7 +173,10 @@ const initFormData: OutstockDetailForm = {
   outstockId: undefined,
   materialId: undefined,
   outstockQty: undefined,
-  materialCategoryId: undefined
+  materialCategoryId: undefined,
+  agvStatus: undefined,
+  completeQty: undefined,
+  isAgv: undefined,
 }
 const data = reactive<PageData<OutstockDetailForm, OutstockDetailQuery>>({
   form: {...initFormData},
@@ -173,33 +190,50 @@ const data = reactive<PageData<OutstockDetailForm, OutstockDetailQuery>>({
     outstockQty: undefined,
     materialCategoryId: undefined,
   materialCategoryName: undefined,//字段映射
+    agvStatus: undefined,
+    completeQty: undefined,
+    isAgv: undefined,
     params: {
     }
   },
   rules: {
-    outstockDetailId: [
-      { required: true, message: "表主键不能为空", trigger: "blur" }
-    ],
-    outstockCode: [
-      { required: true, message: "出库单号不能为空", trigger: "blur" }
-    ],
-    outstockId: [
-      { required: true, message: "出库单 主键不能为空", trigger: "blur" }
-    ],
-    materialId: [
-      { required: true, message: "物料id不能为空", trigger: "blur" }
-    ],
-    outstockQty: [
-      { required: true, message: "出库数量不能为空", trigger: "blur" }
-    ],
-    materialCategoryId: [
-      { required: true, message: "物料大类不能为空", trigger: "blur" }
-    ]
+    // outstockDetailId: [
+    //   { required: true, message: "表主键不能为空", trigger: "blur" }
+    // ],
+    // outstockCode: [
+    //   { required: true, message: "出库单号不能为空", trigger: "blur" }
+    // ],
+    // outstockId: [
+    //   { required: true, message: "出库单 主键不能为空", trigger: "blur" }
+    // ],
+    // materialId: [
+    //   { required: true, message: "物料id不能为空", trigger: "blur" }
+    // ],
+    // outstockQty: [
+    //   { required: true, message: "出库数量不能为空", trigger: "blur" }
+    // ],
+    // materialCategoryId: [
+    //   { required: true, message: "物料大类不能为空", trigger: "blur" }
+    // ]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
+
+// 获取路由实例
+const route = useRoute();// 获取路由实例
+// 初始化时获取路由参数并设置到查询表单
+let routeIsAgvValue = '';
+if (route.query.isAgv) {
+  // 确保值是字符串类型，如果是数组则取第一个元素
+  const isAgvValue = Array.isArray(route.query.isAgv)
+    ? route.query.isAgv[0]
+    : route.query.isAgv;
+  queryParams.value.isAgv = isAgvValue;
+  routeIsAgvValue = isAgvValue; // 保存路由参数值
+}
+
 /** 查询出库单-物料列表 */
 const getList = async () => {
   loading.value = true;
@@ -235,6 +269,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = {...initFormData};
+  queryParams.value.isAgvValue = routeIsAgvValue;
   outstockDetailFormRef.value?.resetFields();
 }
 

src/views/wms/outstockOrderCopy/index.vue

@@ -484,7 +484,7 @@ import {
   getMaterialList
 } from '@/api/wms/linkage'
 
-import MaterialSelectInWMS from "@/views/mes/baseMaterialInfo/addMaterialInWMS.vue";
+import MaterialSelectInWMS from "@/views/wms/baseMaterialInfo/addMaterialInWMS.vue";
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
 

src/views/wms/returnOrder/index.vue

@@ -1,53 +1,58 @@
 <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">
+  <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="roId">
               <el-input v-model="queryParams.roId" 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 label="物料名称" prop="materialId">
+              <el-input v-model="queryParams.materialId" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="物料大类" prop="materialCategoryId">
-              <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >
-                                   <el-option v-for="item in mategoryOptions"
-                           :key="item.materialCategoryId"
-                           :label="item.materialCategoryName"
-                           :value="item.materialCategoryId"
+            <el-form-item label='物料大类' prop='materialCategoryId'>
+              <el-select v-model='queryParams.materialCategoryId' placeholder='请选择物料大类' clearable>
+                <el-option v-for='item in mategoryOptions'
+                           :key='item.materialCategoryId'
+                           :label='item.materialCategoryName'
+                           :value='item.materialCategoryId'
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="批次条码" prop="batchCode">
-              <el-input v-model="queryParams.batchCode" placeholder="请输入批次条码" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='批次条码' prop='batchCode'>
+              <el-input v-model='queryParams.batchCode' placeholder='请输入批次条码' clearable
+                        @keyup.enter='handleQuery' />
             </el-form-item>
             <!-- <el-form-item label="计划数量" prop="planAmount">
               <el-input v-model="queryParams.planAmount" placeholder="请输入计划数量" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="仓库" prop="warehouseId">
-              <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库">
-            <el-option
-              v-for="item in baseStoreList"
-              :key="item.warehouseId"
-              :label="item.warehouseName"
-              :value="item.warehouseId"
-            ></el-option>
-          </el-select>
+            <el-form-item label='仓库' prop='warehouseId'>
+              <el-select v-model='queryParams.warehouseId' 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="planLocationCode">
-              <el-input v-model="queryParams.planLocationCode" placeholder="请输入计划退库库位" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='计划库位' prop='planLocationCode'>
+              <el-input v-model='queryParams.planLocationCode' placeholder='请输入计划退库库位' clearable
+                        @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label="退库状态" prop="orderStatus">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择退库工单状态" clearable >
-                <el-option v-for="dict in wms_return_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <el-form-item label='退库状态' prop='orderStatus'>
+              <el-select v-model='queryParams.orderStatus' placeholder='请选择退库工单状态' clearable>
+                <el-option v-for='dict in wms_return_status' :key='dict.value' :label='dict.label'
+                           :value='dict.value' />
               </el-select>
             </el-form-item>
             <!-- <el-form-item label="实际数量" prop="returnAmount">
               <el-input v-model="queryParams.returnAmount" placeholder="请输入实际数量" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="实际库位" prop="returnLocationCode">
-              <el-input v-model="queryParams.returnLocationCode" placeholder="请输入实际退库库位" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='实际库位' prop='returnLocationCode'>
+              <el-input v-model='queryParams.returnLocationCode' 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" />
@@ -68,74 +73,81 @@
             <!-- <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 erp_synchronous_status" :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 erp_synchronous_status' :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-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">
+    <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:returnOrder:add']">新增</el-button>
-          </el-col>
+        <el-row :gutter='10' class='mb8'>
+          <!--
           <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:returnOrder:edit']">修改</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:returnOrder:remove']">删除</el-button>
-          </el-col> -->
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:returnOrder:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          -->
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['system:returnOrder:add']">
+              创建退库单
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['system:returnOrder: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="returnOrderList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+      <el-table v-loading='loading' :data='returnOrderList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
         <!-- <el-table-column label="表主键" align="center" prop="roId" v-if="columns[0].visible"/> -->
-        <el-table-column label="物料ID" align="center" prop="materialCode" v-if="columns[6].visible"/>
-        <el-table-column label="物料大类" align="center" prop="materialCategoryName" v-if="columns[7].visible">
-
-        </el-table-column>
-        <el-table-column label="批次条码" align="center" prop="batchCode" v-if="columns[8].visible"/>
-        <el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[9].visible"/>
+        <el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[6].visible' width='100'/>
+        <el-table-column label='物料大类' align='center' prop='materialCategoryName' v-if='columns[7].visible' />
+        <el-table-column label='批次条码' align='center' prop='batchCode' v-if='columns[8].visible' width='120'/>
+        <el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[9].visible' width='100'/>
         <!-- <el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[10].visible"/> -->
-        <el-table-column label="计划退库库位" align="center" prop="planLocationCode" v-if="columns[11].visible"/>
-        <el-table-column label="退库工单状态" align="center" prop="orderStatus" v-if="columns[12].visible">
-          <template #default="scope">
-            <dict-tag :options="wms_return_status" :value="scope.row.orderStatus"/>
+        <el-table-column label='计划退库库位' align='center' prop='planLocationCode' v-if='columns[11].visible' width='120'/>
+        <el-table-column label='退库工单状态' align='center' prop='orderStatus' v-if='columns[12].visible' width='120'>
+          <template #default='scope'>
+            <dict-tag :options='wms_return_status' :value='scope.row.orderStatus' />
           </template>
         </el-table-column>
-        <el-table-column label="实际数量" align="center" prop="returnAmount" v-if="columns[13].visible"/>
-        <el-table-column label="实际退库库位" align="center" prop="returnLocationCode" v-if="columns[14].visible"/>
-        <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[15].visible"/>
-        <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[16].visible">
-          <template #default="scope">
+        <el-table-column label='实际数量' align='center' prop='returnAmount' v-if='columns[13].visible' />
+        <el-table-column label='实际退库库位' align='center' prop='returnLocationCode' v-if='columns[14].visible' width='120'/>
+        <el-table-column label='退库原因' align='center' prop='returnReason' v-if='columns[21].visible' width='120'/>
+        <el-table-column label='审核人' align='center' prop='auditBy' v-if='columns[15].visible' />
+        <el-table-column label='审核时间' align='center' prop='auditTime' width='180' v-if='columns[16].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[17].visible"/>
-        <el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[18].visible"/>
-        <el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[19].visible">
-          <template #default="scope">
-            <dict-tag :options="erp_synchronous_status" :value="scope.row.erpSynchronousStatus"/>
+        <el-table-column label='审核状态' align='center' prop='auditStatus' v-if='columns[17].visible' />
+        <el-table-column label='审核意见' align='center' prop='auditComments' v-if='columns[18].visible' />
+        <el-table-column label='erp同步状态' align='center' prop='erpSynchronousStatus' v-if='columns[19].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[20].visible"/>
+        <el-table-column label='erp同步数量' align='center' prop='erpSynchronousQty' v-if='columns[20].visible' />
         <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -148,37 +160,58 @@
         </el-table-column> -->
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <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="returnOrderFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="表主键" prop="roId">
-          <el-input v-model="form.roId" 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="materialCategoryId">
-          <el-select v-model="form.materialCategoryId" placeholder="请选择物料大类">
-                                   <el-option v-for="item in mategoryOptions"
-                           :key="item.materialCategoryId"
-                           :label="item.materialCategoryName"
-                           :value="item.materialCategoryId"
-                />
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='returnOrderFormRef' :model='form' :rules='rules' label-width='130px'>
+        <el-form-item label='物料大类' prop='materialCategoryId'>
+          <el-select v-model='form.materialCategoryId' placeholder='请选择物料大类'>
+            <el-option v-for='item in mategoryOptions'
+                       :key='item.materialCategoryId'
+                       :label='item.materialCategoryName'
+                       :value='item.materialCategoryId'
+            />
           </el-select>
         </el-form-item>
-        <el-form-item label="批次条码" prop="batchCode">
-          <el-input v-model="form.batchCode" placeholder="请输入批次条码" />
+        <el-form-item label='物料名称' prop='materialId'>
+          <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
+            <template #append>
+              <el-icon class='el-input__icon'>
+                <search />
+              </el-icon>
+            </template>
+          </el-input>
         </el-form-item>
-        <el-form-item label="计划数量" prop="planAmount">
-          <el-input v-model="form.planAmount" placeholder="请输入计划数量" />
+        <el-form-item label='批次条码' prop='batchCode'>
+          <el-input v-model='form.batchCode' placeholder='请输入批次条码' />
         </el-form-item>
-        <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+        <el-form-item label='计划数量' prop='planAmount'>
+          <el-input-number v-model='form.planAmount' placeholder='请输入计划数量' style="width: 220px;"/>
         </el-form-item>
-        <el-form-item label="计划退库库位" prop="planLocationCode">
-          <el-input v-model="form.planLocationCode" placeholder="请输入计划退库库位" />
+        <el-form-item label='仓库名称' prop='warehouseId'>
+          <el-select v-model='form.warehouseId' 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='planLocationCode'>
+          <el-select v-model='form.planLocationCode' placeholder='请选择所属仓库'>
+            <el-option
+              v-for='item in locationList'
+              :key='item.locationCode'
+              :label='item.locationCode'
+              :value='item.locationCode'
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label='退库原因' prop='returnReason'>
+          <el-input v-model='form.returnReason' type='textarea' placeholder='请输入退库原因' />
         </el-form-item>
         <!-- <el-form-item label="退库工单状态" prop="orderStatus">
           <el-radio-group v-model="form.orderStatus">
@@ -189,12 +222,12 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item> -->
-        <el-form-item label="实际数量" prop="returnAmount">
-          <el-input v-model="form.returnAmount" placeholder="请输入实际数量" />
-        </el-form-item>
-        <el-form-item label="实际退库库位" prop="returnLocationCode">
-          <el-input v-model="form.returnLocationCode" placeholder="请输入实际退库库位" />
-        </el-form-item>
+<!--        <el-form-item label='实际数量' prop='returnAmount'>-->
+<!--          <el-input-number v-model='form.returnAmount' placeholder='请输入实际数量' style="width: 220px;"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label='实际退库库位' prop='returnLocationCode'>-->
+<!--          <el-input v-model='form.returnLocationCode' placeholder='请输入实际退库库位' />-->
+<!--        </el-form-item>-->
         <!-- <el-form-item label="审核人" prop="auditBy">
           <el-input v-model="form.auditBy" placeholder="请输入审核人" />
         </el-form-item>
@@ -232,24 +265,52 @@
         </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 class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
         </div>
       </template>
     </el-dialog>
+
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title="选择物料信息" v-model="materialOpen" width='1200px' append-to-body>
+      <MaterialSelectInWMS
+        @selection="handleSelection"
+        ref="materialSelectRef"
+        v-if="materialOpen"
+        :materialCategoryId="form.materialCategoryId"
+      ></MaterialSelectInWMS>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
+        <el-button @click="materialOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
-<script setup name="ReturnOrder" lang="ts">
-import { listReturnOrder, getReturnOrder, delReturnOrder, addReturnOrder, updateReturnOrder } from '@/api/wms/returnOrder';
+<script setup name='ReturnOrder' lang='ts'>
+import {
+  listReturnOrder,
+  getReturnOrder,
+  delReturnOrder,
+  addReturnOrder,
+  updateReturnOrder
+} from '@/api/wms/returnOrder';
 import { ReturnOrderVO, ReturnOrderQuery, ReturnOrderForm } from '@/api/wms/returnOrder/types';
-import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
+import { getBaseWarehouseList } from '@/api/wms/baseWarehouse';
 
 import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+import MaterialSelectInWMS from '@/views/mes/baseMaterialInfo/addMaterialInWMS.vue';
+import { getBaseDeviceTypeList } from '@/api/mes/baseDeviceType';
+import { getWmsBaseLocationVoList } from '@/api/wms/baseLocation';
 
 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'));
+const {
+  wms_return_status,
+  erp_synchronous_status,
+  approve_status
+} = toRefs<any>(proxy?.useDict('wms_return_status', 'erp_synchronous_status', 'approve_status'));
 const returnOrderList = ref<ReturnOrderVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -267,29 +328,51 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+const materialOpen = ref(false);//物料选择对话框显示
+
+const selectedMaterial = ref(null); // 存储选中的物料完整信息
+
+/** 处理从MaterialSelect组件接收到的选择 */
+const handleSelection = (row) => {
+  selectedMaterial.value = row;
+};
+
+const materialSelectRef = ref();//物料选择对话框绑定
+
+// 获取仓库
+const getSelectBaseWarehouseList = async () => {
+  let res = await getBaseWarehouseList({ deviceCategoryId: 1 });
+  baseStoreList.value = res.data;
+};
+
+
+
+
+
 // 列显隐信息
 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: `实际退库人`, visible: true },
-        { key: 5, label: `实际退库时间`, visible: true },
-        { key: 6, label: `物料ID`, visible: true },
-        { key: 7, label: `物料大类`, visible: true },
-        { key: 8, label: `批次条码`, visible: true },
-        { key: 9, label: `计划数量`, visible: true },
-        { key: 10, label: `仓库ID`, 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 },
-        { key: 19, label: `erp同步状态`, visible: true },
-        { key: 20, label: `erp同步数量`, visible: true },
+  { key: 0, label: `表主键`, visible: true },
+  { key: 1, label: `租户号`, 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: `物料名称`, 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: `退库工单状态`, 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 },
+  { key: 19, label: `erp同步状态`, visible: true },
+  { key: 20, label: `erp同步数量`, visible: true },
+  { key: 21, label: `退库原因`, visible: true },
 ]);
 
 const initFormData: ReturnOrderForm = {
@@ -310,16 +393,16 @@ const initFormData: ReturnOrderForm = {
   auditComments: undefined,
   erpSynchronousStatus: undefined,
   erpSynchronousQty: undefined
-}
+};
 const data = reactive<PageData<ReturnOrderForm, ReturnOrderQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     roId: undefined,
     materialId: undefined,
     materialCategoryId: undefined,
-  materialCategoryName: undefined,//字段映射
+    materialCategoryName: undefined,//字段映射
     batchCode: undefined,
     planAmount: undefined,
     warehouseId: undefined,
@@ -333,63 +416,58 @@ const data = reactive<PageData<ReturnOrderForm, ReturnOrderQuery>>({
     auditComments: undefined,
     erpSynchronousStatus: undefined,
     erpSynchronousQty: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    roId: [
-      { required: true, message: "表主键不能为空", trigger: "blur" }
-    ],
     materialId: [
-      { required: true, message: "物料ID不能为空", trigger: "blur" }
+      { required: true, message: '物料名称不能为空', trigger: 'blur' }
     ],
     materialCategoryId: [
-      { required: true, message: "物料大类不能为空", trigger: "blur" }
+      { required: true, message: '物料大类不能为空', trigger: 'blur' }
     ],
     batchCode: [
-      { required: true, message: "批次条码不能为空", trigger: "blur" }
+      { required: true, message: '批次条码不能为空', trigger: 'blur' }
     ],
     planAmount: [
-      { required: true, message: "计划数量不能为空", trigger: "blur" }
+      { required: true, message: '计划数量不能为空', trigger: 'blur' }
     ],
     warehouseId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: '仓库名称不能为空', trigger: 'blur' }
     ],
     planLocationCode: [
-      { required: true, message: "计划退库库位不能为空", trigger: "blur" }
+      { required: true, message: '计划退库库位不能为空', trigger: 'blur' }
     ],
     orderStatus: [
-      { required: true, message: "退库工单状态不能为空", trigger: "change" }
+      { required: true, message: '退库工单状态不能为空', trigger: 'change' }
     ],
-    returnAmount: [
-      { required: true, message: "实际数量不能为空", trigger: "blur" }
-    ],
-    returnLocationCode: [
-      { 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 locationList = ref([]);
+const getBaseLocationList = async (warehouseId: any) => {
+  if (!warehouseId) {
+    locationList.value = [];
+    return;
+  }
+  try {
+    const res = await getWmsBaseLocationVoList({ warehouseId });
+    locationList.value = res.data || [];
+  } catch (error) {
+    console.error('获取库位列表失败:', error);
+    locationList.value = [];
+  }
+};
+
+watch(
+  () => form.value.warehouseId,
+  (newVal) => {
+    getBaseLocationList(newVal);
+  }
+);
+
 /** 查询退库工单列表 */
 const getList = async () => {
   loading.value = true;
@@ -397,58 +475,55 @@ const getList = async () => {
   returnOrderList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
-// 获取仓库
-getBaseWarehouseList().then(e => {
-  baseStoreList.value = e.data
-})
+};
+
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   returnOrderFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: ReturnOrderVO[]) => {
   ids.value = selection.map(item => item.roId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
-/** 新增按钮操作 */
+/** 创建退库单按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加退库工单";
-}
+  dialog.title = '创建退库工单';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ReturnOrderVO) => {
   reset();
-  const _roId = row?.roId || ids.value[0]
+  const _roId = row?.roId || ids.value[0];
   const res = await getReturnOrder(_roId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改退库工单";
-}
+  dialog.title = '修改退库工单';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -456,32 +531,32 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.roId) {
-        await updateReturnOrder(form.value).finally(() =>  buttonLoading.value = false);
+        await updateReturnOrder(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addReturnOrder(form.value).finally(() =>  buttonLoading.value = false);
+        await addReturnOrder(form.value).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: ReturnOrderVO) => {
   const _roIds = row?.roId || ids.value;
   await proxy?.$modal.confirm('是否确认删除退库工单编号为"' + _roIds + '"的数据项？').finally(() => loading.value = false);
   await delReturnOrder(_roIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('wms/returnOrder/export', {
     ...queryParams.value
-  }, `returnOrder_${new Date().getTime()}.xlsx`)
-}
+  }, `returnOrder_${new Date().getTime()}.xlsx`);
+};
 
 
 let mategoryOptions = ref([]);
@@ -490,9 +565,23 @@ const getMaterialCategorySelect = async () => {
   mategoryOptions.value = res.data;
 };
 
+/** 新增按钮操作 */
+const handleMaterialAdd = (type, index) => {
+  materialOpen.value = true;
+}
 
+/** 提交物料BOM信息按钮 */
+const submitMaterialForm = () => {
+  selectedMaterial.value = materialSelectRef.value.tableRef.store.states.currentRow.value;
+  form.value.materialId = selectedMaterial.value.materialId;
+  form.value.materialName = selectedMaterial.value.materialName;
+  // 重置选中的物料信息和关闭对话框
+  selectedMaterial.value = null;
+  materialOpen.value = false;
+};
 
 onMounted(() => {
+  getSelectBaseWarehouseList();
   getMaterialCategorySelect();
   getList();
 });

src/views/wms/wmsPurchaseOrderCopy/index.vue

@@ -488,7 +488,7 @@
 
 <script setup name="Linkage" lang="ts">
 
-import MaterialSelectInWMS from '@/views/mes/baseMaterialInfo/addMaterialInWMS.vue';
+import MaterialSelectInWMS from '@/views/wms/baseMaterialInfo/addMaterialInWMS.vue';
 
 import {
   listWmsPurchaseOrder,
@@ -853,8 +853,8 @@ const submitMaterialForm = () => {
         dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId;
         dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName;
         dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
-        dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit;
-        dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec;
+        dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
+        dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
         // 可以根据需要添加更多字段
       }
     }