From cae2a034c13a92facf49fda3635e8666a7509225 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 20 Aug 2024 10:53:37 +0800
Subject: [PATCH 1/8] =?UTF-8?q?HL-5465=E9=A2=84=E7=94=9F=E4=BA=A7=E5=92=8C?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7=E4=B8=AD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptRequestMain/index.vue       | 737 ++++++++++--------
 .../productreceiptRequestMain.data.ts         | 203 ++---
 .../index.vue                                 |  61 +-
 .../productreceiptAssembleRequestMain.data.ts |  42 +-
 4 files changed, 578 insertions(+), 465 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index f5706b3e0..ae2cdc531 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -1,23 +1,31 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...ProductreceiptRequestMain.allSchemas.searchSchema,...ProductreceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="[
+        ...ProductreceiptRequestMain.allSchemas.searchSchema,
+        ...ProductreceiptRequestDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="ProductreceiptRequestMain.allSchemas"
-      :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="ProductreceiptRequestMain.allSchemas"
+    :detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -28,13 +36,16 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #number="{row}">
+      <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBase
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
       </template>
     </Table>
   </ContentWrap>
@@ -43,7 +54,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="workStationCode"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -60,12 +71,18 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
   >
-  <template  v-slot="{row}">
-    <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
-    :clearable="true"
-    style="width: 100%"
-    :disabled="true" 
-    :placeholder="t('ts.选择日期')"/>
+    <template v-slot="{ row }">
+      <el-date-picker
+        v-bind:modelValue="
+          row['expireTime']
+            ? addDay(row['produceDate'], row['expireTime'])
+            : dayjs('2099-12-31').valueOf()
+        "
+        :clearable="true"
+        style="width: 100%"
+        :disabled="true"
+        :placeholder="t('ts.选择日期')"
+      />
     </template>
   </BasicForm>
 
@@ -86,58 +103,74 @@
     :detailValidate="detailValidate"
   />
 
-    <!-- 创建标签 -->
-    <BasicForm
-      ref="formLabelRef"
-      @success="getList"
-      :tableAllSchemas="detailListTableColumns"
-      :tableFormRules="ProductreceiptRequestLabelRules"
-      :tableData="detatableData.tableList"
-      :isBusiness="true"
-      :isShowButton="false"
-      @handleAddTable="handleAddTable"
-      @handleDeleteTable="handleDeleteTable"
-      @searchTableSuccess="searchTableSuccess"
-      @submitForm="submitFormLabel"
-    />
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="detailListTableColumns"
+    :tableFormRules="ProductreceiptRequestLabelRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitFormLabel"
+  />
 
-    <!-- bom列表 -->
-    <Dialog
-      :title="DialogTitle"
-      v-model="bomModelVisible"
-      width="80%"
-      :scroll="true"
-      max-height="450px"
-    >
-      <Table
-        :columns="BackflushDetailRequest.allSchemas.tableColumns"
-        :data="detatableDataBom.tableList"
-        :loading="detatableDataBom.loading"
-        :pagination="{
-          total: detatableDataBom.total
-        }"
-        v-model:pageSize="detatableDataBom.pageSize"
-        v-model:currentPage="detatableDataBom.currentPage"
-        v-model:sort="detatableDataBom.sort"
-      />
-    </Dialog>
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+    <Table
+      :columns="BackflushDetailRequest.allSchemas.tableColumns"
+      :data="detatableDataBom.tableList"
+      :loading="detatableDataBom.loading"
+      :pagination="{
+        total: detatableDataBom.total
+      }"
+      v-model:pageSize="detatableDataBom.pageSize"
+      v-model:currentPage="detatableDataBom.currentPage"
+      v-model:sort="detatableDataBom.sort"
+    />
+  </Dialog>
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/productreceipt-request-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+    :extend="'predict'"
+  />
   <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
+  <SearchTable
+    style="width: 905px"
+    ref="searchTableRef"
+    @searchTableSuccess="searchTableSuccessLabel"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { ProductreceiptRequestMain,ProductreceiptRequestMainRules,ProductreceiptRequestDetail,
-  ProductreceiptRequestDetailRules, BackflushDetailRequest,
-  ProductreceiptRequestLabel,ProductreceiptRequestLabelRules } from './productreceiptRequestMain.data'
-  import {
-  SupplierdeliverRequestPackage
-} from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
+import {
+  ProductreceiptRequestMain,
+  ProductreceiptRequestMainRules,
+  ProductreceiptRequestDetail,
+  ProductreceiptRequestDetailRules,
+  BackflushDetailRequest,
+  ProductreceiptRequestLabel,
+  ProductreceiptRequestLabelRules
+} from './productreceiptRequestMain.data'
+import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 // } from '../../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
 import * as ProductreceiptRequestMainApi from '@/api/wms/productreceiptRequestMain'
 import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
@@ -149,7 +182,7 @@ import { formatTime } from '@/utils/index'
 import { getAccessToken } from '@/utils/auth'
 import dayjs from 'dayjs'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
-import * as BomApi from "@/api/wms/bom";
+import * as BomApi from '@/api/wms/bom'
 import { formatDate } from '@/utils/formatTime'
 import * as WorkshopApi from '@/api/wms/workshop'
 
@@ -163,9 +196,13 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref([...ProductreceiptRequestMain.allSchemas.tableColumns,...ProductreceiptRequestDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([
+  ...ProductreceiptRequestMain.allSchemas.tableColumns,
+  ...ProductreceiptRequestDetail.allSchemas.tableMainColumns
+])
 // 详情 table 操作扩展 按钮
-const buttondataTable = ref([{
+const buttondataTable = ref([
+  {
     label: 'Bom',
     name: 'bom',
     hide: false,
@@ -173,98 +210,98 @@ const buttondataTable = ref([{
     icon: '',
     color: '',
     hasPermi: '',
-    link: true, // 文本展现按钮
-  }])
+    link: true // 文本展现按钮
+  }
+])
 
 //创建标签
 const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等 
-const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+const labelType = ref('') // 标签类别 采购还是制造等
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
   getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
 })
-const { getList:getDetailList } = detatableMethods
+const { getList: getDetailList } = detatableMethods
 
 // Bom查看
 const DialogTitle = ref('Bom信息')
 const bomModelVisible = ref(false)
-const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } = useTable({
   getListApi: BackflushRequestDetailbApi.getBackflushRequestDetailbPage
 })
-const { getList:getDetailListBom } = detatableMethodsBom
-
+const { getList: getDetailListBom } = detatableMethodsBom
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
     if (type == 'tableForm') {
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
         row[formField] = val[0][searchField]
-      }else if(formField == 'packUnit'){
+      } else if (formField == 'packUnit') {
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
         row[formField] = val[0][searchField]
-      }else if (formField == 'itemCode') {
+      } else if (formField == 'itemCode') {
         if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
           message.warning(`物料${val[0]['itemCode']}已经存在`)
           return
-        } 
-        row['uom'] = val[0]['uom']
-        row['produceDate'] = dayjs().valueOf()
-        row[formField] = val[0][searchField]
-        // 查看BOM版本
-        const param1 =  {
-          productItemCode: val[0]['itemCode'],
-          available: 'TRUE',
-          pageSize: 20,
-          pageNo: 1,
-          sort: '',
-          by: 'ASC',
         }
-        BomApi.getBomPage(param1).then(res => {
-          console.log(res)
-          if(res?.list?.length>0){
-            row['bomVersion'] = res.list[0].version
-          }
-        })
-      }else if (formField == 'workStationCode') {
-        // 明细查询页赋值
-        val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow[formField] = item[searchField]
-          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
-
-          tableData.value.push(newRow)
-        })
-      }else{
+        const index1 = 0
+        setTableFormsValues(val, index1)
+      }  else {
         row[formField] = val[0][searchField]
       }
