diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 567018941..c470ee39a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -67,8 +67,8 @@
     :apiUpdate="InventorymoveRequestDetailApi.updateInventorymoveRequestDetail"
     :apiPage="InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage"
     :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
-    :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
   />
 
   <!-- 导入 -->
@@ -271,7 +271,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           }
         })
       }
-      // console.log(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')));
       }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
@@ -292,17 +291,17 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['uom'] = val[0]['uom']
       if(routeName.value == 'OktoholdRequestMain'){
         setV['toInventoryStatus'] = "HOLD"
-        }else if ( routeName.value == 'HoldtookRequestMain') {
-          setV['toInventoryStatus'] = "OK"
-        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-          setV['toInventoryStatus'] = "SCRAP"
+      }else if ( routeName.value == 'HoldtookRequestMain') {
+        setV['toInventoryStatus'] = "OK"
+      }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+        setV['toInventoryStatus'] = "SCRAP"
         }else if ( routeName.value == 'OktoscrapRequestMain') {
-          setV['toInventoryStatus'] = "SCRAP"
-        }else if ( routeName.value == 'ScraptoholdRequestMain') {
-          setV['toInventoryStatus'] = "HOLD"
-        }else{
-          setV['toInventoryStatus'] = val[0]['inventoryStatus']
-        }
+        setV['toInventoryStatus'] = "SCRAP"
+      }else if ( routeName.value == 'ScraptoholdRequestMain') {
+        setV['toInventoryStatus'] = "HOLD"
+      }else{
+        setV['toInventoryStatus'] = val[0]['inventoryStatus']
+      }
     } else {
       setV[formField] = val[0][searchField]
     }
@@ -310,10 +309,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo =  []
-
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
@@ -440,9 +435,31 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+/**
+ * 详情 新增/编辑事件
+ */
+const detailOpenForm = (type, row) => {
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+          key: 'warehouseCode',
+          value: fromWarehouseCodeMain.value,
+          isMainValue: false
+        })
+      } else {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+          if (item.key == 'warehouseCode') {
+            item.value = fromWarehouseCodeMain.value
+          }
+        })
+      }
+}
+
+const fromWarehouseCodeMain = ref()
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  fromWarehouseCodeMain.value = row.fromWarehouseCode
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index d20944767..10631f408 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -409,6 +409,9 @@ export const InventorymoveRequestMainRules = reactive({
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'blur' }
+  ],
   status: [
     { required: true, message: '请选择状态', trigger: 'change' }
   ],