diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index e0a18101c..a1ec4351f 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -70,6 +70,7 @@ import * as Itempackaging from '@/api/wms/itempackage'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {getProductionlineitemPage} from "@/api/wms/productionlineitem";
 const { loadStart, loadDone } = usePageLoading()
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -107,20 +108,33 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['itemDesc1'] = val[0]['desc1']
         setV['itemDesc2'] = val[0]['desc2']
         setV['uom'] = val[0]['uom']
-        setV['produceDate'] = val[0]['activeTime']
-        setV['expireDate'] = val[0]['expireTime']
-        setV['validityDays'] = val[0]['validityDays']
-        await Itempackaging.getItempackagingPage({
+        setV['backNumber'] = val[0]['backNumber']
+        setV['colorCode'] = val[0]['colorCode']
+        setV['receivedNumber'] = val[0]['receivedNumber']
+        setV['status'] = val[0]['status']
+        setV['packQty'] = val[0]['defaultPackQty']
+        setV['packUnit'] = val[0]['defaultPackUnit']
+
+        await getProductionlineitemPage({
           itemCode: val[0]['code']
         }).then(res => {
           if (res) {
             if (res.list.length > 0) {
-              setV['packQty'] = res.list[0].packQty
-              setV['packUnit'] = res.list[0].packUnit
+              setV['productionLine'] = res.list[0].productionLineCode
             }
           }
         })
       }
+    if (formField == 'supplierCode') {
+      setV['supplierName'] = val[0]['name']
+    }
+    if (formField == 'asnNumber') {
+      setV['purchaseOrderRemarks'] = val[0]['remark']
+    }
+    if (formField == 'toDockCode') {
+      setV['receivedLocation'] = val[0]['name']
+      setV['defaultReceivingArea'] = val[0]['remark']
+    }
       basicFormRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index e7920f846..75021aa2e 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -3,22 +3,14 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
-import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
-import * as WarehouseApi from "@/api/wms/warehouse";
 import { Dock } from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data";
 import * as DockApi from "@/api/wms/dock";
-import { Location } from "@/views/wms/basicDataManage/factoryModeling/location/location.data";
-import * as LocationApi from "@/api/wms/location";
 import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data";
 import * as SupplierApi from "@/api/wms/supplier";
-import { PurchaseMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data";
-import * as PurchaseMainApi from "@/api/wms/purchaseMain";
-import { PurchaseDetail } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data";
-import * as PurchaseDetailApi from "@/api/wms/purchaseDetail";
-import { PurchasePlanMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data";
-import * as PurchasePlanMainApi from "@/api/wms/purchasePlanMain";
 import { SupplierdeliverRecordMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data";
 import * as SupplierdeliverRecordMainApi from "@/api/wms/supplierdeliverRecordMain";
+import * as ItemPackageApi from "@/api/wms/itempackage";
+import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
 
 // 表单校验
 export const PackageRules = reactive({
@@ -251,7 +243,11 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
-    isForm:false
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
   },
   {
     label: '物料描述1',
@@ -260,7 +256,11 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
-    isForm:false
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
   },
   {
     label: '物料描述2',
@@ -269,112 +269,86 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
     },
-    isForm:false
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '背番',
+    field: 'backNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150,
     },
-  },
-  // {
-  //   label: '替代批次',
-  //   field: 'altBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150,
-  //   },
-  // },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    sort: 'custom',
-    formatter: dateFormatter2,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        disabled: true,
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+      componentProps:{
         disabled: true
       }
     },
-    table: {
-      width: 180,
-    },
   },
   {
-    label: '有效期(日)',
-    field: 'validityDays',
+    label: '色番',
+    field: 'colorCode',
     sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 0,
-        disabled: true
-      },
-      value: 0
-    },
     table: {
       width: 150,
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
   },
   {
-    label: '失效日期',
-    field: 'expireDate',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
-    formatter: dateFormatter2,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD',
-        type: 'daterange',
-        disabled: true,
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
+    table: {
+      width: 150,
     },
     form: {
-      component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        enterSearch: true,
         disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择物料代码',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
       }
-    },
-    table: {
-      width: 180,
-    },
+    }
   },
   {
-    label: '计量单位',
-    field: 'uom',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Select'
-    },
     table: {
       width: 150,
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '数量',
@@ -393,80 +367,46 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '替代计量单位',
-    field: 'altUom',
+    label: '受入号',
+    field: 'receivedNumber',
     sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    form: {
-      component: 'Select'
-    },
+    isSearch: false,
     table: {
-      width: 150,
-    },
-  },
-  {
-    label: '替代数量',
-    field: 'altQty',
-    sort: 'custom',
-    table: {
-      width: 150,
+      width: 150
     },
     form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      },