-      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      if('workshopCode'==formField){
-         //车间代码
+      if ('workshopCode' == formField) {
+        //车间代码
         setV['productionLineCode'] = ''
         tableData.value = []
-      }else if('productionLineCode'==formField){
-         //生产线代码
+      } else if ('productionLineCode' == formField) {
+        //生产线代码
         tableData.value = []
       }
       formRef.setValues(setV)
     }
   })
 }
+const setTableFormsValues = async (val, index1) => {
+  if (index1 <= val.length - 1) {
+    const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...val[index1] }))
+    newRow['itemCode'] = val[index1]['itemCode']
+    newRow['uom'] = val[0]['uom']
+    newRow['produceDate'] = dayjs().valueOf()
+
+    const param1 = {
+      productItemCode: val[0]['itemCode'],
+      available: 'TRUE',
+      pageSize: 20,
+      pageNo: 1,
+      sort: '',
+      by: 'ASC'
+    }
+    await BomApi.getBomPage(param1).then((res) => {
+      console.log(res)
+      if (res?.list?.length > 0) {
+        newRow['bomVersion'] = res.list[0].version
+      }
+    })
+    tableData.value.push(newRow)
+    console.log(tableData.value)
+    index1++
+    setTableFormsValues(val, index1)
+  }
+}
 // 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
