diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index dc46da4ea..fdb147004 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -83,4 +83,9 @@ export const exportPackage = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/package/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 创建标签
+export const createPackageLabel = async (data: PackageVO) => {
+  return await request.post({ url: `/wms/package/createLabel`, data })
+}
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index c60dd2d38..f982259cf 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -70,14 +70,30 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
+  <!-- 创建标签 -->
+    <BasicForm
+      ref="formLabelRef"
+      @success="getList"
+      :tableAllSchemas="detailListTableColumns"
+      :tableFormRules="ProductionreturnRequestDetailLabelRules"
+      :tableData="detatableData.tableList"
+      :isBusiness="true"
+      :isShowButton="false"
+      @handleAddTable="handleAddTable"
+      @handleDeleteTable="handleDeleteTable"
+      @searchTableSuccess="searchTableSuccess"
+      @submitForm="submitFormLabel"
+    />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules } from './productionreturnRequestMain.data'
+import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules } from './productionreturnRequestMain.data'
 import * as ProductionreturnRequestMainApi from '@/api/wms/productionreturnRequestMain'
 import * as ProductionreturnRequestDetailApi from '@/api/wms/productionreturnRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import * as PackageApi from '@/api/wms/package'
 
 // 生产退料申请
 defineOptions({ name: 'ProductionreturnRequestMain' })
@@ -90,6 +106,24 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductionreturnRequestMain.allSchemas.tableColumns)
 
+//创建标签
+const dialogVisible = ref(false)
+const dialogTitle = ref('创建标签')
+const detailListTableColumns = ProductionreturnRequestDetailLabel.allSchemas
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+//创建标签
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: ProductionreturnRequestDetailApi.getProductionreturnRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+//创建标签保存
+const saveLabel = () => {
+
+  isCreateLabel.value = true
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -132,12 +166,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'packingNumber') {
-      setV['packingNumber'] = val[0]['packingNumber']
-      setV['containerNumber'] = val[0]['containerNumber']
+    if(formField == 'itemCode') {
       setV['batch'] = val[0]['batch']
       setV['itemCode'] = val[0]['itemCode']
       setV['uom'] = val[0]['uom']
+      setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['qty'] = val[0]['qty']
+      // 修改 tableform 属性 数量最大值设置为库存余额中数量
+      ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+        if(item.field == 'qty') {
+          item.tableForm.max = val[0]['qty']
+        }
+      })
+    } else if(formField == 'workStationCode') {
+      setV['workStationCode'] = val[0]['code']
+      setV['fromLocationCode'] = val[0]['rawLocationCode']
     } else {
       setV[formField] = val[0][searchField]
     }
@@ -192,10 +235,21 @@ const butttondata = (row) => {
       defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加
       defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回
-      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:handle'}), // 审批通过
-      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionreturn-request-main:update'}), // 处理
+      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:agree'}), // 审批通过
+      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productionreturn-request-main:handle'}), // 处理
       defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:update'}), // 编辑
       // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
+      // 创建标签
+      {
+        label: '创建标签',
+        name: 'cjbq',
+        hide: isShowMainButton(row,['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
     ]
 }
 
@@ -234,13 +288,79 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainApprove') { // 审批通过
+    await message.confirm('确认要审批通过吗？')
     ProductionreturnRequestMainApi.agree(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {
       console.log(err)
     })
+  } else if (val == 'cjbq') { // 创建标签
+    detatableData.params = {
+      masterId:row.id
+    }
+    await getDetailList()
+    // 判断 是否已创建标签
+    if (detatableData.tableList[0].packingNumber) {
+      message.warning('已创建过标签！！！')
+      return
+    }
+    // 打开创建标签页面
+    // dialogVisible.value = true
+    formLabelRef.value.open('create', row)
+    detatableData.tableList.map((item) => {
+      item.batch = '000000'
+      // 查询物品类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线
+      ItembasicApi.getItembasicPage({
+        pageSize: 10,
+        pageNo: 1,
+        code: item.itemCode,
+        sort: '',
+        by: 'ASC',
+      }).then(res => {
+        if (res.list.length > 0) {
+          // 判断物品类型 是否 原料
+          if (res.list[0].type == "RAW") {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+            if(item.field == 'productionLineCodePackage') {
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
+            }
+            if(item.field == 'supplierItemCode') {
+              item.tableForm.isInpuFocusShow = true
+              item.tableForm.disabled = false
+              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true
+            }
+          })
+          } else {
+            // 修改 tableform 属性
+            detailListTableColumns.tableFormColumns.map(item => {
+            if(item.field == 'supplierItemCode') {
+              item.tableForm.isInpuFocusShow = false
+              item.tableForm.disabled = true
+              ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false
+            }
+            if(item.field == 'productionLineCodePackage') {
+              item.tableForm.isInpuFocusShow = true
+              item.tableForm.disabled = false
+              ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
+            }
+          })
+          }
+        } else {
+          message.warning('没有查询到物品代码：【' + item.itemCode + '】')
+          return
+        }
+      })
+    })
+
   } else if (val == 'mainHandle') { // 处理
+    if (!isCreateLabel.value) {
+      message.warning('请先创建标签')
+      return
+    }
     ProductionreturnRequestMainApi.handle(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
@@ -335,6 +455,25 @@ const submitForm = async (formType, data) => {
   }
 }
 
+// 创建标签
+const submitFormLabel = async (formType, data) => {
+  try {
+    detatableData.tableList.forEach(async (item) => {
+      await PackageApi.createPackageLabel(item).then(res => {
+        isCreateLabel.value = true
+        message.success('创建标签成功')
+      }).catch(err => {
+        isCreateLabel.value = false
+        console.log(err)
+        message.error('创建标签失败')
+      })
+    })
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 77beca909..c533702b6 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -14,6 +14,12 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import * as ProductionlineitemApi  from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
+import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -715,23 +721,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
     table: {
       width: 150
     },
     isTableForm: false,
-    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
+      disabled: true
+    },
     form: {
       componentProps: {
         disabled: true
@@ -847,9 +859,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
 
 //表单校验
 export const ProductionreturnRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
+  // packingNumber: [
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],
@@ -862,4 +874,268 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})
+
+/**
+ * @returns {Array} 生产退料申请子表创建标签
+ */
+export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产线代码',
+    field: 'productionLineCodePackage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物品关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition:[{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+]))
+
+//表单校验
+export const ProductionreturnRequestDetailLabelRules = reactive({
+  supplierItemCode: [
+    { required: true, message: '请选择供应商', trigger: 'change' }
+  ],
+  productionLineCodePackage: [
+    { required: true, message: '请选择生产线', trigger: 'change' }
+  ]
+})
+