-      value: 0
+      componentProps:{
+        disabled: true
+      }
     },
   },
   {
-    label: '转换率',
-    field: 'convertRate',
+    label: '生产线区分',
+    field: 'productionLine',
     sort: 'custom',
+    isSearch: false,
     table: {
-      width: 150,
+      width: 150
     },
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '物料状态',
+    field: 'status',
     sort: 'custom',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
     table: {
-      width: 150,
+      width: 120
     },
     form: {
       componentProps:{
         disabled: true
       }
     },
-    tableForm: {
-      disabled: true
-    }
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    table: {
-      width: 150,
-    },
-    form: {
-      component: 'Select',
-      componentProps:{
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '仓库代码',
-    field: 'toWarehouseCode',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150,
@@ -476,11 +416,11 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择仓库代码',
+        searchListPlaceholder: '请选择供应商代码',
         searchField: 'code',
-        searchTitle: '仓库信息',
-        searchAllSchemas: Warehouse.allSchemas,
-        searchPage: WarehouseApi.getWarehousePage,
+        searchTitle: '供应商信息',
+        searchAllSchemas: Supplier.allSchemas,
+        searchPage: SupplierApi.getSupplierPage,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -498,129 +438,72 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '月台代码',
-    field: 'toDockCode',
+    label: '供应商名称',
+    field: 'supplierName',
     sort: 'custom',
     table: {
       width: 150,
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择仓库代码',
-        searchField: 'code',
-        searchTitle: '仓库信息',
-        searchAllSchemas: Dock.allSchemas,
-        searchPage: DockApi.getDockPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+      componentProps:{
+        disabled: true
       }
-    }
+    },
   },
   {
-    label: '库位代码',
-    field: 'toLocationCode',
+    label: '送货日期',
+    field: 'deliveryDate',
     sort: 'custom',
-    table: {
-      width: 150,
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
+    formatter: dateFormatter2,
+    search: {
+      component: 'DatePicker',
       componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择库位代码',
-        searchField: 'code',
-        searchTitle: '库位信息',
-        searchAllSchemas: Location.allSchemas,
-        searchPage: LocationApi.getLocationPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        disabled: false,
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
-    }
-  },
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    table: {
-      width: 150,
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'DatePicker',
       componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择供应商代码',
-        searchField: 'code',
-        searchTitle: '供应商信息',
-        searchAllSchemas: Supplier.allSchemas,
-        searchPage: SupplierApi.getSupplierPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+        disabled: false
       }
-    }
+    },
+    table: {
+      width: 180,
+    },
   },
   {
-    label: '供应商物料代码',
-    field: 'supplierItemCode',
+    label: '便次',
+    field: 'stoolTime',
     sort: 'custom',
     table: {
       width: 150,
     },
   },
   {
-    label: '采购订单号',
-    field: 'poNumber',
+    label: 'ASN单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 182,
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择采购订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchListPlaceholder: '请选择发货单号',
+        searchField: 'asnNumber',
+        searchTitle: '发货信息',
+        searchAllSchemas: SupplierdeliverRecordMain.allSchemas,
+        searchPage: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage,
         searchCondition: [
           {
             key: 'supplierCode',
@@ -629,64 +512,38 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
             isMainValue: true
           },
           {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
           }],
-          verificationParams: [{
-            key: 'number',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+        verificationParams: [{
+          key: 'asnNumber',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
   {
-    label: '采购订单行',
-    field: 'poLine',
+    label: '采购订单备注',
+    field: 'purchaseOrderRemarks',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150,
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择采购订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-        searchCondition: [
-          {
-            key: 'number',
-            value: 'poNumber',
-            message: '请填写采购订单号！',
-            isMainValue: true
-          },
-          {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'lineNumber',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+      componentProps:{
+        disabled: true
       }
-    }
+    },
   },
   {
-    label: '采购计划单号',
-    field: 'rpNumber',
+    label: '月台',
+    field: 'toDockCode',
     sort: 'custom',
     table: {
       width: 150,
@@ -696,25 +553,18 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择采购订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchasePlanMain.allSchemas,
-        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage,
-        searchCondition: [
-          {
-            key: 'supplierCode',
-            value: 'supplierCode',
-            message: '请填写供应商代码！',
-            isMainValue: true
-          },
-          {
+        searchListPlaceholder: '请选择仓库代码',
+        searchField: 'code',
+        searchTitle: '月台',
+        searchAllSchemas: Dock.allSchemas,
+        searchPage: DockApi.getDockPage,
+        searchCondition: [{
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-          }],
+        }],
         verificationParams: [{
-          key: 'number',
+          key: 'code',
           action: '==',
           value: '',
           isMainValue: false,
@@ -725,55 +575,33 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '发货单号',
-    field: 'asnNumber',
+    label: '受入地',
+    field: 'receivedLocation',
     sort: 'custom',
+    isSearch: true,
     table: {
-      width: 182,
+      width: 150
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择发货单号',
-        searchField: 'asnNumber',
-        searchTitle: '发货信息',
-        searchAllSchemas: SupplierdeliverRecordMain.allSchemas,
-        searchPage: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage,
-        searchCondition: [
-          {
-            key: 'supplierCode',
-            value: 'supplierCode',
-            message: '请填写供应商代码！',
-            isMainValue: true
-          },
-          {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-          }],
-        verificationParams: [{
-          key: 'asnNumber',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+      componentProps:{
+        disabled: true
       }
-    }
+    },
   },
-
   {
-    label: '操作',
-    field: 'action',
-    isForm: false,
+    label: '默认收货库区',
+    field: 'defaultReceivingArea',
+    sort: 'custom',
+    isSearch: true,
     table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+  },
 ]))
 
 //表单校验
@@ -781,49 +609,22 @@ export const PackageRulesInventor = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  produceDate: [
-    { required: true, message: '请选择生产日期', trigger: 'change' }
-  ],
-  validityDays: [
-    { required: true, message: '请输入有效期(日)', trigger: 'blur' }
-  ],
-  expireDate: [
-    { required: true, message: '请选择失效日期', trigger: 'change' }
-  ],
-  uom: [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
-  ],
   qty: [
     { required: true, message: '请输入数量', trigger: 'blur' }
   ],
-  // toWarehouseCode: [
-  //   { required: true, message: '请选择仓库代码', trigger: 'change' }
-  // ],
-  // toDockCode: [
-  //   { required: true, message: '请选择月台代码', trigger: 'change' }
-  // ],
-  // toLocationCode: [
-  //   { required: true, message: '请选择库位代码', trigger: 'change' }
-  // ],
+  toDockCode: [
+    { required: true, message: '请选择月台代码', trigger: 'change' }
+  ],
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }
   ],
-  // supplierItemCode: [
-  //   { required: true, message: '请选择供应商物料代码', trigger: 'change' }
-  // ],
-  // poNumber: [
-  //   { required: true, message: '请选择采购订单号', trigger: 'change' }
-  // ],
-  // poLine: [
-  //   { required: true, message: '请选择采购订单行', trigger: 'change' }
-  // ],
-  // rpNumber: [
-  //   { required: true, message: '请选择采购计划单号', trigger: 'change' }
-  // ],
   asnNumber: [
-    { required: true, message: '请选择发货单号', trigger: 'change' }
+    { required: true, message: '请选择ASN单号', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  deliveryDate: [
+    { required: true, message: '请选择送货日期', trigger: 'change' }
   ],
 })
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index ea487419a..eff3ca35c 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -119,6 +119,8 @@ import * as ScrapRequestMainApi from '@/api/wms/scrapRequestMain'
 import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+import * as WarehouseApi from '@/api/wms/warehouse'
 import { getSwitchByCode } from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -141,18 +143,36 @@ const ScrapRequestMainAllSchema = ref(cloneDeep(ScrapRequestMain))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)
-const getSwitchByCode1 =async ()  => {
-  await getSwitchByCode("EnableQms").then((res) => {
+const getSwitchByCode1 = async () => {
+  await getSwitchByCode('EnableQms').then((res) => {
     EnableQms.value = res == 'TRUE' ? true : false
-  if (EnableQms.value) {
-    ScrapRequestMain.allSchemas = ScrapRequestMainAllSchema.value.allSchemas
-  } else {
-    ScrapRequestMain.allSchemas.formSchema = ScrapRequestMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number')
-    ScrapRequestMain.allSchemas.tableColumns = ScrapRequestMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number')
-    ScrapRequestMain.allSchemas.tableFormColumns = ScrapRequestMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number')
-    ScrapRequestMain.allSchemas.tableMainColumns = ScrapRequestMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number')
-    ScrapRequestMain.allSchemas.detailSchema = ScrapRequestMainAllSchema.value.allSchemas.detailSchema.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number')
-    ScrapRequestMain.allSchemas.searchSchema = ScrapRequestMainAllSchema.value.allSchemas.searchSchema.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number')
+    if (EnableQms.value) {
+      ScrapRequestMain.allSchemas = ScrapRequestMainAllSchema.value.allSchemas
+    } else {
+      ScrapRequestMain.allSchemas.formSchema =
+        ScrapRequestMainAllSchema.value.allSchemas.formSchema.filter(
+          (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number'
+        )
+      ScrapRequestMain.allSchemas.tableColumns =
+        ScrapRequestMainAllSchema.value.allSchemas.tableColumns.filter(
+          (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number'
+        )
+      ScrapRequestMain.allSchemas.tableFormColumns =
+        ScrapRequestMainAllSchema.value.allSchemas.tableFormColumns.filter(
+          (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number'
+        )
+      ScrapRequestMain.allSchemas.tableMainColumns =
+        ScrapRequestMainAllSchema.value.allSchemas.tableMainColumns.filter(
+          (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number'
+        )
+      ScrapRequestMain.allSchemas.detailSchema =
+        ScrapRequestMainAllSchema.value.allSchemas.detailSchema.filter(
+          (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number'
+        )
+      ScrapRequestMain.allSchemas.searchSchema =
+        ScrapRequestMainAllSchema.value.allSchemas.searchSchema.filter(
+          (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number'
+        )
     }
     updateKey.value++
   })
@@ -210,7 +230,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         row[formField] = val[0][searchField]
       }
     } else {
-      console.log("报废出库主表")
+      console.log('报废出库主表')
       const setV = {}
       if (formField == 'q1Number') {
         setV['noticeRemark'] = val[0]['desc']
@@ -242,24 +262,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           }
         })
       }
-      if(formField === 'usageDescription'){
+      if (formField === 'usageDescription') {
         setV['usageDescription'] = val[0]['usageDescription']
         setV['usageCode'] = val[0]['code']
       }
-      if(formField === 'costCenterCode'){
+      if (formField === 'costCenterCode') {
         setV['costcentreCode'] = val[0]['costcentreCode']
         setV['costCenterType'] = val[0]['costcentreType']
       }
-      if(formField === 'reasonCodeRequisition'){
+      if (formField === 'reasonCodeRequisition') {
         setV['reasonCodeRequisition'] = val[0]['code']
       }
-      if(formField === 'projectCode'){
+      if (formField === 'projectCode') {
         setV['projectCode'] = val[0]['projectCode']
       }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
-   
   })
 }
 const clearSearchInput = (field) => {
@@ -272,7 +291,7 @@ const clearSearchInput = (field) => {
       }
     })
     formRef.value.formRef.setValues({
-      noticeRemark:''
+      noticeRemark: ''
     })
   }
   if (field == 'q2Number') {
@@ -284,7 +303,7 @@ const clearSearchInput = (field) => {
       }
     })
     formRef.value.formRef.setValues({
-      noticeRemark:''
+      noticeRemark: ''
     })
   }
   if (field == 'q3Number') {
@@ -296,7 +315,7 @@ const clearSearchInput = (field) => {
       }
     })
     formRef.value.formRef.setValues({
-      noticeRemark:''
+      noticeRemark: ''
     })
   }
 }
@@ -538,6 +557,27 @@ const handleHandle = async (id: number) => {
 const formRef = ref()
 const openForm = async (type: string, row?: any) => {
   if (type == 'create') {
+    const params = {
+      by: 'ASC',
+      filters: [
+        { column: 'available', action: '==', value: 'TRUE' },
+        { column: 'type', action: '==', value: 'SCRAP' }
+      ],
+      pageNo: 1,
+      pageSize: 500,
+      sort: ''
+    }
+    params.isSearch = true
+    WarehouseApi.getWarehousePage(params).then((res) => {
+      if (res.list?.length > 0) {
+        nextTick(() => {
+          formRef.value.formRef.setValues({
+            fromWarehouseCode: res.list[0].code
+          })
+        })
+      }
+    })
+
     ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
         item.componentProps.enterSearch = true
@@ -589,7 +629,7 @@ const openForm = async (type: string, row?: any) => {
       })
     }
     if (!row.q3Number && !row.q2Number && !row.q1Number) {
-       ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
+      ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
         if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') {
           item.componentProps.enterSearch = true
           item.componentProps.isSearchList = true
@@ -676,7 +716,7 @@ const submitForm = async (formType, submitData) => {
     data.id = data.masterId
   }
   data.subList = tableData.value // 拼接子表数据参数
-  data.subList.forEach(item=>{
+  data.subList.forEach((item) => {
     item.qty = Number(item.qty).toFixed(2)
     item.singlePrice = Number(item.singlePrice).toFixed(2)
     item.amount = Number(item.amount).toFixed(2)
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 4a6c3b273..98145516e 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -47,6 +47,101 @@ const userDept = userStore.userSelfInfo.dept
 userDept.id = userDept.id.toString()
 const userDeptArray: any = [userDept]
 
+export const QadProjectCode = useCrudSchemas(
+    reactive<CrudSchema[]>([
+      
+      {
+        label: 'id',
+        field: 'id',
+        sort: 'custom',
+        isForm: false,
+        isTable:false,
+      },
+      {
+        label: '项目ID',
+        field: 'projectId',
+        sort: 'custom',
+        isSearch: false,
+      },
+      {
+        label: '项目代码',
+        field: 'projectCode',
+        sort: 'custom',
+        isSearch: true,
+      },
+      {
+        label: '项目描述',
+        field: 'projectDescription',
+        sort: 'custom',
+        isSearch: false,
+        form: {
+          component: 'Editor',
+          componentProps: {
+            valueHtml: '',
+            height: 200
+          }
+        },
+      },
+      {
+        label: '项目开始时间',
+        field: 'projectStartDate',
+        sort: 'custom',
+        formatter: dateFormatter,
+        isSearch: false,
+        search: {
+          component: 'DatePicker',
+          componentProps: {
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            type: 'daterange',
+            defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+          }
+        },
+        form: {
+          component: 'DatePicker',
+          componentProps: {
+            type: 'datetime',
+            valueFormat: 'x'
+          }
+        },
+      },
+      {
+        label: '项目结束时间',
+        field: 'projectEndDate',
+        sort: 'custom',
+        formatter: dateFormatter,
+        isSearch: false,
+        search: {
+          component: 'DatePicker',
+          componentProps: {
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            type: 'daterange',
+            defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+          }
+        },
+        form: {
+          component: 'DatePicker',
+          componentProps: {
+            type: 'datetime',
+            valueFormat: 'x'
+          }
+        },
+      },
+      {
+        label: '状态代码',
+        field: 'statusCode',
+        sort: 'custom',
+        isSearch: false,
+      },
+      {
+        label: '备注',
+        field: 'remark',
+        sort: 'custom',
+        isSearch: false,
+      }
+    ])
+  )
+
+  
 /**
  * @returns {Array} 报废出库申请主表
  */
@@ -243,7 +338,7 @@ export const ScrapRequestMain = useCrudSchemas(
         searchListPlaceholder: '请选择QAD项目信息',
         searchField: 'projectCode',
         searchTitle: '领用原因代码',
-        searchAllSchemas: QadProject.allSchemas,
+        searchAllSchemas: QadProjectCode.allSchemas,
         searchPage: QadProjectApi.getQadProjectPage,
         verificationParams: [{
           key: 'projectCode',
@@ -262,7 +357,7 @@ export const ScrapRequestMain = useCrudSchemas(
           searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
           searchField: 'projectCode', // 查询弹窗赋值字段
           searchTitle: '领用原因代码', // 查询弹窗标题
-          searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+          searchAllSchemas: QadProjectCode.allSchemas, // 查询弹窗所需类
           searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
           searchCondition: [{
             key: 'available',
@@ -539,6 +634,11 @@ export const ScrapRequestMain = useCrudSchemas(
             key: 'available',
             value: 'TRUE',
             isMainValue: false
+          },
+          {
+            key: 'type',
+            value: 'SCRAP',
+            isMainValue: false
           }
         ],
         verificationParams: [
@@ -567,6 +667,11 @@ export const ScrapRequestMain = useCrudSchemas(
               key: 'available',
               value: 'TRUE',
               isMainValue: false
+            },
+            {
+              key: 'type',
+              value: 'SCRAP',
+              isMainValue: false
             }
           ],
           verificationParams: [
@@ -965,6 +1070,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       multiple:true,
+      disabled: true,
       isInpuFocusShow: false, // 开启查询弹窗
       searchListPlaceholder: '请选择批次',
       searchField: 'batch',
@@ -997,7 +1103,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        isSearchList: true,// 开启查询弹窗
+        disabled: true, 
         searchListPlaceholder: '请选择批次',
         searchField: 'batch',
         searchTitle: '库存余额信息',
diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue
index a84904362..2f3801adb 100644
--- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue
@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:amv-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:amv-purchasereceipt-record-main:createPurchasereturnRecord',
diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index f123cfa53..45c51ab89 100644
--- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 400,
-  //     fixed: 'right'
-  //   },
-  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 400,
+      fixed: 'right'
+    },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -684,7 +684,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '是否已生成上架申请',
@@ -703,7 +702,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '物料类型',
@@ -1234,18 +1232,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue
index a3284de17..9c07d4d43 100644
--- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue
@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:bs-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:bs-purchasereceipt-record-main:createPurchasereturnRecord',
diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index f123cfa53..45c51ab89 100644
--- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 400,
-  //     fixed: 'right'
-  //   },
-  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 400,
+      fixed: 'right'
+    },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -684,7 +684,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '是否已生成上架申请',
@@ -703,7 +702,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '物料类型',
@@ -1234,18 +1232,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 3349d2e31..46842c9f4 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -90,7 +90,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
           disabled: true
         }
       },
-      isSearch: true,
     },
     {
       label: '运输方式',
@@ -987,6 +986,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '物料类型',
+      field: 'itemType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      dictType: DICT_TYPE.ITEM_TYPE,
+      dictClass: 'string',
+      sortTableDefault: 7,
+      isSearch: true
+    },
     {
       label: '物料描述1',
       field: 'itemDesc1',
@@ -1114,18 +1125,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: false,
       sortTableDefault: 1012
     },
-    {
-      label: '操作',
-      hiddenInMain: true,
-      field: 'action',
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 180,
-        fixed: 'right'
-      },
-      isTableForm: true
-    }
+    // {
+    //   label: '操作',
+    //   hiddenInMain: true,
+    //   field: 'action',
+    //   isDetail: false,
+    //   isForm: false,
+    //   table: {
+    //     width: 180,
+    //     fixed: 'right'
+    //   },
+    //   isTableForm: true
+    // }
   ])
 )
 
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue
index 55ee5fb9d..8dcc305fe 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue
@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:develop-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:develop-purchasereceipt-record-main:createPurchasereturnRecord',
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index f123cfa53..45c51ab89 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 400,
-  //     fixed: 'right'
-  //   },
-  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 400,
+      fixed: 'right'
+    },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -684,7 +684,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '是否已生成上架申请',
@@ -703,7 +702,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '物料类型',
@@ -1234,18 +1232,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 211ddf776..ecbfbdb58 100644
--- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -206,7 +206,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '从仓库代码',
@@ -773,6 +772,21 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -1341,18 +1355,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
 ]))
 
 //表单校验
@@ -2350,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2409,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
+      width: 150
     },
     tableForm:{
       disabled:true
@@ -2530,3 +2545,4 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue
index 218dfc03b..52ef2b6f8 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue
@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:jis-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:jis-purchasereceipt-record-main:createPurchasereturnRecord',
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index f123cfa53..45c51ab89 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 400,
-  //     fixed: 'right'
-  //   },
-  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 400,
+      fixed: 'right'
+    },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -684,7 +684,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '是否已生成上架申请',
@@ -703,7 +702,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '物料类型',
@@ -1234,18 +1232,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 211ddf776..ecbfbdb58 100644
--- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -206,7 +206,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '从仓库代码',
@@ -773,6 +772,21 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -1341,18 +1355,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
 ]))
 
 //表单校验
