Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

7 months ago · b029ec1fd9
9 changed files with 608 additions and 409 deletions
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@ -83,7 +83,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
    const setV = {}
    setV[formField] = val[0][searchField]
    setV['workBillno'] = val[0]['schedulingCode']//工单编码
-    setV['planCode'] = val[0]['planMaserCode']//计划编码
+    setV['planCode'] = val[0]['planMasterCode']//计划编码
    setV['processCode'] = val[0]['workingNode']//工序编码
    setV['stationCode'] = val[0]['currentWorkstation']//工位编码
    // 以上字段的值从job_mes_work_scheduling表中获取
--- a/src/views/mes/productionPlan/productionPlan.data.ts
+++ b/src/views/mes/productionPlan/productionPlan.data.ts
@ -213,7 +213,7 @@ export const workscheduling = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '计划编号',
-    field: 'planMaserCode',
+    field: 'planMasterCode',
    sort: 'custom',
    isSearch: true,
    table: {
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@ -29,7 +29,7 @@
    >
      <template #schedulingCode="{row}">
        <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
-          <span>{{ row.planMaserCode }}</span>
+          <span>{{ row.planMasterCode }}</span>
        </el-button>
      </template>
      <template #action="{ row }">
@ -169,10 +169,10 @@ const buttonBaseClick = (val, item) => {
 const butttondata=(row) =>{ return [
  defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
  //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
-  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // 
-  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), 
-  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), 
-  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // 
+  defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), //
+  defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
+  defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
+  //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), //
 ]}

 // 列表-操作按钮事件
--- a/src/views/mes/workScheduling/workScheduling.data.ts
+++ b/src/views/mes/workScheduling/workScheduling.data.ts
@ -44,7 +44,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
  },
  {
    label: '计划编号',
-    field: 'planMaserCode',
+    field: 'planMasterCode',
    sort: 'custom',
    isSearch: true,
    isForm: true,
@ -138,7 +138,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
    sort: 'custom',
    isForm: true,
  },
-  
+
  {
    label: '工单模式',
    field: 'formType',
@ -150,7 +150,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
      component: 'Select',
    },
  },
-  
+
  {
    label: '操作',
    field: 'action',
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@ -40,6 +40,19 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 180
    },
  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '客户代码',
    field: 'customerCode',
@ -55,6 +68,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '承运商',
@ -63,6 +77,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    sortTableDefault:1000,
  },
  {
    label: '运输方式',
@ -71,6 +86,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    sortTableDefault:1000,
  },
  {
    label: '车牌号',
@ -79,6 +95,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    sortTableDefault:1000,
  },
  {
    label: '申请时间',
@ -91,6 +108,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -111,6 +129,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -131,6 +150,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -151,6 +171,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -168,6 +189,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '到仓库代码',
@ -176,13 +198,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '从库区类型范围',
    field: 'fromAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -195,13 +218,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '到库区类型范围',
    field: 'toAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -214,6 +238,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '出库事务类型',
@ -222,6 +247,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '入库事务类型',
@ -230,6 +256,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '业务类型',
@ -238,6 +265,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
+
  },
  {
    label: '部门',
@ -246,13 +275,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '接口类型',
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -265,6 +295,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '创建时间',
@ -277,6 +308,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -293,6 +325,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false
  },
  // {
  //   label: '代码',
@ -308,7 +341,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
    isSearch: true,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -396,6 +429,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 180
    },
+    isTable: false,
  },
  // {
  //   label: '销售订单号',
@ -436,6 +470,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    hiddenInMain:true,
  },
  {
    label: '物料描述2',
@ -444,107 +479,138 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    hiddenInMain:true,
  },
  {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '批次',
+    field: 'batch',
    sort: 'custom',
    table: {
      width: 150
    },
  },
  {
-    label: '到批次',
-    field: 'toBatch',
+    label: '包装代码',
+    field: 'packingNumber',
    sort: 'custom',
    table: {
      width: 150
    },
  },
-  // {
-  //   label: '包装号',
-  //   field: 'packingNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '包装规格',
+    field: 'packUnit',
    sort: 'custom',
    table: {
      width: 150
    },
  },
  {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '数量',
+    field: 'qty',
    sort: 'custom',
    table: {
      width: 150
    },
+    form: {
+      component: 'InputNumber',
+    }
  },
  {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
    sort: 'custom',
    table: {
      width: 150
    },
  },
  {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '从库位',
+    field: 'fromLocationCode',
    sort: 'custom',
    table: {
      width: 150
    },
  },
  {
-    label: '数量',
-    field: 'qty',
+    label: '到库位',
+    field: 'toLocationCode',
    sort: 'custom',
    table: {
      width: 150
    },
-    form: {
-      component: 'InputNumber',
-    }
  },