@@ -281,12 +318,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:productreceipt-request-main:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:productreceipt-request-main:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:productreceipt-request-main:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -299,28 +336,34 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
     } else {
       getList()
     }
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
+const isShowMainButton = (row, val) => {
   if (val.indexOf(row.status) > -1) {
     return false
   } else {
@@ -329,100 +372,137 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
     return []
   }
-    return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭
-      defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加
-      defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批
-      defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回
-      defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过
-      defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理
-      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑
-      {
-        label: '创建标签',
-        name: 'cjbq',
-        hide: isShowMainButton(row,['3']),
-        type: 'primary',
-        icon: '',
-        color: '',
-        hasPermi: '',
-        link: true, // 文本展现按钮
-      },
-      defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
-        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
-    ]
+  return [
+    defaultButtons.mainListCloseBtn({
+      hide: isShowMainButton(row, ['1', '2', '3', '4', '6']),
+      hasPermi: 'wms:productreceipt-request-main:close'
+    }), // 关闭
+    defaultButtons.mainListReAddBtn({
+      hide: isShowMainButton(row, ['4', '5']),
+      hasPermi: 'wms:productreceipt-request-main:reAdd'
+    }), // 重新添加
+    defaultButtons.mainListSubmitBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:productreceipt-request-main:submit'
+    }), // 提交审批
+    defaultButtons.mainListTurnDownBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:productreceipt-request-main:refused'
+    }), // 驳回
+    defaultButtons.mainListApproveBtn({
+      hide: isShowMainButton(row, ['2']),
+      hasPermi: 'wms:productreceipt-request-main:agree'
+    }), // 审批通过
+    defaultButtons.mainListHandleBtn({
+      hide: isShowMainButton(row, ['3']),
+      hasPermi: 'wms:productreceipt-request-main:handle'
+    }), // 处理
+    defaultButtons.mainListEditBtn({
+      hide: isShowMainButton(row, ['1']),
+      hasPermi: 'wms:productreceipt-request-main:update'
+    }), // 编辑
+    {
+      label: '创建标签',
+      name: 'cjbq',
+      hide: isShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3', '6', '8']) }) // 标签打印
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除
+  ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
+  if (val == 'mainClose') {
+    // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.close(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  } else if (val == 'mainReAdd') { // 重新添加
+    ProductreceiptRequestMainApi.close(row.masterId)
+      .then(() => {
+        message.success(t('common.updateSuccess'))
+        tableObject.loading = false
+        buttonBaseClick('refresh', null)
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainReAdd') {
+    // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  } else if (val == 'mainSubmit') { // 提交审批
+    ProductreceiptRequestMainApi.reAdd(row.masterId)
+      .then(() => {
+        message.success(t('common.updateSuccess'))
+        tableObject.loading = false
+        buttonBaseClick('refresh', null)
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainSubmit') {
+    // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.submit(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  } else if (val == 'mainTurnDown') { // 驳回
+    ProductreceiptRequestMainApi.submit(row.masterId)
+      .then(() => {
+        message.success(t('common.updateSuccess'))
+        tableObject.loading = false
+        buttonBaseClick('refresh', null)
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainTurnDown') {
+    // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.refused(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  } else if (val == 'mainApprove') { // 审批通过
+    ProductreceiptRequestMainApi.refused(row.masterId)
+      .then(() => {
+        message.success(t('common.updateSuccess'))
+        tableObject.loading = false
+        buttonBaseClick('refresh', null)
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'mainApprove') {
+    // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.agree(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  } else if (val == 'cjbq') { // 创建标签
+    ProductreceiptRequestMainApi.agree(row.masterId)
+      .then(() => {
+        message.success(t('common.updateSuccess'))
+        tableObject.loading = false
+        buttonBaseClick('refresh', null)
+      })
+      .catch((err) => {
+        tableObject.loading = false
+        console.log(err)
+      })
+  } else if (val == 'cjbq') {
+    // 创建标签
 
     // 判断 是否已创建标签
     let isCreateLabel = false
     await PackageApi.getPackagePage({
       requestNumber: row.number
-    }).then(res => {
+    }).then((res) => {
       if (res) {
         if (res.list.length > 0) isCreateLabel = true
       }
@@ -432,7 +512,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     detatableData.params = {
-      masterId:row.masterId
+      masterId: row.masterId
     }
     await getDetailList()
     // 打开创建标签页面
@@ -445,39 +525,39 @@ const buttonTableClick = async (val, row) => {
         pageNo: 1,
         code: item.itemCode,
         sort: '',
-        by: 'ASC',
-      }).then(res => {
+        by: 'ASC'
+      }).then((res) => {
         if (res.list.length > 0) {
           // 判断物料 可采购 可制造
-          if (res.list[0].enableMake == "FALSE") {
+          if (res.list[0].enableMake == 'FALSE') {
             // 修改 tableform 属性
-            detailListTableColumns.tableFormColumns.map(itemColumns => {
-            if(itemColumns.field == 'productionLineCodePackage') {
-              // itemColumns.tableForm.isInpuFocusShow = false
-              // itemColumns.tableForm.disabled = true
-              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
-            }
-            if(itemColumns.field == 'supplierItemCode') {
-              itemColumns.tableForm.isInpuFocusShow = true
-              itemColumns.tableForm.disabled = false
-              ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
-            }
-          })
+            detailListTableColumns.tableFormColumns.map((itemColumns) => {
+              if (itemColumns.field == 'productionLineCodePackage') {
+                // itemColumns.tableForm.isInpuFocusShow = false
+                // itemColumns.tableForm.disabled = true
+                ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = false
+              }
+              if (itemColumns.field == 'supplierItemCode') {
+                itemColumns.tableForm.isInpuFocusShow = true
+                itemColumns.tableForm.disabled = false
+                ProductreceiptRequestLabelRules.supplierItemCode[0].required = true
+              }
+            })
           } else {
             // 修改 tableform 属性
-            detailListTableColumns.tableFormColumns.map(itemColumns => {
-            if(itemColumns.field == 'supplierItemCode') {
-              itemColumns.tableForm.isInpuFocusShow = false
-              itemColumns.tableForm.disabled = true
-              ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
-            }
-            if(itemColumns.field == 'productionLineCodePackage') {
-              item.productionLineCodePackage = item.productionLineCode
-              // itemColumns.tableForm.isInpuFocusShow = true
-              // itemColumns.tableForm.disabled = false
-              ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = true
-            }
-          })
+            detailListTableColumns.tableFormColumns.map((itemColumns) => {
+              if (itemColumns.field == 'supplierItemCode') {
+                itemColumns.tableForm.isInpuFocusShow = false
+                itemColumns.tableForm.disabled = true
+                ProductreceiptRequestLabelRules.supplierItemCode[0].required = false
+              }
+              if (itemColumns.field == 'productionLineCodePackage') {
+                item.productionLineCodePackage = item.productionLineCode
+                // itemColumns.tableForm.isInpuFocusShow = true
+                // itemColumns.tableForm.disabled = false
+                ProductreceiptRequestLabelRules.productionLineCodePackage[0].required = true
+              }
+            })
           }
         } else {
           message.warning('没有查询到物料代码：【' + item.itemCode + '】')
@@ -485,13 +565,13 @@ const buttonTableClick = async (val, row) => {
         }
       })
     })
-
-  } else if (val == 'mainHandle') { // 处理
+  } else if (val == 'mainHandle') {
+    // 处理
     // 判断 是否已创建标签
     let isCreateLabel = false
     await PackageApi.getPackagePage({
       requestNumber: row.number
-    }).then(res => {
+    }).then((res) => {
       if (res) {
         if (res.list.length > 0) isCreateLabel = true
       }
@@ -501,39 +581,44 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    ProductreceiptRequestMainApi.handle(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      console.log(err)
-    })
-  } else if (val == 'edit') { // 编辑
+    ProductreceiptRequestMainApi.handle(row.masterId)
+      .then(() => {
+        message.success(t('common.updateSuccess'))
+        tableObject.loading = false
+        buttonBaseClick('refresh', null)
+      })
+      .catch((err) => {
+        console.log(err)
+      })
+  } else if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.masterId)
-  } else if (val == 'point') { // 标签打印
+  } else if (val == 'point') {
+    // 标签打印
     handlePoint(row)
   }
 }
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm =async (type: string, row?: number) => {
+const openForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
   // 编辑时 车间代码不可修改
   if (type == 'update') {
     // 修改 tableform 属性
-    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
-      if(itemColumns.field == 'workshopCode') {
+    ProductreceiptRequestMain.allSchemas.formSchema.map((itemColumns) => {
+      if (itemColumns.field == 'workshopCode') {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
       }
     })
   } else {
     // 修改 tableform 属性
-    ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
-      if(itemColumns.field == 'workshopCode') {
+    ProductreceiptRequestMain.allSchemas.formSchema.map((itemColumns) => {
+      if (itemColumns.field == 'workshopCode') {
         itemColumns.componentProps.isSearchList = true
         itemColumns.componentProps.disabled = false
       }
@@ -547,9 +632,11 @@ const { wsCache } = useCache()
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
-  detailRef.value.openDetail(row, titleName, titleValue,'requestProductreceiptMain')
+  detailRef.value.openDetail(row, titleName, titleValue, 'requestProductreceiptMain')
 }
 
 /** 删除按钮操作 */
@@ -563,10 +650,11 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     tableObject.loading = false
     // 刷新列表
-    buttonBaseClick('refresh',null)
-  } catch {}finally{
-      tableObject.loading = false
-    }
+    buttonBaseClick('refresh', null)
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
 }
 
 /** 导出按钮操作 */
@@ -578,7 +666,9 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const excelTitle = ref(route.meta.title)
-    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(tableObject.params)
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(
+      tableObject.params
+    )
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
@@ -587,10 +677,10 @@ const handleExport = async () => {
 }
 
 /**
-  * tableForm方法
-*/
+ * tableForm方法
+ */
 const tableFormKeys = {}
-ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+ProductreceiptRequestDetail.allSchemas.tableFormColumns.forEach((item) => {
   tableFormKeys[item.field] = item.default ? item.default : ''
 })
 const tableData = ref([])
@@ -604,25 +694,27 @@ const handleAddTable = () => {
 // 删除明细
 const handleDeleteTable = (item, index) => {
   let itemIndex = tableData.value.indexOf(item)
-  if(itemIndex>-1){
+  if (itemIndex > -1) {
     tableData.value.splice(itemIndex, 1)
   }
 }
 const tableSelectionDelete = (selection) => {
-  tableData.value = tableData.value.filter(item => !selection.includes(item))
+  tableData.value = tableData.value.filter((item) => !selection.includes(item))
 }
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
+  let data = { ...submitData }
+  if (data.masterId) {
     data.id = data.masterId
   }
   tableData.value.forEach((row, index) => {
-    row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf()
+    row['expireDate'] = row['expireTime']
+      ? addDay(row['produceDate'], row['expireTime']).valueOf()
+      : dayjs('2099-12-31').valueOf()
   })
   data.type = 'predict'
   data.subList = tableData.value // 拼接子表数据参数
-  if(data.subList.find(item => (item.qty <= 0))) {
+  if (data.subList.find((item) => item.qty <= 0)) {
     message.warning('数量必须大于0')
     formRef.value.formLoading = false
     return
@@ -640,8 +732,8 @@ const submitForm = async (formType, submitData) => {
     // 刷新当前列表
     if (formType === 'create') {
       getList()
-    }else{
-      buttonBaseClick('refresh',null)
+    } else {
+      buttonBaseClick('refresh', null)
     }
   } finally {
     formRef.value.formLoading = false
@@ -676,23 +768,25 @@ const searchFormClick = (searchData) => {
 
 // 创建标签
 const submitFormLabel = async (formType, submitData) => {
-  let data = {...submitData}
-  if(data.masterId){
+  let data = { ...submitData }
+  if (data.masterId) {
     data.id = data.masterId
   }
   try {
-    console.log("aaaaa",data);
-    data.subList=detatableData.tableList
-    console.log("bbbbb",data);
+    console.log('aaaaa', data)
+    data.subList = detatableData.tableList
+    console.log('bbbbb', data)
     // 创建标签 要物料库区配置表中 入库包装规格
-    await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
-      isCreateLabel.value = true
-      message.success('创建标签成功')
-    }).catch(err => {
-      isCreateLabel.value = false
-      console.log(err)
-      message.error('创建标签失败')
-    })
+    await ProductreceiptRequestMainApi.productCreateLabel(data)
+      .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
@@ -700,8 +794,9 @@ const submitFormLabel = async (formType, submitData) => {
 }
 
 // 查看 Bom 按钮回调事件
-const tableFormButton = async (val , row) => {
-  if (val == 'bom') { // 查看 bom
+const tableFormButton = async (val, row) => {
+  if (val == 'bom') {
+    // 查看 bom
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
@@ -713,14 +808,14 @@ const tableFormButton = async (val , row) => {
 
 // 子表新增/编辑校验
 const detailValidate = (data) => {
-  let tag = false;
-  if(data.qty <= 0){
+  let tag = false
+  if (data.qty <= 0) {
     message.warning('数量必须大于0')
-    tag = false;
-    return tag;
-  }else {
-    tag = true;
-    return tag;
+    tag = false
+    return tag
+  } else {
+    tag = true
+    return tag
   }
 }
 
@@ -730,21 +825,23 @@ const handlePoint = async (row) => {
   // 查询是否已创建过标签
   await PackageApi.getPackagePage({
     requestNumber: row.number
-  }).then((res) => {
-    if(res.list.length > 0) {
-      isCreateLabel.value = true
-      if (res.list[0].productionLineCode != null) {
-        labelType.value = 'zz'
+  })
+    .then((res) => {
+      if (res.list.length > 0) {
+        isCreateLabel.value = true
+        if (res.list[0].productionLineCode != null) {
+          labelType.value = 'zz'
+        } else {
+          labelType.value = 'cg'
+        }
       } else {
-        labelType.value = 'cg'
+        isCreateLabel.value = false
       }
-    } else {
+    })
+    .catch((err) => {
       isCreateLabel.value = false
-    }
-  }).catch(err => {
-    isCreateLabel.value = false
-    console.log(err)
-  })
+      console.log(err)
+    })
   // 判断是采购还是制造
   if (isCreateLabel.value) {
     labelPrint(row)
@@ -765,58 +862,60 @@ const searchTableRef = ref()
 //
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
-  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+  const defaultParams = { moduleName: 'productreceipt_predict', recordNumber: row.number }
+  const { tableObject: tableObjectPrint, tableMethods } = useTable({
     defaultParams,
-    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+    getListApi: PackageApi.getLabelDetailPage // 分页接口
   })
 
   // 获得表格的各种操作
-  const { getList:getListPrint } = tableMethods
+  const { getList: getListPrint } = tableMethods
   getListPrint()
   tableObject.loading = false
   const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
     item.width = item.table?.width || 150
   })
-  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+  searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true)
 }
 
 // 批量打印--预生产收货
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
-  console.log('批量打印',val)
+  console.log('批量打印', val)
   // let rows:any = []
   // val.forEach(item=>{
   //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
   // })
-  if(val.length == 0){
-    message.warning("请先选择要打印的数据!")
+  if (val.length == 0) {
+    message.warning('请先选择要打印的数据!')
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
 
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+  await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
+    .then((res) => {
       console.log(res)
       if (labelType.value == 'cg') {
         const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-        window.open(src.value+'&asn_number='+res)
+        window.open(src.value + '&asn_number=' + res)
       } else {
         const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-        window.open(src.value+'&asn_number='+res)
+        window.open(src.value + '&asn_number=' + res)
       }
-  }).catch(err => {
-    console.log(err)
-    message.error('创建标签失败')
-  })
+    })
+    .catch((err) => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
 }
-const getDefaultWorkshopCode = async ()=>{
+const getDefaultWorkshopCode = async () => {
   let res = await WorkshopApi.getWorkshopPage({
-    available: "TRUE"
+    available: 'TRUE'
   })
-  if(res&&res.list.length>0){
-    if(res.list.find(item=>item.code=='PRC')){
-      ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
-        if(itemColumns.field == 'workshopCode') {
+  if (res && res.list.length > 0) {
+    if (res.list.find((item) => item.code == 'PRC')) {
+      ProductreceiptRequestMain.allSchemas.formSchema.map((itemColumns) => {
+        if (itemColumns.field == 'workshopCode') {
           itemColumns.value = 'PRC'
         }
       })
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 94b31e711..94ceaf6d2 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -1,6 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
-import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
@@ -26,7 +26,7 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as BomApi from '@/api/wms/bom'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
-import * as SupplieritemApi  from '@/api/wms/supplieritem'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
 
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
@@ -36,21 +36,21 @@ const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
-  pageSize:10,
-  pageNo:1,
-  code:'ProductReceiptRequest'
+  pageSize: 10,
+  pageNo: 1,
+  code: 'ProductReceiptRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData = data?.list[0] || {}
 
- // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+// 获取当前操作人的部门
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray: any = [userDept]
 
 /**
  * @returns {Array} 制品收货申请主表
@@ -74,7 +74,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -95,7 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     isForm: false,
-    isTable:true,
+    isTable: true,
   },
   {
     label: '车间代码',
@@ -151,7 +151,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'workshopCode',
         value: 'workshopCode',
         message: '请填写车间代码！',
@@ -172,12 +172,12 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'workshopCode',
           value: 'workshopCode',
           message: '请填写车间代码！',
           isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -266,7 +266,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable: false,
     isForm: false
   },
   {
@@ -276,7 +276,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable: false,
     isForm: false,
   },
   {
@@ -288,7 +288,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable: false,
     isForm: false,
   },
   {
@@ -340,7 +340,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -382,7 +382,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -417,7 +417,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-    isForm:false,
+    isForm: false,
     table: {
       width: 150
     },
@@ -452,7 +452,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -477,7 +477,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -498,7 +498,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -519,7 +519,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    isForm:false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -596,7 +596,7 @@ export const ProductreceiptRequestMainRules = reactive({
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
-  remark:  [
+  remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
@@ -613,7 +613,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择生产线代码',
       searchField: 'code',
@@ -624,7 +624,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'workshopCode',
         value: 'workshopCode',
         message: '请填写车间代码！',
@@ -644,7 +644,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'workshopCode',
           value: 'workshopCode',
           message: '请填写车间代码！',
@@ -660,27 +660,26 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm:{
-      multiple: true,
-      disabled:true,
-      // isInpuFocusShow: true,
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',
       searchTitle: '工位信息',
       searchAllSchemas: Workstation.allSchemas,
       searchPage: WorkstationApi.getWorkstationPage,
+
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'productionLineCode',
         value: 'productionLineCode',
         message: '请填写生产线代码！',
         isMainValue: true
-        }],
-      verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
-      isShowTableFormSearch: true,
+      }],
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -693,8 +692,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        enterSearch:true,
-        isSearchList: true,
+        enterSearch: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择工位代码',
         searchField: 'code',
         searchTitle: '工位信息',
@@ -704,12 +703,12 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'productionLineCode',
           value: 'productionLineCode',
           message: '请填写生产线代码！',
           isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'code',
           action: '==',
@@ -741,6 +740,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         value: 'TRUE',
         isMainValue: false
       }],
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -783,8 +783,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTable:false,
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -807,7 +807,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     dictClass: 'string',
     isTable: false,
     sort: 'custom',
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -819,7 +819,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'woNumber',
     sort: 'custom',
     isTable: false,
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -831,7 +831,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'woLine',
     sort: 'custom',
     isTable: false,
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -843,7 +843,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'packQty',
     sort: 'custom',
     isTable: false,
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -864,7 +864,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     // dictClass: 'string',
     isTable: false,
     sort: 'custom',
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -876,7 +876,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'toOwnerCode',
     sort: 'custom',
     isTable: false,
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -888,7 +888,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     isTable: false,
-    hiddenInMain:true,
+    hiddenInMain: true,
     table: {
       width: 180
     },
@@ -903,13 +903,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
-    sortTableDefault:1003,
+    sortTableDefault: 1003,
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       // enterSearch:true,
-      isInpuFocusShow: true,
+      disabled: true,
+      multiple: true,
+      isInpuFocusShow: false,
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
       searchTitle: '生产线物料关系信息',
@@ -919,12 +921,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'productionLineCode',
         value: 'productionLineCode',
         message: '请填写生产线代码！',
         isMainValue: true
-        }],
+      }],
+
+      verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
       verificationParams: [{
         key: 'itemCode',
         action: '==',
@@ -948,12 +953,12 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'productionLineCode',
           value: 'productionLineCode',
           message: '请填写生产线代码！',
           isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'itemCode',
           action: '==',
@@ -972,7 +977,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    sortTableDefault:1004,
+    sortTableDefault: 1004,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
@@ -981,11 +986,11 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
       searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
       searchCondition: [{
-        key:'productItemCode',
-        value:'itemCode',
+        key: 'productItemCode',
+        value: 'itemCode',
         message: '请填写物料代码！',
         isMainValue: true
-      },{
+      }, {
         key: 'available',
         value: 'TRUE',
         isMainValue: false
@@ -1001,11 +1006,11 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
         searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          key:'productItemCode',
-          value:'itemCode',
+          key: 'productItemCode',
+          value: 'itemCode',
           message: '请填写物料代码！',
           isMainValue: true
-        },{
+        }, {
           key: 'available',
           value: 'TRUE',
           isMainValue: false
@@ -1017,7 +1022,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '批次',
     field: 'batch',
     sort: 'custom',
-    sortTableDefault:1006,
+    sortTableDefault: 1006,
     table: {
       width: 150
     },
@@ -1026,7 +1031,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料名称',
     field: 'itemName',
     sort: 'custom',
-    sortTableDefault:1005,
+    sortTableDefault: 1005,
     table: {
       width: 150
     },
@@ -1036,7 +1041,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '物料描述1',
     field: 'itemDesc1',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -1048,7 +1053,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '物料描述2',
     field: 'itemDesc2',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -1060,7 +1065,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '项目代码',
     field: 'projectCode',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -1073,7 +1078,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '数量',
     field: 'qty',
     sort: 'custom',
-    sortTableDefault:1006,
+    sortTableDefault: 1006,
     table: {
       width: 150
     },
@@ -1095,7 +1100,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    sortTableDefault:1007,
+    sortTableDefault: 1007,
     isTable: true,
     sort: 'custom',
     table: {
@@ -1114,7 +1119,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD'
     },
-    sortTableDefault:1008,
+    sortTableDefault: 1008,
     sort: 'custom',
     table: {
       width: 180
@@ -1126,7 +1131,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -1136,7 +1141,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: false,
     formatter: dateFormatter2,
     detail: {
@@ -1150,14 +1155,14 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     //   type: 'FormDate',
     //   valueFormat: 'x',
     // },
-    tableForm:{
+    tableForm: {
       type: 'slot',
       disabled: true
     },
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -1172,13 +1177,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
   },
   {
     label: '创建时间',
     field: 'createTime',
     formatter: dateFormatter,
-    sortTableDefault:1009,
+    sortTableDefault: 1009,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -1189,7 +1194,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -1202,7 +1207,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '创建者',
     field: 'creator',
     sort: 'custom',
-    sortTableDefault:1010,
+    sortTableDefault: 1010,
     table: {
       width: 150
     },
@@ -1213,7 +1218,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '最后更新时间',
     field: 'updateTime',
     isTable: false,
-    hiddenInMain:true,
+    hiddenInMain: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -1225,7 +1230,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
@@ -1238,7 +1243,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
-    hiddenInMain:true,
+    hiddenInMain: true,
     isTable: false,
     table: {
       width: 150
@@ -1248,15 +1253,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '操作',
-    hiddenInMain:true,
+    hiddenInMain: true,
     field: 'action',
     isDetail: false,
-    isForm: false ,
+    isForm: false,
     table: {
       width: 150,
       fixed: 'right'
     },
-    isTableForm:false,
+    isTableForm: false,
   }
 ]))
 
@@ -1287,7 +1292,7 @@ export const ProductreceiptRequestDetailRules = reactive({
   productionLineCode: [
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],
-  remark:  [
+  remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
@@ -1641,7 +1646,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       disabled: true
       // isInpuFocusShow: true,
       // searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
@@ -1663,14 +1668,14 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm:{
+    tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
       searchField: 'supplierCode', // 查询弹窗赋值字段
       searchTitle: '供应商信息', // 查询弹窗标题
       searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
       searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
+      searchCondition: [{
         key: 'itemCode',
         value: 'itemCode',
         message: '请填写物料代码！',
@@ -1914,7 +1919,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
-      enterSearch:true,
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -1983,7 +1988,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     tableForm: {
-      enterSearch:true,
+      enterSearch: true,
       disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
@@ -2014,7 +2019,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       componentProps: {
-        disabled:true
+        disabled: true
       }
     },
     tableForm: {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 2e08da174..cf1863246 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="workStationCode"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="ProductreceiptRequestMainRules"
     :formAllSchemas="ProductreceiptRequestMain.allSchemas"
@@ -212,38 +212,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
         row[formField] = val[0][searchField]
-      }else if (formField == 'itemCode') {
+      } else if (formField == 'itemCode') {
         if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
           message.warning(`物料${val[0]['itemCode']}已经存在`)
           return
         }
-        row['uom'] = val[0]['uom']
-        row['produceDate'] = dayjs().valueOf()
-        row[formField] = val[0][searchField]
-         // 查看BOM版本
-         const param1 =  {
-          productItemCode: val[0]['itemCode'],
-          available: 'TRUE',
-          pageSize: 20,
-          pageNo: 1,
-          sort: '',
-          by: 'ASC',
-        }
-        BomApi.getBomPage(param1).then(res => {
-          console.log(res)
-          if(res?.list?.length>0){
-            row['bomVersion'] = res.list[0].version
-          }
-        })
-      }else if (formField == 'workStationCode') {
-        // 明细查询页赋值
-        val.forEach(item=>{
-          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow[formField] = item[searchField]
-          newRow.batch = formatTime(new Date(), 'yyyyMMdd')
-          tableData.value.push(newRow)
-        })
-      }else{
+        const index1 = 0
+        setTableFormsValues(val, index1)
+      } else{
         row[formField] = val[0][searchField]
       }
     } else {
@@ -261,6 +237,33 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     }
   })
 }
+const setTableFormsValues = async (val, index1) => {
+  if (index1 <= val.length - 1) {
+    const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...val[index1] }))
+    newRow['itemCode'] = val[index1]['itemCode']
+    newRow['uom'] = val[0]['uom']
+    newRow['produceDate'] = dayjs().valueOf()
+
+    const param1 = {
+      productItemCode: val[0]['itemCode'],
+      available: 'TRUE',
+      pageSize: 20,
+      pageNo: 1,
+      sort: '',
+      by: 'ASC'
+    }
+    await BomApi.getBomPage(param1).then((res) => {
+      console.log(res)
+      if (res?.list?.length > 0) {
+        newRow['bomVersion'] = res.list[0].version
+      }
+    })
+    tableData.value.push(newRow)
+    console.log(tableData.value)
+    index1++
+    setTableFormsValues(val, index1)
+  }
+}
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 1688ced9e..c9aa9a4e1 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -670,27 +670,26 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm:{
-      multiple: true,
-      disabled:true,
-      // isInpuFocusShow: true,
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码',
       searchField: 'code',
       searchTitle: '工位信息',
       searchAllSchemas: Workstation.allSchemas,
       searchPage: WorkstationApi.getWorkstationPage,
+
       searchCondition: [{
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'productionLineCode',
         value: 'productionLineCode',
         message: '请填写生产线代码！',
         isMainValue: true
-        }],
-      verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
-      isShowTableFormSearch: true,
+      }],
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -703,7 +702,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        enterSearch: true,
+        isInpuFocusShow: true,
         searchListPlaceholder: '请选择工位代码',
         searchField: 'code',
         searchTitle: '工位信息',
@@ -713,7 +713,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'productionLineCode',
           value: 'productionLineCode',
           message: '请填写生产线代码！',
@@ -750,6 +750,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         value: 'TRUE',
         isMainValue: false
       }],
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       verificationParams: [{
         key: 'code',
         action: '==',
@@ -760,9 +761,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }], // 失去焦点校验参数
     },
     form: {
-      enterSearch: true,
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择工序代码',
         searchField: 'code',
@@ -912,13 +913,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    sortTableDefault: 1003,
     table: {
       width: 150
     },
-    sortTableDefault:1003,
-    tableForm:{
+    tableForm: {
       // enterSearch:true,
-      isInpuFocusShow: true,
+      disabled: true,
+      multiple: true,
+      isInpuFocusShow: false,
       searchListPlaceholder: '请选择物料代码',
       searchField: 'itemCode',
       searchTitle: '生产线物料关系信息',
@@ -928,12 +931,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      },{
+      }, {
         key: 'productionLineCode',
         value: 'productionLineCode',
         message: '请填写生产线代码！',
         isMainValue: true
-        }],
+      }],
+
+      verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
       verificationParams: [{
         key: 'itemCode',
         action: '==',
@@ -957,12 +963,12 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+        }, {
           key: 'productionLineCode',
           value: 'productionLineCode',
           message: '请填写生产线代码！',
           isMainValue: true
-          }],
+        }],
         verificationParams: [{
           key: 'itemCode',
           action: '==',

From a8f1269468afb02373bde121bb9b3e8a95175ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Tue, 20 Aug 2024 11:19:28 +0800
Subject: [PATCH 2/8] =?UTF-8?q?q1=E9=80=9A=E7=9F=A5=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E9=AA=8C=E8=AF=81=20=20HL-5387?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionQ1/inspectionQ1.data.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
index a1f37b292..7d9524317 100644
--- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@@ -23,7 +23,8 @@ export const Q1Rules = reactive({
   priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
   costCode: [{ required: true, message: '请选择选择成本中心代码', trigger: 'change' }],
   claimTime: [{ required: true, message: '请选择选择索赔日期', trigger: 'change' }],
-  handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }]
+  handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }],
+  claimReason: [{ required: true, message: '请选择选择索赔原因', trigger: 'change' }]
 })
 
 export const Q1 = useCrudSchemas(

From f001eab0a93d12156b70b4fc96a581b3052285da Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 13:14:56 +0800
Subject: [PATCH 3/8] =?UTF-8?q?HL-5421=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E7=9A=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=BA=93=E5=AD=98=E7=9A=84=E6=B1=87=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue          |  4 ++--
 .../inventorymoveRequestMainOKHOLD/index.vue        | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index d2136a0be..53727949b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -85,7 +85,7 @@
         label: '汇总',
         prop: 'CollectionTable'
       }]" v-model="tabSheet" @change="tabChange"/>
-      <div class="table" v-if="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
+      <div class="table" v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns" v-show="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
         <TableForm
           ref="tableFormRef"
           class="w-[100%]"
@@ -123,7 +123,7 @@
           </template>
         </TableForm>
       </div>
-      <div v-if="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+      <div v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns" v-show="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
         <TableFormCountPlan
           :tableFields="tableAllSchemas.tableFormColumns"
           :tableData="tableData"
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index edd2f3133..4642f6dcf 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -618,8 +618,19 @@ const formRef = ref()
 const openForm =async (type: string, row?: number) => {
   if(type=='create'){
     InventorymoveRequestMain.allSchemas.formSchema.forEach(item =>{
+      if(item.field == 'fromWarehouseCode'){
+        item.componentProps.isSearchList = true
+        item.componentProps.disabled = false
+      }
       if(item.field == 'dueTime') {
-        item.value = dayjs().add(1, 'hour')
+        item.value = dayjs().add(1, 'hour').valueOf()
+      }
+    })
+  }else{
+    InventorymoveRequestMain.allSchemas.formSchema.forEach(item =>{
+      if(item.field == 'fromWarehouseCode'){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
       }
     })
   }

From 7a3c3a414c60cc52dc08efa9bf545a047283a946 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Tue, 20 Aug 2024 13:39:10 +0800
Subject: [PATCH 4/8] =?UTF-8?q?HL-4935=20WMS=20WEB=E7=AB=AF=E9=A2=84?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81=E5=9B=9E?=
 =?UTF-8?q?=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/productreceiptRecordMain/index.ts    |  5 +++++
 src/locales/en-US.ts                             | 16 ++++++++--------
 src/locales/zh-CN.ts                             |  3 ++-
 src/utils/disposition/defaultButtons.ts          | 12 ++++++++++++
 .../productreceiptRecordMain/index.vue           | 16 ++++++++++++++++
 .../productreceiptAssembleRecordMain/index.vue   | 15 ++++++++++++++-
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index e3dd420d9..d7637d4d0 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -126,3 +126,8 @@ export const createPutawayRequest = async (number:string) => {
 export const createInspectRequest = async (number:string) => {
   return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
 }
+
+//制品收货记录子执行回收操作
+export const handleRecoveryProductreceiptRecord = async (data: ProductreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/productreceipt-record-main/handleRecovery`, data })
+}
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 27b9c7ea8..dc2d547ea 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -615,11 +615,11 @@ export default {
     code:'Code',
     name:'Name',
   },
- 
- 
- 
- 
- 
+
+
+
+
+
   ts: {
     代码:'Code',
     全部:'All',
@@ -1126,7 +1126,7 @@ export default {
     请输入包装规格2:'Please input package specification2',
     请输入包装数量2:'Please input package quantity2',
     提交审批:'submit for approval',
-    // 系统管理:'system management',  
+    // 系统管理:'system management',
     // 基础设施:'infrastructure',
     // 报表管理:'report manager',
     // 报表:'statement',
@@ -1280,9 +1280,9 @@ export default {
     规则配置:'Rule configuration',
     请输入联系电话:'Please enter a contact number',
     请选择范围:'Please enter a name',
-
+    '确认撤销报工吗？':'Are you sure to cancel the job application?',
 
   },
-  
+
 
 }
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e0aaf5f4b..43f0afa23 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -538,7 +538,7 @@ export default {
     'pcs':'个',
     free_library_bits_or_total_library_bits:'空闲库位数/总库位数',
 
-    
+
 
     slack_stock_warning:'呆滞库存预警',
     package_number:'包装号',
@@ -1276,6 +1276,7 @@ export default {
     规则配置:'规则配置',
     请输入联系电话:'请输入联系电话',
     请选择范围:'请选择范围',
+    '确认撤销报工吗？':"确认撤销报工吗？",
   },
 
 }
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 70f714e53..cf8050651 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1054,6 +1054,18 @@ export function mainListPointBtn(option: any) {
     hasPermi: ''
   })
 }
+// 主列表-回收
+export function mainListRecoveryBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.撤销报工`).replace('ts.', ''),
+    name: 'recovery',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 主列表-批量打印
 export function mainLisSelectiontPointBtn(option: any) {
   return __defaultBtnOption(option, {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 542698de4..ca527db82 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -198,6 +198,7 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
+  defaultButtons.mainListRecoveryBtn(null), // 制品回收
 ]
 }
 
@@ -207,8 +208,11 @@ const buttonTableClick = async (val, row) => {
     handleCreateInspectRequest(row.number)
   } else if (val == 'point') { // 标签打印
     labelPrint(row)
+  } else if (val == 'recovery') { //制品回收
+    labelRecovery(row)
   }
 }
+
 const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const searchTableRef = ref()
@@ -241,6 +245,18 @@ const labelPrint = async (row) => {
   })
   searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
+//制品回收按钮事件
+const labelRecovery = async (row) => {
+  try {
+    await message.confirm(t('ts.确认撤销报工吗？'))
+    tableObject.loading = true
+    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
+    message.success(t('ts.确认撤销报工成功'))
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
 // 批量打印--预生产收货
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 773573524..3fa05b7aa 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -236,6 +236,7 @@ const butttondata = (row,$index) => {
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
+  defaultButtons.mainListRecoveryBtn(null), // 制品回收
   ]
 }
 
@@ -247,6 +248,8 @@ const buttonTableClick = async (val, row) => {
     handleCreateInspectRequest(row.number)
   }else if (val == 'putawayRequest') { // 生成采购上架申请
     handleCreatePutawayRequest(row.number)
+  } else if (val == 'recovery') { //制品回收
+    labelRecovery(row)
   }
 }
 /** 生成到货检验申请按钮操作 */
@@ -274,9 +277,19 @@ const handleCreatePutawayRequest = async (number:string) => {
     tableObject.loading = false
   }
 }
+const labelRecovery = async (row) => {
+  try {
+    await message.confirm(t('ts.确认撤销报工吗？'))
+    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
+    message.success(t('ts.确认撤销报工成功'))
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
 
 const searchTableRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等 
+const labelType = ref('') // 标签类别 采购还是制造等
 const labelPrint = async (row) => {
   console.log(7777,row);
   tableObject.loading = true

From 38d595d1ba62efe6476a03fb6b8c08d77fcd40a2 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 13:41:24 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=B9=E6=8D=AEHL-4888=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptAssembleRequestMain/index.vue                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index cf1863246..8f147cfbe 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -818,7 +818,7 @@ const getDefaultWorkshopCode = async ()=>{
     available: "TRUE"
   })
   if(res&&res.list.length>0){
-    if(res.list.find(item=>item.code=='PRC')){
+    if(res.list.find(item=>item.code=='PRA')){
       ProductreceiptRequestMain.allSchemas.formSchema.map(itemColumns => {
         if(itemColumns.field == 'workshopCode') {
           itemColumns.value = 'PRA'

From 5354ac196b6cc8e4141759a635901ced5c2256d4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 14:02:01 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 53727949b..34796ede1 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -85,7 +85,7 @@
         label: '汇总',
         prop: 'CollectionTable'
       }]" v-model="tabSheet" @change="tabChange"/>
-      <div class="table" v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns" v-show="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
+      <div class="table" v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns&& fromeWhere != 'countPlan'" v-show="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
         <TableForm
           ref="tableFormRef"
           class="w-[100%]"
@@ -123,7 +123,7 @@
           </template>
         </TableForm>
       </div>
-      <div v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns" v-show="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+      <div v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns&& fromeWhere == 'countPlan'" v-show="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
         <TableFormCountPlan
           :tableFields="tableAllSchemas.tableFormColumns"
           :tableData="tableData"

From 3747a83ed4e03fe21c8f147a3a3ef787b67e7af1 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Tue, 20 Aug 2024 13:53:27 +0800
Subject: [PATCH 7/8] =?UTF-8?q?Revert=20"HL-4935=20WMS=20WEB=E7=AB=AF?=
 =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E6=8A=A5=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7a3c3a414c60cc52dc08efa9bf545a047283a946.
---
 src/api/wms/productreceiptRecordMain/index.ts    |  5 -----
 src/locales/en-US.ts                             | 16 ++++++++--------
 src/locales/zh-CN.ts                             |  3 +--
 src/utils/disposition/defaultButtons.ts          | 12 ------------
 .../productreceiptRecordMain/index.vue           | 16 ----------------
 .../productreceiptAssembleRecordMain/index.vue   | 15 +--------------
 6 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index d7637d4d0..e3dd420d9 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -126,8 +126,3 @@ export const createPutawayRequest = async (number:string) => {
 export const createInspectRequest = async (number:string) => {
   return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
 }
-
-//制品收货记录子执行回收操作
-export const handleRecoveryProductreceiptRecord = async (data: ProductreceiptRecordMainVO) => {
-  return await request.put({ url: `/wms/productreceipt-record-main/handleRecovery`, data })
-}
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index dc2d547ea..27b9c7ea8 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -615,11 +615,11 @@ export default {
     code:'Code',
     name:'Name',
   },
-
-
-
-
-
+ 
+ 
+ 
+ 
+ 
   ts: {
     代码:'Code',
     全部:'All',
@@ -1126,7 +1126,7 @@ export default {
     请输入包装规格2:'Please input package specification2',
     请输入包装数量2:'Please input package quantity2',
     提交审批:'submit for approval',
-    // 系统管理:'system management',
+    // 系统管理:'system management',  
     // 基础设施:'infrastructure',
     // 报表管理:'report manager',
     // 报表:'statement',
@@ -1280,9 +1280,9 @@ export default {
     规则配置:'Rule configuration',
     请输入联系电话:'Please enter a contact number',
     请选择范围:'Please enter a name',
-    '确认撤销报工吗？':'Are you sure to cancel the job application?',
 
-  },
 
+  },
+  
 
 }
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 43f0afa23..e0aaf5f4b 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -538,7 +538,7 @@ export default {
     'pcs':'个',
     free_library_bits_or_total_library_bits:'空闲库位数/总库位数',
 
-
+    
 
     slack_stock_warning:'呆滞库存预警',
     package_number:'包装号',
@@ -1276,7 +1276,6 @@ export default {
     规则配置:'规则配置',
     请输入联系电话:'请输入联系电话',
     请选择范围:'请选择范围',
-    '确认撤销报工吗？':"确认撤销报工吗？",
   },
 
 }
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index cf8050651..70f714e53 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1054,18 +1054,6 @@ export function mainListPointBtn(option: any) {
     hasPermi: ''
   })
 }
-// 主列表-回收
-export function mainListRecoveryBtn(option: any) {
-  return __defaultBtnOption(option, {
-    label: t(`ts.撤销报工`).replace('ts.', ''),
-    name: 'recovery',
-    hide: false,
-    type: 'primary',
-    color: '',
-    link: true, // 文本展现按钮
-    hasPermi: ''
-  })
-}
 // 主列表-批量打印
 export function mainLisSelectiontPointBtn(option: any) {
   return __defaultBtnOption(option, {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index ca527db82..542698de4 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -198,7 +198,6 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListRecoveryBtn(null), // 制品回收
 ]
 }
 
@@ -208,11 +207,8 @@ const buttonTableClick = async (val, row) => {
     handleCreateInspectRequest(row.number)
   } else if (val == 'point') { // 标签打印
     labelPrint(row)
-  } else if (val == 'recovery') { //制品回收
-    labelRecovery(row)
   }
 }
-
 const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const searchTableRef = ref()
@@ -245,18 +241,6 @@ const labelPrint = async (row) => {
   })
   searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
-//制品回收按钮事件
-const labelRecovery = async (row) => {
-  try {
-    await message.confirm(t('ts.确认撤销报工吗？'))
-    tableObject.loading = true
-    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
-    message.success(t('ts.确认撤销报工成功'))
-  } catch {
-  } finally {
-    tableObject.loading = false
-  }
-}
 // 批量打印--预生产收货
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 3fa05b7aa..773573524 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -236,7 +236,6 @@ const butttondata = (row,$index) => {
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListRecoveryBtn(null), // 制品回收
   ]
 }
 
@@ -248,8 +247,6 @@ const buttonTableClick = async (val, row) => {
     handleCreateInspectRequest(row.number)
   }else if (val == 'putawayRequest') { // 生成采购上架申请
     handleCreatePutawayRequest(row.number)
-  } else if (val == 'recovery') { //制品回收
-    labelRecovery(row)
   }
 }
 /** 生成到货检验申请按钮操作 */
@@ -277,19 +274,9 @@ const handleCreatePutawayRequest = async (number:string) => {
     tableObject.loading = false
   }
 }
-const labelRecovery = async (row) => {
-  try {
-    await message.confirm(t('ts.确认撤销报工吗？'))
-    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
-    message.success(t('ts.确认撤销报工成功'))
-  } catch {
-  } finally {
-    tableObject.loading = false
-  }
-}
 
 const searchTableRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等
+const labelType = ref('') // 标签类别 采购还是制造等 
 const labelPrint = async (row) => {
   console.log(7777,row);
   tableObject.loading = true

From fb627e2c10a31d66a0bb4179f59b55c1d8e20090 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Tue, 20 Aug 2024 13:56:04 +0800
Subject: [PATCH 8/8] =?UTF-8?q?Reapply=20"HL-4935=20WMS=20WEB=E7=AB=AF?=
 =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E6=8A=A5=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0c6f103c6e5539acd36fcf635478ac510cc7da5f.
---
 src/api/wms/productreceiptRecordMain/index.ts    |  5 +++++
 src/locales/en-US.ts                             | 16 ++++++++--------
 src/locales/zh-CN.ts                             |  3 ++-
 src/utils/disposition/defaultButtons.ts          | 12 ++++++++++++
 .../productreceiptRecordMain/index.vue           | 16 ++++++++++++++++
 .../productreceiptAssembleRecordMain/index.vue   | 15 ++++++++++++++-
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index e3dd420d9..d7637d4d0 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -126,3 +126,8 @@ export const createPutawayRequest = async (number:string) => {
 export const createInspectRequest = async (number:string) => {
   return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
 }
+
+//制品收货记录子执行回收操作
+export const handleRecoveryProductreceiptRecord = async (data: ProductreceiptRecordMainVO) => {
+  return await request.put({ url: `/wms/productreceipt-record-main/handleRecovery`, data })
+}
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 27b9c7ea8..dc2d547ea 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -615,11 +615,11 @@ export default {
     code:'Code',
     name:'Name',
   },
- 
- 
- 
- 
- 
+
+
+
+
+
   ts: {
     代码:'Code',
     全部:'All',
@@ -1126,7 +1126,7 @@ export default {
     请输入包装规格2:'Please input package specification2',
     请输入包装数量2:'Please input package quantity2',
     提交审批:'submit for approval',
-    // 系统管理:'system management',  
+    // 系统管理:'system management',
     // 基础设施:'infrastructure',
     // 报表管理:'report manager',
     // 报表:'statement',
@@ -1280,9 +1280,9 @@ export default {
     规则配置:'Rule configuration',
     请输入联系电话:'Please enter a contact number',
     请选择范围:'Please enter a name',
-
+    '确认撤销报工吗？':'Are you sure to cancel the job application?',
 
   },
-  
+
 
 }
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e0aaf5f4b..43f0afa23 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -538,7 +538,7 @@ export default {
     'pcs':'个',
     free_library_bits_or_total_library_bits:'空闲库位数/总库位数',
 
-    
+
 
     slack_stock_warning:'呆滞库存预警',
     package_number:'包装号',
@@ -1276,6 +1276,7 @@ export default {
     规则配置:'规则配置',
     请输入联系电话:'请输入联系电话',
     请选择范围:'请选择范围',
+    '确认撤销报工吗？':"确认撤销报工吗？",
   },
 
 }
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 70f714e53..cf8050651 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1054,6 +1054,18 @@ export function mainListPointBtn(option: any) {
     hasPermi: ''
   })
 }
+// 主列表-回收
+export function mainListRecoveryBtn(option: any) {
+  return __defaultBtnOption(option, {
+    label: t(`ts.撤销报工`).replace('ts.', ''),
+    name: 'recovery',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 主列表-批量打印
 export function mainLisSelectiontPointBtn(option: any) {
   return __defaultBtnOption(option, {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 542698de4..ca527db82 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -198,6 +198,7 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
+  defaultButtons.mainListRecoveryBtn(null), // 制品回收
 ]
 }
 
@@ -207,8 +208,11 @@ const buttonTableClick = async (val, row) => {
     handleCreateInspectRequest(row.number)
   } else if (val == 'point') { // 标签打印
     labelPrint(row)
+  } else if (val == 'recovery') { //制品回收
+    labelRecovery(row)
   }
 }
+
 const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const searchTableRef = ref()
@@ -241,6 +245,18 @@ const labelPrint = async (row) => {
   })
   searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
+//制品回收按钮事件
+const labelRecovery = async (row) => {
+  try {
+    await message.confirm(t('ts.确认撤销报工吗？'))
+    tableObject.loading = true
+    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
+    message.success(t('ts.确认撤销报工成功'))
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
 // 批量打印--预生产收货
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 773573524..3fa05b7aa 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -236,6 +236,7 @@ const butttondata = (row,$index) => {
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
+  defaultButtons.mainListRecoveryBtn(null), // 制品回收
   ]
 }
 
@@ -247,6 +248,8 @@ const buttonTableClick = async (val, row) => {
     handleCreateInspectRequest(row.number)
   }else if (val == 'putawayRequest') { // 生成采购上架申请
     handleCreatePutawayRequest(row.number)
+  } else if (val == 'recovery') { //制品回收
+    labelRecovery(row)
   }
 }
 /** 生成到货检验申请按钮操作 */
@@ -274,9 +277,19 @@ const handleCreatePutawayRequest = async (number:string) => {
     tableObject.loading = false
   }
 }
+const labelRecovery = async (row) => {
+  try {
+    await message.confirm(t('ts.确认撤销报工吗？'))
+    let resType = await ProductreceiptRecordMainApi.handleRecoveryProductreceiptRecord(row)
+    message.success(t('ts.确认撤销报工成功'))
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
 
 const searchTableRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等 
+const labelType = ref('') // 标签类别 采购还是制造等
 const labelPrint = async (row) => {
   console.log(7777,row);
   tableObject.loading = true