@@ -2350,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2409,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
+      width: 150
     },
     tableForm:{
       disabled:true
@@ -2530,3 +2545,4 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 3349d2e31..46842c9f4 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -90,7 +90,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
           disabled: true
         }
       },
-      isSearch: true,
     },
     {
       label: '运输方式',
@@ -987,6 +986,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '物料类型',
+      field: 'itemType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      dictType: DICT_TYPE.ITEM_TYPE,
+      dictClass: 'string',
+      sortTableDefault: 7,
+      isSearch: true
+    },
     {
       label: '物料描述1',
       field: 'itemDesc1',
@@ -1114,18 +1125,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: false,
       sortTableDefault: 1012
     },
-    {
-      label: '操作',
-      hiddenInMain: true,
-      field: 'action',
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 180,
-        fixed: 'right'
-      },
-      isTableForm: true
-    }
+    // {
+    //   label: '操作',
+    //   hiddenInMain: true,
+    //   field: 'action',
+    //   isDetail: false,
+    //   isForm: false,
+    //   table: {
+    //     width: 180,
+    //     fixed: 'right'
+    //   },
+    //   isTableForm: true
+    // }
   ])
 )
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index bb115ee2e..3dba46e9e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -249,7 +249,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index a0fb7f5ab..45c51ab89 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -684,7 +684,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '是否已生成上架申请',
@@ -703,7 +702,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '物料类型',
@@ -1234,18 +1232,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 7306d2614..9e91e01e5 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -318,7 +318,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 211ddf776..6d613711f 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -206,7 +206,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '从仓库代码',
@@ -773,6 +772,21 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -1341,18 +1355,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
 ]))
 
 //表单校验