+  
  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '从批次',
+    field: 'fromBatch',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+
+  },
+  
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false,
+
  },
  {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
    sort: 'custom',
    table: {
      width: 150
    },
+    isTable: false,
+
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
  },
+  
+  
  {
    label: '库存状态',
    field: 'inventoryStatus',
    dictType: DICT_TYPE.INVENTORY_STATUS,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -559,7 +625,9 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    },
    form: {
      component: 'InputNumber',
-    }
+    },
+    isTable: false,
+
  },
  {
    label: '金额',
@ -568,6 +636,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
    form: {
      component: 'InputNumber',
    }
@ -579,6 +648,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '到库位组代码',
@ -587,6 +657,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '从库区代码',
@ -595,6 +666,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '到库区代码',
@ -603,6 +675,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '从货主代码',
@ -611,6 +684,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '到货主代码',
@ -619,6 +693,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '项目代码',
@ -627,6 +702,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
  // {
  //   label: '任务明细ID',
@ -649,7 +725,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -662,6 +738,8 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
+
  },
  {
    label: '创建时间',
@ -674,6 +752,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -690,6 +769,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    table: {
      width: 150
    },
+    isTable: false,
  },
 ]))

--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@ -38,30 +38,30 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    isSearch: true,
  },
  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm: false,
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
    sort: 'custom',
    table: {
      width: 150
    },
+    isSearch: true,
  },
  {
-    label: '发货记录单号',
-    field: 'deliverRecordNumber',
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
    sort: 'custom',
    table: {
      width: 150
    },
-    isSearch: true,
  },
  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm: false,
    sort: 'custom',
    table: {
      width: 150
@ -83,6 +83,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '承运商',
@ -91,6 +92,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    sortTableDefault:1000,
  },
  {
    label: '运输方式',
@ -99,6 +101,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    sortTableDefault:1000,
  },
  {
    label: '车牌号',
@ -107,6 +110,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    sortTableDefault:1000,
  },
  {
    label: '申请时间',
@ -119,6 +123,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -139,6 +144,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -156,6 +162,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '到仓库代码',
@ -165,13 +172,14 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '从库区类型范围',
    field: 'fromAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -183,7 +191,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'toAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    isForm: false,
    table: {
@ -195,6 +203,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'fromAreaCodes',
    sort: 'custom',
    isForm: false,
+    isTable: false,
    table: {
      width: 150
    },
@ -204,6 +213,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'toAreaCodes',
    sort: 'custom',
    isForm: false,
+    isTable: false,
    table: {
      width: 150
    },
@ -215,13 +225,15 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
-    isForm: false
+    isForm: false,
+    isTable: false,
  },
  {
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
    isForm: false,
+    isTable: false,
    table: {
      width: 150
    },
@ -255,7 +267,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'autoCommit',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -276,7 +288,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'autoAgree',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -297,7 +309,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'autoExecute',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -353,6 +365,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
        valueFormat: 'x',
      }
    },
+    isTable: false,
    isForm: false
  },
  {
@ -370,6 +383,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
        valueFormat: 'x',
      }
    },
+    isTable: false,
    isForm: false
  },
  {
@ -391,6 +405,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
        valueFormat: 'x',
      }
    },
+    isTable: false,
    isForm: false
  },
  {
@ -400,6 +415,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false
  },
  {
@ -468,6 +484,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 180
    },
+    isTable: false,
    isTableForm: false,
    form: {
      componentProps: {
@ -516,6 +533,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    hiddenInMain:true,
  },
  {
    label: '物料描述2',
@ -524,6 +542,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    hiddenInMain:true,
  },
  {
    label: '批次',
@ -534,13 +553,29 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    },
  },
  {
-    label: '包装号',
+    label: '包装代码',
    field: 'packingNumber',
    sort: 'custom',
    table: {
      width: 150
    },
  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '器具号',
    field: 'containerNumber',
@ -548,6 +583,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '数量',
@ -572,7 +608,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    },
  },
  {
-    label: '从库位代码',
+    label: '从库位',
    field: 'fromLocationCode',
    sort: 'custom',
    table: {
@ -580,7 +616,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    },
  },
  {
-    label: '到库位代码',
+    label: '到库位',
    field: 'toLocationCode',
    sort: 'custom',
    table: {
@ -592,7 +628,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    field: 'inventoryStatus',
    dictType: DICT_TYPE.INVENTORY_STATUS,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -605,6 +641,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '从货主代码',
@ -613,6 +650,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '到货主代码',
@ -621,6 +659,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '备注',
@ -629,6 +668,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false
  },
  {
    label: '创建时间',
@ -641,6 +681,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -659,6 +700,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false,
    isTableForm: false,
    isForm: false
  },
@ -673,6 +715,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -691,6 +734,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 150
    },
