diff --git a/src/api/wms/putawayJobDetail/index.ts b/src/api/wms/putawayJobDetail/index.ts
index af3a1738a..2916d8d08 100644
--- a/src/api/wms/putawayJobDetail/index.ts
+++ b/src/api/wms/putawayJobDetail/index.ts
@@ -63,4 +63,9 @@ export const exportPutawayJobDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/putaway-job-detail/get-import-template' })
+}
+
+// 查询上架任务子列表--自包装数量
+export const getPutawayJobDetailPageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/putaway-job-detail/pageChildPackingNumber`, params })
 }
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index b572a57fd..c63ba5643 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -62,12 +62,35 @@
     :detailAllSchemasRules="PutawayJobDetailRules"
     :searchTableParams="searchTableParams"
     :apiPage="PutawayJobDetailApi.getPutawayJobDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+  <!-- 子包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PutawayJobDetailPackingNumber.allSchemas"
+    :tableFormRules="PutawayJobDetailRules"
+    :tableData="packingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { PutawayJobMain,PutawayJobMainRules,PutawayJobDetail,PutawayJobDetailRules } from './putawayJobMain.data'
+import { PutawayJobMain,
+  PutawayJobMainRules,
+  PutawayJobDetail,
+  PutawayJobDetailRules,
+  PutawayJobDetailPackingNumber } from './putawayJobMain.data'
 import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
 import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -200,12 +223,43 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
+  getListApi: PutawayJobDetailApi.getPutawayJobDetailPageChildPackingNumber
+})
+const { getList:queryDetailList } = packDetatableMethods
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'jobPutawayMain')
 }
 
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+    label: '查看其他包装规格',
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  }])
+
+// 查看其他包装规格
+const tableFormButton = async (val , row) => {
+  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+        packingDetatableData.params = {
+          masterId:row.masterId,
+          parentPackingNumber:row.packingNumber
+        }
+        await queryDetailList()
+        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
+
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
   try {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index fcc7cfafe..3bb41dcd2 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -747,6 +747,17 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
 ]))
 
 //表单校验
@@ -779,3 +790,364 @@ export const PutawayJobDetailRules = reactive({
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
 })
+
+
+/**
+ * @returns {Array} 上架任务子表
+ */
+export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料描述2',
+    field: 'itemdesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type:'FormDateTime',
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 94673c14c..e88e41646 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -1058,7 +1058,8 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive<Cr
     tableForm: {
       disabled: true,
       type:'FormDateTime',
-      valueFormat:'YYYY-MM-DDTHH:mm:ss'
+      format:'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
     }
   },
   {