From 34d549a04d57fabf6a0a98e043359b5e7a7595d9 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 29 Apr 2024 16:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E3=80=81?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productputawayJobMain.data.ts             | 168 +++++++++-----
 .../productputawayRecordMain.data.ts          | 183 +++++++++++----
 .../productputawayRequestMain.data.ts         | 212 ++++++++++-------
 .../productputawayAssembleJobMain.data.ts     | 166 +++++++++-----
 .../productputawayAssembleRecordMain.data.ts  | 191 ++++++++++++----
 .../productputawayAssembleRequestMain.data.ts | 216 +++++++++++-------
 6 files changed, 765 insertions(+), 371 deletions(-)

diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index 3cd26c74d..de2de7d95 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -15,6 +15,18 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,6 +34,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     isSearch: true,
   },
   // {
@@ -39,6 +52,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -51,6 +65,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -71,6 +86,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -99,6 +115,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -119,6 +136,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -135,19 +153,9 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '优先级',
     field: 'priority',
@@ -158,6 +166,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '优先级增量',
@@ -169,6 +178,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '部门',
@@ -177,6 +187,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接人用户名',
@@ -185,6 +196,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接时间',
@@ -197,6 +209,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -213,6 +226,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '完成时间',
@@ -225,6 +239,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -239,7 +254,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -251,7 +266,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -264,6 +279,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -272,6 +288,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -284,6 +301,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -300,6 +318,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -308,6 +327,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -316,6 +336,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区代码范围',
@@ -324,13 +345,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -349,7 +371,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -368,7 +390,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -387,7 +409,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -406,7 +428,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -425,7 +447,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -444,7 +466,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -463,7 +485,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -482,7 +504,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -501,7 +523,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -587,16 +609,32 @@ export const ProductputawayJobMainRules = reactive({
  */
 export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -611,64 +649,80 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false
   },
+  
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+
+  
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -676,6 +730,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '物料描述2',
@@ -684,6 +739,8 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
+
   },
   {
     label: '项目代码',
@@ -692,6 +749,8 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
+
   },
   {
     label: '数量',
@@ -700,21 +759,12 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '单据号',
     field: 'number',
@@ -722,6 +772,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain: true
   },
   {
     label: '备注',
@@ -730,6 +781,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '从货主代码',
@@ -738,6 +790,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到货主代码',
@@ -746,6 +799,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '创建时间',
@@ -766,6 +820,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    hiddenInMain: true
   },
   {
     label: '创建者',
@@ -774,6 +829,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
 ]))
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index adecda095..b5dea8cb8 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -15,6 +15,19 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,6 +35,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     isSearch: true
   },
   {
@@ -31,6 +45,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     isSearch: true
   },
   // {
@@ -48,6 +63,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -56,6 +72,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '执行时间',
@@ -68,6 +85,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -88,6 +106,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -109,6 +128,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +149,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +166,14 @@ export const ProductputawayRecordMain = 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
@@ -164,6 +186,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +195,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -180,6 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -192,6 +217,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -216,6 +242,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -224,13 +251,14 @@ export const ProductputawayRecordMain = 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
@@ -243,13 +271,14 @@ export const ProductputawayRecordMain = 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
@@ -262,6 +291,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '是否可用',
@@ -269,7 +299,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -283,6 +313,24 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -342,41 +390,61 @@ export const ProductputawayRecordMainRules = reactive({
  */
 export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -385,21 +453,53 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -407,6 +507,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '从库位代码',
@@ -423,6 +524,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '从库区代码',
@@ -431,6 +533,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到货主代码',
@@ -439,6 +542,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到库位代码',
@@ -455,6 +559,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到库区代码',
@@ -463,6 +568,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '单据号',
@@ -471,14 +577,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    hiddenInMain: true
   },
   {
     label: '备注',
@@ -487,6 +586,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '创建时间',
@@ -507,6 +607,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    hiddenInMain: true
   },
   {
     label: '创建者',
@@ -515,14 +616,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    hiddenInMain: true
   },
   {
     label: '物料描述1',
@@ -531,6 +625,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '物料描述2',
@@ -539,6 +634,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '项目代码',
@@ -547,6 +643,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '数量',
@@ -555,21 +652,12 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+ 
   // {
   //   label: '代码',
   //   field: 'code',
@@ -584,6 +672,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
     isTable: true,
+    hiddenInMain: true,
     sort: 'custom',
     table: {
       width: 150
@@ -604,6 +693,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到器具号',
@@ -612,6 +702,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
 ]))
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index abe333bba..c695ec866 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -41,6 +41,25 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
   },