+    isTable: false,
    isTableForm: false,
    isForm: false
  },
@ -703,6 +747,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
      width: 150,
      fixed: 'right'
    },
+    hiddenInMain:true,
    isTableForm:false,
  }
 ]))
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@ -45,34 +45,28 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    isSearch: true
  },
  {
-    label: '任务单号',
-    field: 'jobNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-      show:false
-    },
-    isSearch: true
-  },
-  {
-    label: '出库事务类型',
-    field: 'outTransactionType',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isForm:false,
+    isTable: true,
    sort: 'custom',
    table: {
      width: 150
    },
  },
  {
-    label: '入库事务类型',
-    field: 'inTransactionType',
+    label: '车间',
+    field: 'workshopCode',
    sort: 'custom',
    table: {
      width: 150
-    },
+    }
  },
  {
-    label: '车间代码',
-    field: 'workshopCode',
+    label: '生产线',
+    field: 'productionLineCode',
    sort: 'custom',
    table: {
      width: 150
@ -94,6 +88,34 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    }
  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+      show:false
+    },
+    isTable: false,
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransactionType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
  {
    label: '执行时间',
    field: 'executeTime',
@ -105,6 +127,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -125,6 +148,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -146,6 +170,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -166,6 +191,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -182,13 +208,14 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '接口类型',
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -201,6 +228,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '备注',
@ -209,6 +237,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '创建者',
@ -217,6 +246,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '创建时间',
@ -229,6 +259,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -254,13 +285,14 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      show: false
    },
+    isTable: false,
  },
  {
    label: '从库区类型范围',
    field: 'fromAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -273,6 +305,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '是否可用',
@ -280,7 +313,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
    isSearch: true,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -357,23 +390,46 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      show: false
    },
+    isTable: false,
  },
  {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '来源工位代码',
+    field: 'workStationCode',
    sort: 'custom',
    table: {
-      width: 150,
-      show: false
+      width: 150
+    }
+  },
+  {
+    label: '工序代码',
+    field: 'processCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
    },
  },
  {
-    label: '器具号',
-    field: 'containerNumber',
+    label: 'Bom版本',
+    field: 'bomVersion',
    sort: 'custom',
    table: {
-      width: 150,
-      show: false
+      width: 150
    },
  },
  {
@ -386,45 +442,77 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
+    label: '报废数量',
+    field: 'qty',
    sort: 'custom',
    table: {
      width: 150
+    },
+    form: {
+      component: 'InputNumber',
    }
  },
  {
-    label: '来源工位代码',
-    field: 'workStationCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
    sort: 'custom',
    table: {
      width: 150
-    }
+    },
  },
  {
-    label: '工序代码',
-    field: 'processCode',
+    label: '单价',
+    field: 'singlePrice',
    sort: 'custom',
    table: {
      width: 150
+    },
+    form: {
+      component: 'InputNumber',
    }
  },
  {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '金额',
+    field: 'amount',
    sort: 'custom',
    table: {
      width: 150
+    },
+    form: {
+      component: 'InputNumber',
    }
  },
  {
-    label: '从库位代码',
+    label: '来源库位',
    field: 'fromLocationCode',
    sort: 'custom',
    table: {
      width: 150
    },
  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTable: false,
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+      show: false
+    },
+    isTable: false,
+  },
  {
    label: '从库位组代码',
    field: 'fromLocationGroupCode',
@ -432,6 +520,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '从库区代码',
@ -440,13 +529,14 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '库存状态',
    field: 'inventoryStatus',
    dictType: DICT_TYPE.INVENTORY_STATUS,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -457,34 +547,13 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'reason',
    dictType: DICT_TYPE.SCRAP_REASON,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
    },
  },
