diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index 42ff31eb6..c812c24ff 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -102,6 +102,7 @@ const updataTableColumns = (val) => {
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
+    console.log(val[0]['number'])
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
@@ -111,8 +112,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV[formField] = val[0][searchField]
       setV['purchaseReceiptRecordNumber'] = val[0]['number']
       setV['supplierCode'] = val[0]['supplierCode']
-      row['poNumber'] = val[0]['number']
-      row['poLine'] = val[0]['lineNumber']
+      // row['poNumber'] = val[0]['number']
+      // row['poLine'] = val[0]['lineNumber']
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 3793fc8cc..fa4cbdeca 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -84,6 +84,7 @@ import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMa
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { Console } from 'console'
 
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMain' })
@@ -106,25 +107,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
+      console.log(row['batch'])
+      console.log(val[0]['toBatch'])
       row[formField] = val[0][searchField]
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
       setV['purchaseReceiptRecordNumber'] = val[0]['number']
       setV['supplierCode'] = val[0]['supplierCode']
+      
       // 获取子表数据 getBomDisassemble
       PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
         masterId: val[0]['id']}).then(res => {
-          if (res) tableData.value = res
+          if (res) tableData.value = res;
           console.log(PurchasereturnRequestDetail.allSchemas.tableFormColumns)
-          
+          tableData.value.forEach(item=>{
+            item.batch = item.toBatch
+            item.packingNumber = item.toPackingNumber
+            item.containerNumber = item.toContainerNumber
+          })
           PurchasereturnRequestDetail.allSchemas.tableFormColumns.map(item => {
-            // if(item.field == 'qty') {
-            //   item.tableForm.disabled = false
-            //   tableData.value.forEach(cur=>{
-            //     item.tableForm.max = cur['qty']
-            //   })
-            // }
             if(item.field == 'remark') {
               item.tableForm.disabled = false
             }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 4feeb1457..33e08f770 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -534,20 +534,20 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled:true
     }
   },
+  // {
+  //   label: '从批次',
+  //   field: 'fromBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   }, 
+  //   tableForm:{
+  //     disabled:true
+  //   }
+  // },
   {
-    label: '从批次',
-    field: 'fromBatch',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      disabled:true
-    }
-  },
-  {
-    label: '到批次',
-    field: 'toBatch',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
@@ -568,30 +568,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      disabled:true
-    }
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      disabled:true
-    }
-  },
-  {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -601,8 +579,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 167a64224..e784ac180 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -111,7 +111,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['supplierCode'] = val[0]['code']
+      setV['inspectRecordNumber'] = val[0]['number']
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 2435c71cd..d697ef42a 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -39,7 +39,7 @@ const userDept = userStore.userSelfInfo.dept
 export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货检验记录单号',
-    field: 'purchaseReceiptRecordNumber',
+    field: 'inspectRecordNumber',
     sort: 'custom',
     table: {
       width: 150