+  {
+    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: 'supplierCode',
@@ -58,6 +77,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -65,7 +85,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -79,6 +99,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -88,6 +109,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       value: 'ProductPutaway',
       componentProps: {
@@ -116,6 +138,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -133,6 +156,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -146,6 +170,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -167,6 +192,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -185,6 +211,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -201,25 +228,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    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: 'updateTime',
@@ -231,6 +240,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -248,6 +258,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -257,6 +268,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -265,7 +277,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -279,6 +291,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -286,7 +299,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -307,7 +320,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -328,7 +341,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -406,6 +419,26 @@ export const ProductputawayRequestMainRules = reactive({
  * @returns {Array} 制品上架申请子表
  */
 export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -435,8 +468,18 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
@@ -451,8 +494,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -467,8 +510,27 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -478,7 +540,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    tableForm: {
+    tableForm:{
+      type: 'Select',
       disabled: true
     }
   },
@@ -502,26 +565,6 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     }
   },
-  {
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    isTableForm: false,
-  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -545,6 +588,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddeInMain: true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -552,6 +596,15 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddeInMain: true,
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -563,6 +616,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddeInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -581,19 +635,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
+  
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -601,6 +647,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -611,6 +658,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -621,6 +669,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -631,6 +680,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -644,26 +694,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      type: 'Select',
-      disabled: true
-    }
-  },
+  
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -671,6 +702,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -681,16 +713,27 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddeInMain: true,
     isTableForm: false,
     isForm: false
   },
+  
   {
-    label: '备注',
-    field: 'remark',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '最后更新时间',
@@ -703,6 +746,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -721,6 +765,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -733,6 +778,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150,
       fixed: 'right'
     },
+    hiddenInMain:true,
     isTableForm:false,
   }
 ]))
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index 3cd26c74d..57e1fa192 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -15,6 +15,18 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -23,6 +35,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isSearch: true,
+    isTable: false,
   },
   // {
   //   label: '供应商代码',
@@ -39,6 +52,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '申请时间',
@@ -51,6 +66,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -71,6 +87,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -99,6 +116,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -119,6 +137,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -135,25 +154,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '优先级',
     field: 'priority',
     form: {
       component: 'InputNumber',
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -165,6 +175,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -177,6 +188,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接人用户名',
@@ -185,6 +197,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '承接时间',
@@ -197,6 +210,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -213,6 +227,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '完成时间',
@@ -225,6 +240,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -239,7 +255,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -251,7 +267,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -264,6 +280,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+
   },
   {
     label: '备注',
@@ -272,6 +290,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -284,6 +303,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -300,6 +320,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -308,6 +329,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -316,6 +338,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到库区代码范围',
@@ -324,13 +347,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -349,7 +373,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -368,7 +392,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -387,7 +411,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -406,7 +430,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -425,7 +449,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -444,7 +468,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -463,7 +487,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -482,7 +506,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -501,7 +525,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -587,16 +611,32 @@ export const ProductputawayJobMainRules = reactive({
  */
 export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
@@ -611,59 +651,62 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -676,6 +719,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
   },
   {
     label: '物料描述2',
@@ -684,6 +728,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
   },
   {
     label: '项目代码',
@@ -692,6 +737,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
   },
   {
     label: '数量',
@@ -700,21 +746,12 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '单据号',
     field: 'number',
@@ -722,6 +759,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true 
   },
   {
     label: '备注',
@@ -730,6 +768,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
   },
   {
     label: '从货主代码',
@@ -738,6 +777,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
   },
   {
     label: '到货主代码',
@@ -746,6 +786,8 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
+
   },
   {
     label: '创建时间',
@@ -758,6 +800,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true ,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -774,6 +817,17 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true 
+
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false 
   },
 ]))
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
index adecda095..6a9a85fce 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts
@@ -15,6 +15,19 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -22,6 +35,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     isSearch: true
   },
   {
@@ -31,6 +45,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     isSearch: true
   },
   // {