@@ -2350,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2409,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
+      width: 150
     },
     tableForm:{
       disabled:true
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 3349d2e31..46842c9f4 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -90,7 +90,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(
           disabled: true
         }
       },
-      isSearch: true,
     },
     {
       label: '运输方式',
@@ -987,6 +986,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '物料类型',
+      field: 'itemType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      dictType: DICT_TYPE.ITEM_TYPE,
+      dictClass: 'string',
+      sortTableDefault: 7,
+      isSearch: true
+    },
     {
       label: '物料描述1',
       field: 'itemDesc1',
@@ -1114,18 +1125,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: false,
       sortTableDefault: 1012
     },
-    {
-      label: '操作',
-      hiddenInMain: true,
-      field: 'action',
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 180,
-        fixed: 'right'
-      },
-      isTableForm: true
-    }
+    // {
+    //   label: '操作',
+    //   hiddenInMain: true,
+    //   field: 'action',
+    //   isDetail: false,
+    //   isForm: false,
+    //   table: {
+    //     width: 180,
+    //     fixed: 'right'
+    //   },
+    //   isTableForm: true
+    // }
   ])
 )
 
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue
index 99996a116..a15a8fc31 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue
@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:tool-purchasereceipt-record-main:createPurchasereturnRecord',
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index f123cfa53..45c51ab89 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 400,
-  //     fixed: 'right'
-  //   },
-  // },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 400,
+      fixed: 'right'
+    },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -684,7 +684,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '是否已生成上架申请',
@@ -703,7 +702,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '物料类型',
@@ -1234,18 +1232,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 211ddf776..ecbfbdb58 100644
--- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -206,7 +206,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         disabled: true
       }
     },
-    isSearch: true,
   },
   {
     label: '从仓库代码',
@@ -773,6 +772,21 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_TYPE,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    sortTableDefault:7,
+    isTableForm: false,
+    isForm: false,
+    isSearch: true,
+
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -1341,18 +1355,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-  }
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
 ]))
 
 //表单校验
@@ -2350,12 +2364,18 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       type: 'Select'
     }
   },
+  
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
     form: {
       componentProps: {
@@ -2409,16 +2429,11 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
+      width: 150
     },
     tableForm:{
       disabled:true
@@ -2530,3 +2545,4 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
   },
 ]))
+