-  {
-    label: '单价',
-    field: 'singlePrice',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '金额',
-    field: 'amount',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
+  
  {
    label: '单据号',
    field: 'number',
@ -492,6 +561,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
  },
  {
    label: '备注',
@ -500,6 +570,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '创建时间',
@ -512,6 +583,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -528,15 +600,9 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
  {
    label: '物料描述1',
    field: 'itemDesc1',
@ -544,6 +610,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '物料描述2',
@ -552,6 +619,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '项目代码',
@ -560,28 +628,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    isTable: false,
  },
  // {
  //   label: '任务明细ID',
@ -604,7 +651,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -619,6 +666,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      fixed: 'right'
    },
+    hiddenInMain: true,
    isTableForm: true,
    tableForm: {
      type: 'action',
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@ -303,6 +303,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
        row['processCode'] = val[0]['code']
      }else if(formField == 'itemCode'){
        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
        row['bomVersion'] = ''
        row['childList'] = []
        // 查询标准价格
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@ -62,7 +62,26 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    isSearch: true,
  },
  {
-    label: '车间代码',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm:false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '车间',
    field: 'workshopCode',
    sort: 'custom',
    table: {
@ -86,6 +105,53 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    }
  },
+  {
+    label: '生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
  {
    label: '班组',
    field: 'team',
@ -150,7 +216,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'fromAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable:false,
    sort: 'custom',
    table: {
      width: 150
@ -164,6 +230,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    isSearch: true,
    isForm: false,
  },
@ -174,6 +241,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    form: {
      value: 'ProductScrap',
      componentProps: {
@ -182,25 +250,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
    isForm: false,
  },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isForm:false,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
  {
    label: '创建时间',
    field: 'createTime',
@ -212,6 +262,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable:false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -230,6 +281,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    isForm: false,
  },
  {
@ -239,6 +291,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable:false,
    sort: 'custom',
    table: {
      width: 180
@ -265,6 +318,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable:false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -292,6 +346,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
      return userDeptArray.find((account) => account.id == cellValue)?.name
    },
@ -319,6 +374,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable:false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -337,6 +393,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    isForm: false
  },
  {
@ -344,7 +401,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoCommit',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable:false,
    isForm:false,
    sort: 'custom',
    table: {
@ -365,7 +422,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoAgree',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable:false,
    isForm:false,
    sort: 'custom',
    table: {
@ -386,7 +443,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoExecute',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable:false,
    isForm:false,
    sort: 'custom',
    table: {
@ -478,56 +535,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      show: false
    },
+    isTable: false,
    isForm: false,
    isTableForm: false,
  },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        }]
-      }
-    }
-  },
+  
  {
    label: '来源工位代码',
    field: 'workStationCode',
@ -659,6 +671,173 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      }],
    },
  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          message: '请填写物料代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm: false,
+    isTable:true,
+  },
+  {
+    label: '报废数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 6,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 6,
+    },
+  },
+  {
+    label: '来源库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    }
+  },
+  
  {
    label: '包装号',
    field: 'packingNumber',
@ -705,37 +884,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      disabled: true
    }
  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150,
-      show: false
-    },
-    isTable: false,
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    }
-  },
+  
+  
  {
    label: '库存状态',
    field: 'inventoryStatus',
@ -758,17 +908,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'reason',
    dictType: DICT_TYPE.SCRAP_REASON,
    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -776,6 +916,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
    isTableForm: false,
  },
+  
  {
    label: '物料描述1',
    field: 'itemDesc1',
@ -783,6 +924,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
    isTableForm: false,
  },
@ -793,73 +935,12 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
    isTableForm: false,
  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      },
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  {
-    label: '单价',
-    field: 'singlePrice',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 6
-      },
-    },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  {
-    label: '金额',
-    field: 'amount',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled:true,
-        min: 0,
-        precision: 6,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      disabled:true,
-      min: 0,
-      precision: 6,
-    },
-  },
+  
+  
  {
    label: '项目代码',
    field: 'projectCode',
@ -867,29 +948,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
    isTableForm: false,
  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select',
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
  {
    label: '最后更新时间',
    field: 'updateTime',
@ -901,6 +964,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -920,6 +984,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isTableForm: false,
    isForm: false
  },
@ -930,6 +995,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    isTableForm: false,
    form: {
      componentProps: {
@ -941,6 +1007,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -956,6 +1023,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -975,55 +1043,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isTableForm: false,
    isForm: false
  },
-  {
-    label: 'Bom版本',
-    field: 'bomVersion',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
-      searchField: 'version', // 查询弹窗赋值字段
-      searchTitle: '物料清单信息', // 查询弹窗标题
-      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
-      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key:'productItemCode',
-        value:'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
-        searchField: 'version', // 查询弹窗赋值字段
-        searchTitle: '物料清单信息', // 查询弹窗标题
-        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
-        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key:'productItemCode',
-          value:'itemCode',
-          message: '请填写物料代码！',
-          isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    },
-  },
+  
  {
    label: '操作',
    field: 'action',
@ -1033,6 +1057,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      fixed: 'right'
    },
+    hiddeInMain:true,
    tableForm: {
      type: 'action',
      buttonText: 'Bom',