@@ -48,6 +63,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '入库事务类型',
@@ -56,6 +72,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '执行时间',
@@ -68,6 +85,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -88,6 +106,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -109,6 +128,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -129,6 +149,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -145,13 +166,14 @@ export const ProductputawayRecordMain = 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
@@ -164,6 +186,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '备注',
@@ -172,6 +195,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -180,6 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -192,6 +217,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -216,6 +242,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从库区代码范围',
@@ -224,13 +251,14 @@ export const ProductputawayRecordMain = 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
@@ -243,13 +271,14 @@ export const ProductputawayRecordMain = 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
@@ -262,6 +291,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '是否可用',
@@ -269,7 +299,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -283,6 +313,24 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '包装号',   //  子表数据 只是为了展示
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+  },
+  {
+    label: '批次',     //  子表数据 只是为了展示
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:5,
+  },
 ]))
 
 //表单校验
@@ -342,41 +390,61 @@ export const ProductputawayRecordMainRules = reactive({
  */
 export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从包装号',
-    field: 'fromPackingNumber',
+    label: '采购订单号',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '订单行',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:2,
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -385,21 +453,55 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
-    label: '订单行',
-    field: 'poLine',
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -407,6 +509,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '从库位代码',
@@ -423,6 +526,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '从库区代码',
@@ -431,6 +535,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到货主代码',
@@ -439,6 +544,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到库位代码',
@@ -455,6 +561,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '到库区代码',
@@ -463,6 +570,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '单据号',
@@ -471,15 +579,9 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    hiddenInMain: true
   },
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '备注',
     field: 'remark',
@@ -487,6 +589,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '创建时间',
@@ -499,6 +602,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -515,15 +619,10 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
+
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -531,6 +630,8 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
+
   },
   {
     label: '物料描述2',
@@ -539,6 +640,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '项目代码',
@@ -547,6 +649,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   {
     label: '数量',
@@ -555,21 +658,12 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   // {
   //   label: '代码',
   //   field: 'code',
@@ -588,6 +682,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
   },
   // {
   //   label: '任务明细ID',
@@ -604,6 +699,8 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
+
   },
   {
     label: '到器具号',
@@ -612,6 +709,8 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    hiddenInMain: true
+
   },
 ]))
 
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
index 595e7845e..9b28457f2 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@@ -41,6 +41,25 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
   },
+  {
+    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: 'supplierCode',
@@ -58,6 +77,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -65,7 +85,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -79,6 +99,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -88,6 +109,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       value: 'ProductPutaway',
       componentProps: {
@@ -116,6 +138,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -133,6 +156,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false
   },
   {
@@ -154,6 +178,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -167,6 +192,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -185,6 +211,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -201,25 +228,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    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: 'updateTime',
@@ -231,6 +240,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -248,6 +258,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -257,6 +268,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -265,7 +277,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -279,6 +291,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -286,7 +299,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -307,7 +320,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -328,7 +341,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -406,6 +419,26 @@ export const ProductputawayRequestMainRules = reactive({
  * @returns {Array} 制品上架申请子表
  */
 export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -435,8 +468,18 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
@@ -451,8 +494,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -467,8 +510,27 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -478,7 +540,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    tableForm: {
+    tableForm:{
+      type: 'Select',
       disabled: true
     }
   },
@@ -502,33 +565,32 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     }
   },
+  
   {
-    label: '订单号',
-    field: 'poNumber',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
-    isTableForm: false,
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
+    form: {
+      componentProps: {
+        disabled: true
+      }
     },
-    isForm: false,
-    isTableForm: false,
+    tableForm: {
+      disabled: true
+    }
   },
+  
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       componentProps: {
         disabled: true
@@ -545,6 +607,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -552,6 +615,15 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -563,6 +635,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -581,19 +654,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
+  
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -601,6 +666,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -611,6 +677,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -622,6 +689,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
+    hiddenInMain: true,
     isForm: false
   },
   {
@@ -631,6 +699,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -644,26 +713,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      type: 'Select',
-      disabled: true
-    }
-  },
+  
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -671,6 +721,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
@@ -681,17 +732,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -703,6 +748,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -721,6 +767,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -734,6 +781,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150,
       fixed: 'right'
     },
+    isTable: false,
     isTableForm:false,
   }
 ]))