diff --git a/src/api/wms/outstockDetail/index.ts b/src/api/wms/outstockDetail/index.ts
index 968f429..f725054 100644
--- a/src/api/wms/outstockDetail/index.ts
+++ b/src/api/wms/outstockDetail/index.ts
@@ -2,12 +2,12 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { OutstockDetailVO, OutstockDetailForm, OutstockDetailQuery } from '@/api/wms/outstockDetail/types';
 
+
 /**
  * 查询出库单-物料列表
  * @param query
  * @returns {*}
  */
-
 export const listOutstockDetail = (query?: OutstockDetailQuery): AxiosPromise<OutstockDetailVO[]> => {
   return request({
     url: '/wms/outstockDetail/list',
@@ -61,3 +61,16 @@ export const delOutstockDetail = (outstockDetailId: string | number | Array<stri
     method: 'delete'
   });
 };
+
+/**
+ * 查询出库单-物料列表
+ * @param query
+ * @returns {*}
+ */
+export const getOutstockDetailList = (query?: OutstockDetailQuery): AxiosPromise<OutstockDetailVO[]> => {
+  return request({
+    url: '/wms/outstockDetail/getOutstockDetailList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/wms/outstockDetail/types.ts b/src/api/wms/outstockDetail/types.ts
index 54556e4..6d4a494 100644
--- a/src/api/wms/outstockDetail/types.ts
+++ b/src/api/wms/outstockDetail/types.ts
@@ -53,6 +53,11 @@ export interface OutstockDetailVO {
    */
   agvStatus: string;
 
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue: string;
+
 }
 
 export interface OutstockDetailForm extends BaseEntity {
@@ -104,6 +109,11 @@ export interface OutstockDetailForm extends BaseEntity {
    */
   agvStatus?: string;
 
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue?: string;
+
 }
 
 export interface OutstockDetailQuery extends PageQuery {
@@ -156,6 +166,11 @@ export interface OutstockDetailQuery extends PageQuery {
    */
   agvStatus?: string;
 
+  /**
+   * 是否高价值物料(0否,1是)
+   */
+  isHighValue?: string;
+
 
     /**
      * 日期范围参数
diff --git a/src/api/wms/outstockOrder/index.ts b/src/api/wms/outstockOrder/index.ts
index 95b5c33..4040cf3 100644
--- a/src/api/wms/outstockOrder/index.ts
+++ b/src/api/wms/outstockOrder/index.ts
@@ -2,6 +2,7 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 import { OutstockOrderVO, OutstockOrderForm, OutstockOrderQuery } from '@/api/wms/outstockOrder/types';
 
+
 /**
  * 查询出库单列表
  * @param query
@@ -72,4 +73,18 @@ export const approveOutstockOrder = (data: Partial<OutstockOrderForm>) => {
     method: 'put',
     data: data
   });
-};
\ No newline at end of file
+};
+
+/**
+ * 查询出库单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const getOutstockOrderList = (query?: OutstockOrderQuery): AxiosPromise<OutstockOrderVO[]> => {
+  return request({
+    url: '/wms/outstockOrder/getOutstockOrderList',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index aa6589a..acffb29 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -52,9 +52,9 @@ import { countTaskWaitByCurrentUser } from '@/api/workflow/task';
 
 const badge = ref(1);
 const getBadge = () => {
-  countTaskWaitByCurrentUser().then(e => {
-    badge.value = e.data;
-  });
+  // countTaskWaitByCurrentUser().then(e => {
+  //   badge.value = e.data;
+  // });
 };
 onMounted(() => {
   setInterval(() => {
diff --git a/src/views/wms/allocateOrder/index copy.vue b/src/views/wms/allocateOrder/index copy.vue
index 4cb6a51..a94c3f2 100644
--- a/src/views/wms/allocateOrder/index copy.vue	
+++ b/src/views/wms/allocateOrder/index copy.vue	
@@ -13,16 +13,16 @@
             <el-form-item label="物料大类" prop="materialCategoryId">
               <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="出库仓库ID" prop="planWarehouseId">
-              <el-input v-model="queryParams.planWarehouseId" placeholder="请输入出库仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="出库仓库" prop="planWarehouseId">
+              <el-input v-model="queryParams.planWarehouseId" 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_allocate_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="入库仓库ID" prop="targetWarehouseId">
-              <el-input v-model="queryParams.targetWarehouseId" placeholder="请输入入库仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="入库仓库" prop="targetWarehouseId">
+              <el-input v-model="queryParams.targetWarehouseId" 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" />
@@ -93,13 +93,13 @@
         <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[2].visible">
 
         </el-table-column>
-        <el-table-column label="出库仓库ID" align="center" prop="planWarehouseCode" v-if="columns[3].visible"/>
+        <el-table-column label="出库仓库" align="center" prop="planWarehouseCode" v-if="columns[3].visible"/>
         <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[4].visible">
           <template #default="scope">
             <dict-tag :options="wms_allocate_status" :value="scope.row.orderStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="入库仓库ID" align="center" prop="targetWarehouseCode" v-if="columns[5].visible"/>
+        <el-table-column label="入库仓库" align="center" prop="targetWarehouseCode" v-if="columns[5].visible"/>
         <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[6].visible"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[7].visible">
           <template #default="scope">
@@ -299,9 +299,9 @@ const columns = ref<FieldOption[]>([
         { key: 0, label: `表主键`, visible: true },
         { key: 1, label: `调拨单号`, visible: true },
         { key: 2, label: `物料大类`, visible: true },
-        { key: 3, label: `出库仓库ID`, visible: true },
+        { key: 3, label: `出库仓库`, visible: true },
         { key: 4, label: `工单状态`, visible: true },
-        { key: 5, label: `入库仓库ID`, visible: true },
+        { key: 5, label: `入库仓库`, visible: true },
         { key: 6, label: `审核人`, visible: true },
         { key: 7, label: `审核时间`, visible: true },
         { key: 8, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
@@ -372,13 +372,13 @@ const data = reactive<PageData<AllocateOrderForm, AllocateOrderQuery>>({
       { required: true, message: "物料大类不能为空", trigger: "blur" }
     ],
     planWarehouseId: [
-      { required: true, message: "出库仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "出库仓库不能为空", trigger: "blur" }
     ],
     orderStatus: [
       { required: true, message: "工单状态不能为空", trigger: "change" }
     ],
     targetWarehouseId: [
-      { required: true, message: "入库仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "入库仓库不能为空", trigger: "blur" }
     ],
     auditBy: [
       { required: true, message: "审核人不能为空", trigger: "blur" }
diff --git a/src/views/wms/allocateOrder/index.vue b/src/views/wms/allocateOrder/index.vue
index 7c96d13..c1f4b02 100644
--- a/src/views/wms/allocateOrder/index.vue
+++ b/src/views/wms/allocateOrder/index.vue
@@ -13,16 +13,16 @@
 <!--            <el-form-item label="物料大类" prop="materialCategoryId">
               <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="出库仓库ID" prop="planWarehouseId">
-              <el-input v-model="queryParams.planWarehouseId" placeholder="请输入出库仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="出库仓库" prop="planWarehouseId">
+              <el-input v-model="queryParams.planWarehouseId" 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_allocate_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="入库仓库ID" prop="targetWarehouseId">
-              <el-input v-model="queryParams.targetWarehouseId" placeholder="请输入入库仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="入库仓库" prop="targetWarehouseId">
+              <el-input v-model="queryParams.targetWarehouseId" 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" />
@@ -93,13 +93,13 @@
         <el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[2].visible">
 
         </el-table-column>
-        <el-table-column label="出库仓库ID" align="center" prop="planWarehouseCode" v-if="columns[3].visible"/>
+        <el-table-column label="出库仓库" align="center" prop="planWarehouseCode" v-if="columns[3].visible"/>
         <el-table-column label="工单状态" align="center" prop="orderStatus" v-if="columns[4].visible">
           <template #default="scope">
             <dict-tag :options="wms_allocate_status" :value="scope.row.orderStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="入库仓库ID" align="center" prop="targetWarehouseCode" v-if="columns[5].visible"/>
+        <el-table-column label="入库仓库" align="center" prop="targetWarehouseCode" v-if="columns[5].visible"/>
         <el-table-column label="审核人" align="center" prop="auditBy" v-if="columns[6].visible"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180" v-if="columns[7].visible">
           <template #default="scope">
@@ -301,9 +301,9 @@ const columns = ref<FieldOption[]>([
         { key: 0, label: `表主键`, visible: true },
         { key: 1, label: `调拨单号`, visible: true },
         { key: 2, label: `物料大类`, visible: true },
-        { key: 3, label: `出库仓库ID`, visible: true },
+        { key: 3, label: `出库仓库`, visible: true },
         { key: 4, label: `工单状态`, visible: true },
-        { key: 5, label: `入库仓库ID`, visible: true },
+        { key: 5, label: `入库仓库`, visible: true },
         { key: 6, label: `审核人`, visible: true },
         { key: 7, label: `审核时间`, visible: true },
         { key: 8, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
@@ -374,13 +374,13 @@ const data = reactive<PageData<AllocateOrderForm, AllocateOrderQuery>>({
       { required: true, message: "物料大类不能为空", trigger: "blur" }
     ],
     planWarehouseId: [
-      { required: true, message: "出库仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "出库仓库不能为空", trigger: "blur" }
     ],
     orderStatus: [
       { required: true, message: "工单状态不能为空", trigger: "change" }
     ],
     targetWarehouseId: [
-      { required: true, message: "入库仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "入库仓库不能为空", trigger: "blur" }
     ],
     auditBy: [
       { required: true, message: "审核人不能为空", trigger: "blur" }
diff --git a/src/views/wms/configuration/index.vue b/src/views/wms/configuration/index.vue
index 6f1e719..ead3b89 100644
--- a/src/views/wms/configuration/index.vue
+++ b/src/views/wms/configuration/index.vue
@@ -217,7 +217,7 @@ const columns = ref<FieldOption[]>([
         { key: 5, label: `审批是否`, visible: true },
         { key: 6, label: `审批类型`, visible: true },
         { key: 7, label: `审批代码`, visible: true },
-        { key: 8, label: `仓库ID`, visible: true },
+        { key: 8, label: `仓库`, visible: true },
         { key: 9, label: `审批范围`, visible: true },
 ]);
 
@@ -267,7 +267,7 @@ const data = reactive<PageData<ConfigurationForm, ConfigurationQuery>>({
       { required: true, message: "审批代码不能为空", trigger: "blur" }
     ],
     warehouseId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库不能为空", trigger: "blur" }
     ],
     approveRange: [
       { required: true, message: "审批范围不能为空", trigger: "blur" }
diff --git a/src/views/wms/instockOrder/index.vue b/src/views/wms/instockOrder/index.vue
index 19baf11..853a43b 100644
--- a/src/views/wms/instockOrder/index.vue
+++ b/src/views/wms/instockOrder/index.vue
@@ -40,7 +40,7 @@
             <el-form-item label="审核意见" prop="auditComments">
               <el-input v-model="queryParams.auditComments" placeholder="请输入审核意见" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="仓库ID" prop="warehouseId">
+            <el-form-item label="仓库" prop="warehouseId">
               <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -103,7 +103,7 @@
           </template>
         </el-table-column>
         <el-table-column label="审核意见" align="center" prop="auditComments" v-if="columns[13].visible"/>
-        <el-table-column label="仓库ID" align="center" prop="warehouseCode" v-if="columns[14].visible"/>
+        <el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[14].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -187,7 +187,7 @@
         <el-form-item label="审核意见" prop="auditComments">
           <el-input v-model="form.auditComments" placeholder="请输入审核意见" />
         </el-form-item> -->
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -252,7 +252,7 @@ const columns = ref<FieldOption[]>([
         { key: 11, label: `审核时间`, visible: true },
         { key: 12, label: `审核状态(0待审核,1审核通过,2审核未通过)`, visible: true },
         { key: 13, label: `审核意见`, visible: true },
-        { key: 14, label: `仓库ID`, visible: true },
+        { key: 14, label: `仓库`, visible: true },
 ]);
 
 const initFormData: InstockOrderForm = {
@@ -316,7 +316,7 @@ const data = reactive<PageData<InstockOrderForm, InstockOrderQuery>>({
       { required: true, message: "审核意见不能为空", trigger: "blur" }
     ],
     warehouseId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库不能为空", trigger: "blur" }
     ]
   }
 });
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 33fe20a..1c007de 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -90,7 +90,7 @@
           </template>
         </el-table-column>
         <el-table-column label="审核意见" align="center" prop="auditComments"/>
-        <el-table-column label="仓库ID" align="center" prop="warehouseCode"/>
+        <el-table-column label="仓库" align="center" prop="warehouseCode"/>
         <!-- <el-table-column label="入库方式" align="center" prop="inMethod">
           <template #default="scope">
             <dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
@@ -209,7 +209,7 @@
               />
             </el-select>
           </el-form-item> -->
-          <el-form-item label="仓库ID" prop="warehouseId">
+          <el-form-item label="仓库" prop="warehouseId">
             <el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
               <el-option
                 v-for="item in baseStoreList"
@@ -470,16 +470,16 @@
     </el-dialog>
     <el-dialog v-model="parentTableApproveVisible" title="审批" width="40%">
       <el-form :model="parentTableApproveForm" label-width="120px">
-        <el-form-item label="审核人" prop="auditBy">
-          <el-select v-model="parentTableApproveForm.auditBy" placeholder="请选择审核人" style="width:100px;" :disabled="true">
-            <el-option
-              v-for="item in userList"
-              :key="item.userId"
-              :label="item.userName"
-              :value="item.userName"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="审核人" prop="auditBy">-->
+<!--          <el-select v-model="parentTableApproveForm.auditBy" placeholder="请选择审核人" style="width:100px;" :disabled="true">-->
+<!--            <el-option-->
+<!--              v-for="item in userList"-->
+<!--              :key="item.userId"-->
+<!--              :label="item.userName"-->
+<!--              :value="item.userName"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="审核状态" prop="auditStatus">
           <el-radio-group v-model='parentTableApproveForm.auditStatus'>
             <el-radio
@@ -901,10 +901,12 @@ const dialogSubmit = () => {
     }))
     .filter(d => d.materialId && d.materialCode && Number(d.instockQty) > 0);
 
-  if (!detailList.length) {
-    ElMessage.error('请添加至少一条入库明细且数量>0');
-    return;
-  }
+  // if (!detailList.length) {
+  //   ElMessage.error('请添加至少一条入库明细且数量>0');
+  //   return;
+  // }
+
+  console.log(detailList,dialogtable.value);
 
   const payload: InstockOrderForm = {
     ...dialogForm.value,
@@ -923,19 +925,18 @@ const dialogSubmit = () => {
 const parentTableApproveSubmit = () =>{
   approveInstockOrder(parentTableApproveForm.value).then(e=>{
     console.log(e)
-    if(e.data==0){
-      ElMessage({
-        type: 'error',
-        message: '请通知对应负责人审批',
-      })
-    }
-    if(e.data!=0){
-      ElMessage({
-        type: 'success',
-        message: '审批完成',
-      })
-    }
-
+    // if(e.data==0){
+    //   ElMessage({
+    //     type: 'error',
+    //     message: '请通知对应负责人审批',
+    //   })
+    // }
+    // if(e.data!=0){
+    //   ElMessage({
+    //     type: 'success',
+    //     message: '审批完成',
+    //   })
+    // }
     parentTableApproveVisible.value = false
     getParentTable()
   })
diff --git a/src/views/wms/instockRecord/index.vue b/src/views/wms/instockRecord/index.vue
index 94f72e5..440d731 100644
--- a/src/views/wms/instockRecord/index.vue
+++ b/src/views/wms/instockRecord/index.vue
@@ -76,7 +76,7 @@
         <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[1].visible"/>
         <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[2].visible"/>
         <!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[3].visible"/> -->
-        <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[4].visible"/>
+        <el-table-column label="仓库" align="center" prop="warehouseId" v-if="columns[4].visible"/>
         <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[5].visible"/>
         <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[6].visible"/>
         <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
@@ -211,7 +211,7 @@ const columns = ref<FieldOption[]>([
   { key: 1, label: `入库单号`, visible: true },
   { key: 2, label: `批次码`, visible: true },
   { key: 3, label: `物料id`, visible: true },
-  { key: 4, label: `仓库ID`, visible: false },
+  { key: 4, label: `仓库`, visible: false },
   { key: 5, label: `库位编码`, visible: true },
   { key: 6, label: `物料编码`, visible: true },
   { key: 7, label: `物料名称`, visible: true },
diff --git a/src/views/wms/inventory/index.vue b/src/views/wms/inventory/index.vue
index f6e2739..3746e53 100644
--- a/src/views/wms/inventory/index.vue
+++ b/src/views/wms/inventory/index.vue
@@ -154,7 +154,7 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item> -->
-        <el-form-item label="仓库ID" prop="storeId">
+        <el-form-item label="仓库" prop="storeId">
           <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -217,7 +217,7 @@ const columns = ref<FieldOption[]>([
         { key: 7, label: `更新时间`, visible: true },
         { key: 8, label: `锁定状态`, visible: true },
         { key: 9, label: `库存状态`, visible: true },
-        { key: 10, label: `仓库ID`, visible: true },
+        { key: 10, label: `仓库`, visible: true },
         // { key: 11, label: `${comment}`, visible: true },
         // { key: 12, label: `${comment}`, visible: true },
         // { key: 13, label: `${comment}`, visible: true },
@@ -279,7 +279,7 @@ const data = reactive<PageData<InventoryForm, InventoryQuery>>({
       { required: true, message: "库存状态不能为空", trigger: "change" }
     ],
     storeId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库不能为空", trigger: "blur" }
     ],
   }
 });
diff --git a/src/views/wms/inventoryAlarm/index.vue b/src/views/wms/inventoryAlarm/index.vue
index 6cf6d71..144eae7 100644
--- a/src/views/wms/inventoryAlarm/index.vue
+++ b/src/views/wms/inventoryAlarm/index.vue
@@ -147,7 +147,7 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item> -->
-        <el-form-item label="仓库ID" prop="storeId">
+        <el-form-item label="仓库" prop="storeId">
           <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -206,7 +206,7 @@ const columns = ref<FieldOption[]>([
         { key: 7, label: `更新时间`, visible: true },
         { key: 8, label: `锁定状态`, visible: true },
         { key: 9, label: `库存状态`, visible: true },
-        { key: 10, label: `仓库ID`, visible: true },
+        { key: 10, label: `仓库`, visible: true },
         // { key: 11, label: `${comment}`, visible: true },
         // { key: 12, label: `${comment}`, visible: true },
         // { key: 13, label: `${comment}`, visible: true },
@@ -268,7 +268,7 @@ const data = reactive<PageData<InventoryForm, InventoryQuery>>({
       { required: true, message: "库存状态不能为空", trigger: "change" }
     ],
     storeId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库不能为空", trigger: "blur" }
     ],
   }
 });
diff --git a/src/views/wms/inventoryCheck/index.vue b/src/views/wms/inventoryCheck/index.vue
index 0191d00..4108f25 100644
--- a/src/views/wms/inventoryCheck/index.vue
+++ b/src/views/wms/inventoryCheck/index.vue
@@ -324,7 +324,7 @@ const columns = ref<FieldOption[]>([
   {key: 1, label: `租户号`, visible: true},
   {key: 2, label: `盘点单号`, visible: true},
   {key: 3, label: `物料大类`, visible: true},
-  {key: 4, label: `计划仓库ID`, visible: true},
+  {key: 4, label: `计划仓库`, visible: true},
   {key: 5, label: `盘点类型`, visible: true},
   {key: 6, label: `盘点状态`, visible: true},
   {key: 7, label: `创建人`, visible: true},
@@ -383,7 +383,7 @@ const data = reactive<PageData<InventoryCheckForm, InventoryCheckQuery>>({
       {required: true, message: "物料大类不能为空", trigger: "blur"}
     ],
     planWarehouseId: [
-      {required: true, message: "计划仓库ID不能为空", trigger: "blur"}
+      {required: true, message: "计划仓库不能为空", trigger: "blur"}
     ],
     checkType: [
       {required: true, message: "盘点类型不能为空", trigger: "change"}
diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue
index ee2fdc0..000dac7 100644
--- a/src/views/wms/linkage/index.vue
+++ b/src/views/wms/linkage/index.vue
@@ -41,13 +41,13 @@
         <el-table-column label="调拨单号" align="center" prop="allocateOrderCode"/>
         <el-table-column label="物料大类" align="center" prop="materialCategoryName">
         </el-table-column>
-        <el-table-column label="出库仓库ID" align="center" prop="planWarehouseCode"/>
+        <el-table-column label="出库仓库" align="center" prop="planWarehouseCode"/>
         <el-table-column label="工单状态" align="center" prop="orderStatus">
           <template #default="scope">
             <dict-tag :options="wms_allocate_status" :value="scope.row.orderStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="入库仓库ID" align="center" prop="targetWarehouseCode"/>
+        <el-table-column label="入库仓库" align="center" prop="targetWarehouseCode"/>
         <el-table-column label="审核人" align="center" prop="auditBy"/>
         <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
           <template #default="scope">
@@ -186,6 +186,9 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="调拨原因" prop="allocateReason">
+            <el-input v-model="dialogForm.allocateReason" placeholder="请输入调拨原因" clearable />
+          </el-form-item>
         </el-form>
       </el-card>
       <el-card style="margin-top: 8px" shadow="never">
@@ -755,8 +758,8 @@ const submitMaterialForm = () => {
         dialogtable.value[currentRowIndex.value].materialId = Number(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;
         // 可以根据需要添加更多字段
       }
     }
diff --git a/src/views/wms/moveOrder/index.vue b/src/views/wms/moveOrder/index.vue
index c727426..1d16666 100644
--- a/src/views/wms/moveOrder/index.vue
+++ b/src/views/wms/moveOrder/index.vue
@@ -299,7 +299,7 @@ const columns = ref<FieldOption[]>([
         { key: 1, label: `租户号`, visible: true },
         { key: 2, label: `物料ID`, visible: true },
         { key: 3, label: `物料大类`, visible: true },
-        { key: 4, label: `仓库ID`, visible: true },
+        { key: 4, label: `仓库`, visible: true },
         { key: 5, label: `计划库位`, visible: true },
         { key: 6, label: `工单状态(0执行中，1完成，2关闭)`, visible: true },
         { key: 7, label: `目标库位`, visible: true },
@@ -364,7 +364,7 @@ const data = reactive<PageData<MoveOrderForm, MoveOrderQuery>>({
       { required: true, message: "物料大类不能为空", trigger: "blur" }
     ],
     warehouseId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库不能为空", trigger: "blur" }
     ],
     planLocationCode: [
       { required: true, message: "计划库位不能为空", trigger: "blur" }
diff --git a/src/views/wms/outstockOrder/index.vue b/src/views/wms/outstockOrder/index.vue
index fb105ee..6696aff 100644
--- a/src/views/wms/outstockOrder/index.vue
+++ b/src/views/wms/outstockOrder/index.vue
@@ -7,7 +7,7 @@
             <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="warehouseId">
+            <el-form-item label="仓库" prop="warehouseId">
               <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -86,7 +86,7 @@
       <el-table v-loading="loading" :data="outstockOrderList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="出库单 主键" align="center" prop="outstockId" v-if="columns[0].visible"/> -->
-        <el-table-column label="仓库ID" align="center" prop="warehouseCode" v-if="columns[1].visible"/>
+        <el-table-column label="仓库" align="center" prop="warehouseCode" v-if="columns[1].visible"/>
         <el-table-column label="出库单号" align="center" prop="outstockCode" v-if="columns[2].visible"/>
         <el-table-column label="出库类型" align="center" prop="outstockType" v-if="columns[3].visible">
           <template #default="scope">
@@ -136,7 +136,7 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="outstockOrderFormRef" :model="form" :rules="rules" label-width="80px">
 
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -248,7 +248,7 @@ const dialog = reactive<DialogOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
         { key: 0, label: `出库单 主键`, visible: true },
-        { key: 1, label: `仓库ID`, visible: true },
+        { key: 1, label: `仓库`, visible: true },
         { key: 2, label: `出库单号`, visible: true },
         { key: 3, label: `出库类型`, visible: true },
         { key: 4, label: `租户号`, visible: true },
@@ -304,7 +304,7 @@ const data = reactive<PageData<OutstockOrderForm, OutstockOrderQuery>>({
       { required: true, message: "出库单 主键不能为空", trigger: "blur" }
     ],
     warehouseId: [
-      { required: true, message: "仓库ID不能为空", trigger: "blur" }
+      { required: true, message: "仓库不能为空", trigger: "blur" }
     ],
     outstockCode: [
       { required: true, message: "出库单号不能为空", trigger: "blur" }
diff --git a/src/views/wms/outstockOrderCopy/change.vue b/src/views/wms/outstockOrderCopy/change.vue
new file mode 100644
index 0000000..4810ca6
--- /dev/null
+++ b/src/views/wms/outstockOrderCopy/change.vue
@@ -0,0 +1,848 @@
+<template>
+  <div class="p-2">
+    <el-card shadow="never">
+      <el-form label-width="120px" label-position="right" :inline="true" :model="queryForm" class="demo-form-inline">
+        <el-form-item label="仓库" prop="warehouseId">
+          <el-select v-model="queryForm.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="outstockCode">
+          <el-input v-model="queryForm.outstockCode" placeholder="请输入出库单号" clearable/>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 8px" shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="parentTableAdd">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="ids.length !== 1" @click="parentTableUpdate()">修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="ids.length < 1" @click="parentTableDelete()">删除
+            </el-button>
+          </el-col>
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>-->
+          <!--          </el-col>-->
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
+                         @queryTable="getParentTable"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table v-loading="parentTableLoad" :data="parentTableData" style="width: 100%" highlight-current-row
+                @current-change="parentTableCellClick"
+                @selection-change="selectionChange" ref="parentTableRef">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="仓库" align="center" prop="warehouseCode"/>
+        <el-table-column label="出库单号" align="center" prop="outstockCode"/>
+        <el-table-column label="出库类型" align="center" prop="outstockType">
+          <template #default="scope">
+            <dict-tag :options="wms_out_type" :value="scope.row.outstockType"/>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="物料大类" align="center" prop="materialCategoryId">
+                  <template #default="scope">
+                    <dict-tag :options="material_mategories" :value="scope.row.materialCategoryId"/>
+                  </template>
+                </el-table-column>-->
+        <el-table-column label="工单类型" align="center" prop="orderType">
+          <template #default="scope">
+            <dict-tag :options="wms_instock_type" :value="scope.row.orderType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号" align="center" prop="orderNo"/>
+        <el-table-column label="审核人" align="center" prop="auditBy"/>
+        <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
+          <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">
+          <template #default="scope">
+            <dict-tag :options="approve_status" :value="scope.row.auditStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核意见" align="center" prop="auditComments"/>
+        <!-- <el-table-column label="入库方式" align="center" prop="inMethod">
+          <template #default="scope">
+            <dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="操作" fixed="right" width="200">
+          <template #default="scope">
+            <!--            <el-button size="small" @click.stop="viewDetails(scope.row)">-->
+            <!--              查看-->
+            <!--            </el-button>-->
+            <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
+              修改
+            </el-button>
+            <el-button
+              size="small"
+              type="danger"
+              @click.stop="parentTableDelete(scope.row)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="parentTableTotal > 0" :total="parentTableTotal" v-model:page="queryForm.pageNum"
+                  v-model:limit="queryForm.pageSize" @pagination="getParentTable"/>
+    </el-card>
+
+    <el-card style="margin-top: 8px" shadow="never">
+      <el-table :data="childrenTableData" style="width: 100%" v-loading="childrenTableLoad">
+        <el-table-column label="出库单号" align="center" prop="outstockCode"/>
+        <!-- <el-table-column label="出库单 主键" align="center" prop="outstockId" v-if="columns[2].visible"/> -->
+        <el-table-column label="物料" align="center" prop="materialCode"/>
+        <el-table-column label="出库数量" align="center" prop="outstockQty"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategoryName">
+
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="200">
+          <template #default="scope">
+            <!-- <el-button size="small" @click="childrenTableUpdate( scope.row)">
+             打印
+             </el-button> -->
+            <el-button
+              size="small"
+              type="danger"
+              @click="childrenTableUDelete(scope.row)"
+            >
+              删除
+            </el-button>
+            <!-- <el-tooltip content="打印" placement="top">
+              <el-button type="primary" @click="handlePrint(scope.row)">打印</el-button>
+            </el-tooltip> -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
+      <el-card shadow="never">
+        <el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView">
+          <el-form-item label="仓库ID" prop="warehouseId">
+            <el-select v-model="dialogForm.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="outstockType">
+            <el-select v-model="dialogForm.outstockType" placeholder="请选择出库类型">
+              <el-option
+                v-for="dict in wms_out_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料大类" prop="materialCategoryId">
+            <el-select v-model="dialogForm.materialCategoryId" placeholder="请选择物料大类" @change="setMaterialList">
+              <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="orderType">
+            <el-select v-model="dialogForm.orderType" placeholder="请选择工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)">
+              <el-option
+                v-for="dict in wms_instock_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核人" prop="auditBy">
+            <el-select v-model="dialogForm.auditBy" placeholder="请选择审核人">
+              <el-option
+                v-for="item in userList"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userName"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card style="margin-top: 8px" shadow="never">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="addDialogTableCell">新增</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="dialogtable" style="width: 100%">
+          <el-table-column label="物料大类" prop="materialCategoryId">
+            <el-select v-model="dialogForm.materialCategoryId" placeholder="" :disabled="true">
+              <el-option v-for="item in mategoryOptions"
+                         :key="item.materialCategoryId"
+                         :label="item.materialCategoryName"
+                         :value="item.materialCategoryId"
+              />
+            </el-select>
+          </el-table-column>
+
+
+          <el-table-column label="物料编码" prop="materialCode">
+            <!--            <template #default="scope">
+                          <el-select
+                            v-model="scope.row.materialId"
+                            placeholder="选择物料"
+                            style="width: 240px"
+                          >
+                            <el-option
+                              v-for="i in materialList"
+                              :label="i.materialCode+'('+i.materialName+')'"
+                              :value="i.materialId"
+                              :key="i.materialId"
+                            />
+                          </el-select>
+                        </template>-->
+            <template #default="scope">
+              <el-input
+                v-model="scope.row.materialCode"
+                placeholder="请点击检索物料"
+                @click="handleMaterialAdd('material', scope.$index)" >
+                <template #append>
+                  <el-icon class="el-input__icon"><search/></el-icon>
+                </template>
+              </el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="物料名称" prop="materialName">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.materialName"
+                placeholder="选择物料"
+                style="width: 240px"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="i in materialList"
+                  :label="i.materialName"
+                  :value="i.materialName"
+                  :key="i.materialId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="物料单位" prop="materialUnit">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.materialUnit"
+                placeholder="选择物料"
+                style="width: 240px"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="i in materialList"
+                  :label="i.materialUnit"
+                  :value="i.materialUnit"
+                  :key="i.materialId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="物料规格" prop="materialSpec">
+            <template #default="scope">
+              <el-select
+                v-model="scope.row.materialSpec"
+                placeholder="选择物料"
+                style="width: 240px"
+                :disabled="true"
+              >
+                <el-option
+                  v-for="i in materialList"
+                  :label="i.materialSpec"
+                  :value="i.materialSpec"
+                  :key="i.materialId"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+
+
+
+          <el-table-column label="出库数量" prop="outstockQty">
+            <template #default="scope">
+              <el-input v-model="scope.row.outstockQty" placeholder="请输入出库数量" style="width: 200px;"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="200">
+            <template #default="scope">
+              <el-button
+                size="small"
+                type="danger"
+                @click="tableUDelete(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="已包数量" prop="printedNum">
+            <template #default="scope">
+              <el-input v-model="scope.row.printedNum" placeholder="请输入已包数量" />
+            </template>
+          </el-table-column> -->
+          <!-- <el-table-column label="分包数量" prop="printNum">
+            <template #default="scope">
+              <el-input v-model="scope.row.printNum" placeholder="请输入分包数量" />
+            </template>
+          </el-table-column>
+          <el-table-column label="打印数量" prop="barcodeNum">
+            <template #default="scope">
+              <el-input v-model="scope.row.barcodeNum" placeholder="请输入打印数量" />
+            </template> -->
+          <!-- </el-table-column> -->
+
+          <!--          <el-table-column label="erp同步状态" prop="erpSynchronousStatus">-->
+          <!--            <template #default="scope">-->
+          <!--              <el-select-->
+          <!--                v-model="scope.row.erpSynchronousStatus"-->
+          <!--                placeholder="选择erp同步状态"-->
+          <!--              >-->
+          <!--                <el-option-->
+          <!--                  label="1"-->
+          <!--                  value="1"-->
+          <!--                />-->
+          <!--                <el-option-->
+          <!--                  label="2"-->
+          <!--                  value="2"-->
+          <!--                />-->
+          <!--              </el-select>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+        </el-table>
+      </el-card>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">关闭</el-button>
+          <el-button type="primary" @click="dialogSubmit">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="parentTableInfoVisible" title="修改父表格" width="40%">
+      <el-form :model="parentTableInfoForm" label-width="120px">
+        <el-form-item label="仓库ID" prop="warehouseId">
+          <el-select v-model="parentTableInfoForm.warehouseId" placeholder="请选择所属仓库" :disabled="true">
+            <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="outstockType">
+          <el-select v-model="parentTableInfoForm.outstockType" placeholder="请选择出库类型">
+            <el-option
+              v-for="dict in wms_out_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料大类" prop="materialCategoryId">
+          <el-select v-model="parentTableInfoForm.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="orderType">
+          <el-select v-model="parentTableInfoForm.orderType" placeholder="请选择工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)" :disabled="true">
+            <el-option
+              v-for="dict in wms_instock_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核人" prop="auditBy">
+          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人" :disabled="true">
+            <el-option
+              v-for="item in userList"
+              :key="item.userId"
+              :label="item.userName"
+              :value="item.userName"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="parentTableInfoVisible = false">关闭</el-button>
+          <el-button type="primary" @click="parentTableInfoSubmit">
+            确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="childrenTableInfoVisible" title="条码生成" width="40%">
+      <el-form :model="childrenTableInfoForm" label-width="120px">
+        <el-form-item label="物料" prop="materialId">
+          <el-select v-model="childrenTableInfoForm.materialId" placeholder="请选择物料">
+            <el-option
+              v-for="item in materialList"
+              :key="item.materialId"
+              :label="item.materialCode"
+              :value="item.materialId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入库数量" prop="instockQty">
+          <el-input v-model="childrenTableInfoForm.instockQty" placeholder="请输入入库数量" />
+        </el-form-item>
+        <el-form-item label="有无条码" prop="codeYesNo">
+          <el-radio-group v-model="childrenTableInfoForm.codeYesNo">
+            <el-radio
+              v-for="dict in wms_barcode_if"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="已包数量" prop="printedNum">
+          <el-input v-model="childrenTableInfoForm.printedNum" placeholder="" />
+        </el-form-item>
+        <el-form-item label="分包数量" prop="printNum">
+          <el-input v-model="childrenTableInfoForm.printNum" placeholder="请输入分包数量" />
+        </el-form-item>
+        <el-form-item label="打印数量" prop="barcodeNum">
+          <el-input v-model="childrenTableInfoForm.barcodeNum" placeholder="请输入打印条码数量" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="childrenTableInfoVisible = false">关闭</el-button>
+          <el-button type="primary" @click="submitForm">
+            确定
+          </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="dialogForm.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="Linkage" lang="ts">
+import { listOutstockOrder, getOutstockOrder, delOutstockOrder, addOutstockOrder, updateOutstockOrder } from '@/api/wms/outstockOrder';
+import { OutstockOrderVO, OutstockOrderQuery, OutstockOrderForm } from '@/api/wms/outstockOrder/types';
+import {reactive} from 'vue'
+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 { listOutstockDetail, getOutstockDetail, delOutstockDetail, addOutstockDetail, updateOutstockDetail } from '@/api/wms/outstockDetail';
+import { OutstockDetailVO, OutstockDetailQuery, OutstockDetailForm } from '@/api/wms/outstockDetail/types';
+import { getMaterialListVo, getMaterailCount } from '@/api/wms/instockDetail';
+import {
+  getMaterialList
+} from '@/api/wms/linkage'
+
+import MaterialSelectInWMS from "@/views/wms/baseMaterialInfo/addMaterialInWMS.vue";
+
+import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory';
+
+
+
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+const {
+  wms_out_type,
+  wms_barcode_if,
+  wms_instock_type,
+  approve_status,
+  erp_synchronous_status,
+  material_mategories,
+  mes_material_categories,
+  wms_allocate_status,
+  wms_allocate_create,
+  wms_allocate_way
+} = toRefs<any>(proxy?.useDict('wms_out_type', 'wms_barcode_if', 'wms_instock_type', 'approve_status', 'erp_synchronous_status', 'material_mategories', 'mes_material_categories', 'wms_allocate_status', 'wms_allocate_create', 'wms_allocate_way'));
+
+
+interface User {
+  date: string
+  name: string
+  address: string
+}
+
+const parentTableTotal = ref(0)
+const dialogVisible = ref(false)
+const parentTableInfoVisible = ref(false)
+const childrenTableInfoVisible = ref(false)
+// const childrenTableInfoSubmit = ref(false)
+const updateDialog = ref(false)
+const dialogTitle = ref('添加')
+const dialogForm = ref({})
+const parentTableInfoForm = ref({})
+const childrenTableInfoForm = ref({})
+
+const queryForm = ref({
+  outstockCode: '',
+  materialCategoryId: '',
+  materialCategoryName: '',
+  warehouseId: '',
+  pageNum: 1,
+  pageSize: 10
+})
+const parentTableRef = ref()
+const parentTableData = ref([])
+const ids = ref([])
+const childrenTableData = ref([])
+const dialogtable = ref([])
+const baseStoreList = ref([]);
+const userList = ref([]);
+const materialList = ref([]);
+const parentTableLoad = ref(false)
+const childrenTableLoad = ref(false)
+const isView = ref(false)
+const partntTableSelectCell = ref({})
+let supplierList = ref([]);
+/** 查询出库单大类下物料数量接口 */
+const getMaterialCount = async () => {
+  const materialId = form.value.materialId
+  console.log(materialId)
+  const res = await getMaterailCount({'materialId':materialId});
+  console.log(res.data);
+  form.value.stockQty = res.data;
+  console.log(form.stockQty)
+}
+// 获取仓库
+getBaseWarehouseList().then(e => {
+  baseStoreList.value = e.data
+})
+listUser().then(e => {
+  userList.value = e.rows;
+})
+/** 提交按钮 */
+const submitForm = () => {
+  updateInstockDetail(childrenTableInfoForm.value).finally(() =>  childrenTableInfoVisible.value = false);
+}
+
+let mategoryOptions = ref([]);
+const getMaterialCategorySelect = async () => {
+  const res = await getBaseMaterialCategoryListInWMS(null);
+  mategoryOptions.value = res.data;
+};
+
+// 获取父表格数据
+const getParentTable = async () => {
+
+  await getMaterialCategorySelect();
+
+  parentTableLoad.value = true
+  await listOutstockOrder(queryForm.value).then(async (e) => {
+    parentTableLoad.value = false
+    parentTableData.value = e.rows
+    parentTableTotal.value = e.total
+    if (e.rows.length > 0) {
+      parentTableRef.value.setCurrentRow(e.rows[0])
+      await getChildrenTable({outstockId: e.rows[0].outstockId})
+    } else {
+      childrenTableData.value = []
+    }
+  })
+}
+
+// 获取子表格数据
+const getChildrenTable = async (form) => {
+  childrenTableLoad.value = true
+  console.log(form)
+  await listOutstockDetail(form).then(e => {
+    childrenTableLoad.value = false
+    childrenTableData.value = e.rows
+    // parentTableTotal.value = e.total
+  })
+}
+
+getParentTable()
+/** 打印按钮操作 */
+const handlePrint = async (row?: InstockDetailVO) => {
+  reset();
+  const _instockDetailId = row?.instockDetailId || ids.value[0]
+  const res = await getInstockDetail(_instockDetailId);
+  Object.assign(childrenTableInfoForm.value, res.data);
+
+
+
+}
+// 查询
+const query = async () => {
+  ids.value = []
+  parentTableRef.value?.clearSelection()
+  await getParentTable()
+}
+const reset = () => {
+  queryForm.value = {
+    instockId: ''
+  }
+}
+
+// 父表格行点击
+const parentTableCellClick = async (e) => {
+  partntTableSelectCell.value = e
+  await getChildrenTable({outstockId: e.outstockId})
+}
+
+// 表格多选
+const selectionChange = (e) => {
+  ids.value = e.map(v => v.outstockId)
+}
+// 查看
+const viewDetails = (e) => {
+  isView.value = true
+  dialogVisible.value = true
+  viewAllocateOrder(e.aoId).then(v => {
+    dialogForm.value = v.data
+  })
+}
+
+// 父表格新增
+const parentTableAdd = () => {
+  dialogVisible.value = true
+  dialogForm.value = {}
+  dialogtable.value = []
+}
+// 父表格修改
+const parentTableUpdate = async (e) => {
+  let id = ref(null)
+  if (e) {
+    id.value = e.outstockId
+  } else {
+    id.value = ids.value?.[0]
+  }
+  if (!id.value) return
+  parentTableInfoForm.value = (await getOutstockOrder(id.value)).data
+  parentTableInfoVisible.value = true
+  updateDialog.value = true
+}
+// 父表格删除
+const parentTableDelete = async (e) => {
+  const delList = ref([])
+  if (e) {
+    delList.value = [e.outstockId]
+  } else {
+    delList.value = ids.value
+  }
+  ElMessageBox.confirm(
+    '确定要删除这些数据吗?',
+    'Warning',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(async () => {
+      await delOutstockOrder(delList.value.toString()).then(e => {
+        ElMessage({
+          type: 'success',
+          message: '删除完成',
+        })
+        getParentTable()
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消',
+      })
+    })
+
+}
+
+// 获取物料列表
+const setMaterialList = (materialCategoryId) => {
+  getMaterialList({materialCategoryId}).then(e => {
+    materialList.value = e.data
+  })
+}
+
+// 添加子表格行
+const addDialogTableCell = () => {
+  dialogtable.value.push({})
+}
+
+// 新增提交
+const dialogSubmit = () => {
+
+  addOutstockOrder(dialogForm.value).then(e => {
+    addOutstockDetail(dialogtable.value.map(item => {
+          return {...item, outstockCode: e.data.outstockCode,outstockId: e.data.outstockId, materialCategoryId: e.data.materialCategoryId}
+        }
+      )
+    ).then(v => {
+      dialogVisible.value = false
+      getParentTable()
+    })
+
+  })
+}
+
+const parentTableInfoSubmit = () =>{
+  updateOutstockOrder(parentTableInfoForm.value).then(e=>{
+    ElMessage({
+      type: 'success',
+      message: '修改完成',
+    })
+    parentTableInfoVisible.value = false
+    getParentTable()
+  })
+}
+
+// 子表格修改
+const childrenTableUpdate = async (e) => {
+  childrenTableInfoForm.value = (await getInstockDetail(e.instockDetailId)).data
+  childrenTableInfoVisible.value = true
+}
+// 子表格数据新增删除
+const tableUDelete = (row) => {
+
+  ElMessageBox.confirm(
+    '确定要删除这些数据吗?',
+    'Warning',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(async () => {
+      const index = dialogtable.value.indexOf(row);
+      console.log(index)
+      dialogtable.value.splice(index,1)
+    })
+
+}
+
+// 子表格删除
+const childrenTableUDelete = (e) => {
+
+  ElMessageBox.confirm(
+    '确定要删除这些数据吗?',
+    'Warning',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(async () => {
+      await delOutstockDetail(e.outstockDetailId).then(async (e) => {
+        ElMessage({
+          type: 'success',
+          message: '删除完成',
+        })
+        await getChildrenTable({outstockId: partntTableSelectCell.value.outstockId})
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消',
+      })
+    })
+}
+
+
+/*     以下为添加物料信息对话框相关方法   */
+let materialSelectRef = ref();//物料选择对话框绑定
+const materialOpen = ref(false);//物料选择对话框显示
+const selectType = ref(''); // 用于标识当前选择的是哪个字段
+const selectedMaterial = ref(null); // 存储选中的物料完整信息
+const currentRowIndex = ref(-1); // 存储当前正在编辑的行索引
+
+/** 处理从MaterialSelect组件接收到的选择 */
+const handleSelection = (row) => {
+  selectedMaterial.value = row;
+};
+
+/** 提交物料BOM信息按钮 */
+const submitMaterialForm = () => {
+  if (!selectedMaterial.value) {
+    // 如果没有选中行，则尝试从表格中获取
+    selectedMaterial.value = materialSelectRef.value.tableRef.store.states.currentRow.value;
+  }
+
+  if (selectedMaterial.value) {
+    if (selectType.value === 'material') {
+      // 只更新当前正在编辑的行
+      if (currentRowIndex.value >= 0 && dialogtable.value[currentRowIndex.value]) {
+        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;
+        // 可以根据需要添加更多字段
+      }
+    }
+  }
+
+  // 重置选中的物料信息和关闭对话框
+  selectedMaterial.value = null;
+  materialOpen.value = false;
+};
+
+/** 新增按钮操作 */
+const handleMaterialAdd = (type, index) => {
+  selectType.value = type;
+  currentRowIndex.value = index; // 保存当前正在编辑的行索引
+  materialOpen.value = true;
+}
+
+
+</script>
+<style>
+.demo-form-inline .el-input {
+  --el-input-width: 220px;
+}
+
+.demo-form-inline .el-select {
+  --el-select-width: 220px;
+}
+</style>
diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 285485c..c79989c 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -32,6 +32,7 @@
             <el-button type="danger" plain icon="Delete" :disabled="ids.length < 1" @click="parentTableDelete()">删除
             </el-button>
           </el-col>
+
           <!--          <el-col :span="1.5">-->
           <!--            <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>-->
           <!--          </el-col>-->
@@ -79,11 +80,17 @@
             <dict-tag :options="wms_allocate_way" :value="scope.row.inMethod"/>
           </template>
         </el-table-column> -->
-        <el-table-column label="操作" fixed="right" width="200">
+        <el-table-column label="操作" fixed="right" width="260">
           <template #default="scope">
             <!--            <el-button size="small" @click.stop="viewDetails(scope.row)">-->
             <!--              查看-->
             <!--            </el-button>-->
+            <el-button
+              size="small"
+              type="warning"
+              v-if="scope.row.needApprove &amp;&amp; (scope.row.auditStatus === null || scope.row.auditStatus === undefined || scope.row.auditStatus === '')"
+              @click.stop="openApprove(scope.row)"
+            >审批</el-button>
             <el-button size="small" @click.stop="parentTableUpdate(scope.row)">
               修改
             </el-button>
@@ -108,7 +115,8 @@
         <el-table-column label="物料" align="center" prop="materialCode"/>
         <el-table-column label="出库数量" align="center" prop="outstockQty"/>
         <el-table-column label="物料大类" align="center" prop="materialCategoryName">
-
+        </el-table-column>
+        <el-table-column label="是否高价值" align="center" prop="isHighValue">
         </el-table-column>
         <el-table-column label="操作" fixed="right" width="200">
           <template #default="scope">
@@ -133,7 +141,7 @@
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%">
       <el-card shadow="never">
         <el-form :model="dialogForm" :inline="true" label-width="120px" :disabled="isView">
-          <el-form-item label="仓库ID" prop="warehouseId">
+          <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="dialogForm.warehouseId" placeholder="请选择所属仓库">
             <el-option
               v-for="item in baseStoreList"
@@ -348,7 +356,7 @@
 
     <el-dialog v-model="parentTableInfoVisible" title="修改父表格" width="40%">
       <el-form :model="parentTableInfoForm" label-width="120px">
-        <el-form-item label="仓库ID" prop="warehouseId">
+        <el-form-item label="仓库" prop="warehouseId">
           <el-select v-model="parentTableInfoForm.warehouseId" placeholder="请选择所属仓库" :disabled="true">
             <el-option
               v-for="item in baseStoreList"
@@ -466,18 +474,39 @@
       </div>
     </el-dialog>
 
+    <!-- 审批对话框 -->
+    <el-dialog v-model="approveDialogVisible" title="出库单审批" width="40%">
+      <el-form :model="approveForm" label-width="120px">
+        <el-form-item label="审核状态" prop="auditStatus">
+          <el-select v-model="approveForm.auditStatus" placeholder="请选择审核状态">
+            <el-option v-for="d in approve_status" :key="d.value" :label="d.label" :value="d.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="auditComments">
+          <el-input v-model="approveForm.auditComments" type="textarea" placeholder="请输入审核意见" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="approveDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitApprove">确认审批</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
   </div>
 </template>
 
 <script setup name="Linkage" lang="ts">
 import { listOutstockOrder, getOutstockOrder, delOutstockOrder, addOutstockOrder, updateOutstockOrder } from '@/api/wms/outstockOrder';
+import { approveOutstockOrder } from '@/api/wms/outstockOrder';
 import { OutstockOrderVO, OutstockOrderQuery, OutstockOrderForm } from '@/api/wms/outstockOrder/types';
 import {reactive} from 'vue'
 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 { listOutstockDetail, getOutstockDetail, delOutstockDetail, addOutstockDetail, updateOutstockDetail } from '@/api/wms/outstockDetail';
+import { getUserList, listUser } from '@/api/system/user';
+import { listOutstockDetail, getOutstockDetail, delOutstockDetail, addOutstockDetail, updateOutstockDetail, getOutstockDetailList } from '@/api/wms/outstockDetail';
 import { OutstockDetailVO, OutstockDetailQuery, OutstockDetailForm } from '@/api/wms/outstockDetail/types';
 import { getMaterialListVo, getMaterailCount } from '@/api/wms/instockDetail';
 import {
@@ -515,24 +544,44 @@ const parentTableTotal = ref(0)
 const dialogVisible = ref(false)
 const parentTableInfoVisible = ref(false)
 const childrenTableInfoVisible = ref(false)
+// 审批
+const approveDialogVisible = ref(false)
+const approveForm = ref<Partial<OutstockOrderForm>>({ outstockId: undefined, auditStatus: '', auditComments: '' })
 // const childrenTableInfoSubmit = ref(false)
 const updateDialog = ref(false)
 const dialogTitle = ref('添加')
-const dialogForm = ref({})
-const parentTableInfoForm = ref({})
-const childrenTableInfoForm = ref({})
+// Initialize dialogForm with properties
+const dialogForm = ref<OutstockOrderForm>({});
+
+// Similarly for parentTableInfoForm
+const parentTableInfoForm = ref<OutstockOrderForm>({});
+
+// For childrenTableInfoForm
+const childrenTableInfoForm = ref({
+  materialId: undefined,
+  instockQty: undefined,
+  codeYesNo: undefined,
+  printedNum: undefined,
+  printNum: undefined,
+  barcodeNum: undefined,
+  isHighValue : undefined,
+})
 
 const queryForm = ref({
   outstockCode: '',
   materialCategoryId: '',
   materialCategoryName: '',
   warehouseId: '',
+  outstockType: '',
   pageNum: 1,
   pageSize: 10
 })
 const parentTableRef = ref()
 const parentTableData = ref([])
 const ids = ref([])
+// 兼容右上角工具条依赖
+const showSearch = ref(true)
+const columns = ref([])
 const childrenTableData = ref([])
 const dialogtable = ref([])
 const baseStoreList = ref([]);
@@ -544,14 +593,21 @@ const isView = ref(false)
 const partntTableSelectCell = ref({})
 let supplierList = ref([]);
 /** 查询出库单大类下物料数量接口 */
-const getMaterialCount = async () => {
-  const materialId = form.value.materialId
-  console.log(materialId)
-  const res = await getMaterailCount({'materialId':materialId});
-  console.log(res.data);
-  form.value.stockQty = res.data;
-  console.log(form.stockQty)
+
+
+// 获取路由实例
+const route = useRoute();// 获取路由实例
+// 初始化时获取路由参数并设置到查询表单
+let routeOutstockTypeValue = '';
+if (route.query.outstockType) {
+  // 确保值是字符串类型，如果是数组则取第一个元素
+  const outstockTypeValue = Array.isArray(route.query.outstockType)
+    ? route.query.outstockType[0]
+    : route.query.outstockType;
+  queryForm.value.outstockType = outstockTypeValue;
+  routeOutstockTypeValue = outstockTypeValue; // 保存路由参数值
 }
+
 // 获取仓库
 getBaseWarehouseList().then(e => {
   baseStoreList.value = e.data
@@ -561,7 +617,7 @@ listUser().then(e => {
 })
 /** 提交按钮 */
 const submitForm = () => {
-     updateInstockDetail(childrenTableInfoForm.value).finally(() =>  childrenTableInfoVisible.value = false);
+     updateOutstockDetail(childrenTableInfoForm.value).finally(() =>  childrenTableInfoVisible.value = false);
     }
 
 let mategoryOptions = ref([]);
@@ -580,6 +636,11 @@ const getParentTable = async () => {
     parentTableLoad.value = false
     parentTableData.value = e.rows
     parentTableTotal.value = e.total
+    const promises = parentTableData.value.map(async (row) => {
+      const res = await getOutstockDetailList({ outstockId: row.outstockId });
+      row.needApprove = res.data.some(d => d.isHighValue === '1');
+    });
+    await Promise.all(promises);
     if (e.rows.length > 0) {
       parentTableRef.value.setCurrentRow(e.rows[0])
       await getChildrenTable({outstockId: e.rows[0].outstockId})
@@ -593,19 +654,19 @@ const getParentTable = async () => {
 const getChildrenTable = async (form) => {
   childrenTableLoad.value = true
   console.log(form)
-  await listOutstockDetail(form).then(e => {
+  await getOutstockDetailList({...form}).then(e => {
     childrenTableLoad.value = false
-    childrenTableData.value = e.rows
+    childrenTableData.value = e.data
     // parentTableTotal.value = e.total
   })
 }
 
 getParentTable()
 /** 打印按钮操作 */
-const handlePrint = async (row?: InstockDetailVO) => {
+const handlePrint = async (row?: OutstockDetailVO) => {
   reset();
-  const _instockDetailId = row?.instockDetailId || ids.value[0]
-  const res = await getInstockDetail(_instockDetailId);
+  const _outstockDetailId = row?.outstockDetailId || ids.value[0]
+  const res = await getOutstockDetail(_outstockDetailId);
   Object.assign(childrenTableInfoForm.value, res.data);
 
 
@@ -618,9 +679,13 @@ const query = async () => {
   await getParentTable()
 }
 const reset = () => {
-  queryForm.value = {
-    instockId: ''
-  }
+  queryForm.value.outstockCode = '';
+  queryForm.value.materialCategoryId = '';
+  queryForm.value.materialCategoryName = '';
+  queryForm.value.warehouseId = '';
+  queryForm.value.outstockType = routeOutstockTypeValue;
+  queryForm.value.pageNum = 1;
+  queryForm.value.pageSize = 10;
 }
 
 // 父表格行点击
@@ -633,14 +698,7 @@ const parentTableCellClick = async (e) => {
 const selectionChange = (e) => {
   ids.value = e.map(v => v.outstockId)
 }
-// 查看
-const viewDetails = (e) => {
-  isView.value = true
-  dialogVisible.value = true
-  viewAllocateOrder(e.aoId).then(v => {
-    dialogForm.value = v.data
-  })
-}
+
 
 // 父表格新增
 const parentTableAdd = () => {
@@ -712,10 +770,14 @@ const addDialogTableCell = () => {
 const dialogSubmit = () => {
 
   addOutstockOrder(dialogForm.value).then(e => {
-    addOutstockDetail(dialogtable.value.map(item => {
-        return {...item, outstockCode: e.data.outstockCode,outstockId: e.data.outstockId, materialCategoryId: e.data.materialCategoryId}
-      }
-      )
+    // addOutstockDetail(dialogtable.value.map(item => {
+    //     return {...item, outstockCode: e.data.outstockCode,outstockId: e.data.outstockId, materialCategoryId: e.data.materialCategoryId}
+    //   }
+    //   )
+    Promise.all(dialogtable.value.map(async (item) => {
+        const detail = {...item, outstockCode: e.data.outstockCode, outstockId: e.data.outstockId, materialCategoryId: e.data.materialCategoryId};
+        return addOutstockDetail(detail);
+      })
     ).then(v => {
       dialogVisible.value = false
       getParentTable()
@@ -737,7 +799,8 @@ const parentTableInfoSubmit = () =>{
 
 // 子表格修改
 const childrenTableUpdate = async (e) => {
-  childrenTableInfoForm.value = (await getInstockDetail(e.instockDetailId)).data
+  const res = (await getOutstockDetail(e.outstockDetailId));
+  childrenTableInfoForm.value = res.data;
   childrenTableInfoVisible.value = true
 }
 // 子表格数据新增删除
@@ -816,8 +879,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;
         // 可以根据需要添加更多字段
       }
     }
@@ -836,6 +899,48 @@ const handleMaterialAdd = (type, index) => {
 }
 
 
+
+// 审批弹窗打开
+const openApprove = (row) => {
+  if (!row || !row.outstockId) {
+    ElMessage({ type: 'warning', message: '未获取到出库单ID' })
+    return
+  }
+  approveForm.value = {
+    outstockId: row.outstockId,
+    auditStatus: approveForm.value.auditStatus ?? '',
+    auditComments: approveForm.value.auditComments ?? ''
+  }
+  approveDialogVisible.value = true
+}
+
+// 审批提交
+const submitApprove = async () => {
+  const payload = {
+    outstockId: approveForm.value.outstockId!,
+    auditStatus: approveForm.value.auditStatus ?? '',
+    auditComments: approveForm.value.auditComments ?? ''
+  }
+  if (!payload.outstockId) {
+    ElMessage({ type: 'warning', message: '缺少出库单ID，无法提交审批' })
+    return
+  }
+  if (!payload.auditStatus) {
+    ElMessage({ type: 'warning', message: '请选择审核状态' })
+    return
+  }
+  try {
+    await approveOutstockOrder(payload)
+    ElMessage({ type: 'success', message: '审批成功' })
+    approveDialogVisible.value = false
+    // 刷新父表格
+    await getParentTable()
+  } catch (err) {
+    ElMessage({ type: 'error', message: '审批失败，请重试' })
+  }
+}
+
+
 </script>
 <style>
 .demo-form-inline .el-input {
diff --git a/src/views/wms/wmsBaseArea/index.vue b/src/views/wms/wmsBaseArea/index.vue
index 3db943d..c166079 100644
--- a/src/views/wms/wmsBaseArea/index.vue
+++ b/src/views/wms/wmsBaseArea/index.vue
@@ -7,8 +7,8 @@
             <!-- <el-form-item label="区域ID" prop="areaId">
               <el-input v-model="queryParams.areaId" placeholder="请输入区域ID" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="仓库ID" prop="warehouseId">
-              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="仓库" prop="warehouseId">
+              <el-input v-model="queryParams.warehouseId" placeholder="请输入仓库" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
             <el-form-item label="区域编码" prop="areaCode">
               <el-input v-model="queryParams.areaCode" placeholder="请输入区域编码" clearable @keyup.enter="handleQuery" />
@@ -105,9 +105,9 @@
           <el-input v-model="form.areaId" placeholder="请输入区域ID" />
         </el-form-item> -->
         <el-form-item label="所属仓库" prop="warehouseId">
-          <el-select 
-            v-model="form.warehouseId" 
-            placeholder="请选择所属仓库"  
+          <el-select
+            v-model="form.warehouseId"
+            placeholder="请选择所属仓库"
             :disabled="!!form.areaId"
             @change="handleWarehouseChange"
           >
@@ -120,8 +120,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="区域代号" prop="areaCodeSuffix" v-if="!form.areaId">
-          <el-input 
-            v-model="form.areaCodeSuffix" 
+          <el-input
+            v-model="form.areaCodeSuffix"
             placeholder="请输入区域代号（如：A、B等）"
             @input="generateAreaCode"
             :disabled="!!form.areaId"
@@ -198,7 +198,7 @@ const dialog = reactive<DialogOption>({
 const columns = ref<FieldOption[]>([
         { key: 0, label: `序号`, visible: true },
         // { key: 1, label: `租户号`, visible: true },
-        { key: 2, label: `仓库ID`, visible: true },
+        { key: 2, label: `仓库`, visible: true },
         { key: 3, label: `仓库`, visible: true },
         { key: 4, label: `区域编码`, visible: true },
         { key: 5, label: `区域名称`, visible: true },
@@ -324,7 +324,7 @@ const handleUpdate = async (row?: WmsBaseAreaVO) => {
   const _areaId = row?.areaId || ids.value[0];
   const res = await getWmsBaseArea(_areaId);
   const data = res.data;
-  
+
   // 设置表单数据
   form.value.areaId = data.areaId;
   form.value.warehouseId = data.warehouseId;
@@ -336,12 +336,12 @@ const handleUpdate = async (row?: WmsBaseAreaVO) => {
   form.value.areaManager = data.areaManager;
   form.value.activeFlag = data.activeFlag || '1';
   form.value.remark = data.remark;
-  
+
   // 从区域编码中提取区域代号（去掉仓库编码部分）
   if (data.areaCode && data.warehouseCode) {
     form.value.areaCodeSuffix = data.areaCode.replace(data.warehouseCode, '');
   }
-  
+
   dialog.visible = true;
   dialog.title = "修改区域信息";
 };
@@ -376,7 +376,7 @@ const submitForm = () => {
         }
         form.value.areaCode = `${form.value.warehouseCode}${form.value.areaCodeSuffix.toUpperCase()}`;
       }
-      
+
       buttonLoading.value = true;
       try {
         if (form.value.areaId) {