From 6f10f7e71aafd725b36516ec5cdfafcf5d8e6ad1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 5 Nov 2024 09:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=8E=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=8B=BE=E9=80=89=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E9=80=89=E4=B8=8A=E8=BF=99=E5=87=A0?=
 =?UTF-8?q?=E4=B8=AA=E8=8F=9C=E5=8D=95=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=8C=89=E9=92=AE=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Menu/src/Menu.vue       | 19 +++++-
 .../inventorychangeRequestMain/index.vue      | 11 ++--
 .../inventorychangeRequestMain.data.ts        | 63 ++++++++++---------
 .../inventorymoveRequestMain/index.vue        | 27 ++++----
 .../inventorymoveRequestMain.data.ts          | 33 +++++-----
 .../inventorymoveRequestMainHOLDWIP/index.vue | 26 ++++----
 .../inventorymoveRequestMain.data.ts          | 37 +++++------
 .../inventorymoveRequestMainMOVE/index.vue    | 26 ++++----
 .../inventorymoveRequestMain.data.ts          | 34 +++++-----
 9 files changed, 143 insertions(+), 133 deletions(-)

diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
index c32a4c2f3..77b486872 100644
--- a/src/layout/components/Menu/src/Menu.vue
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -1,12 +1,13 @@
 <script lang="tsx">
 import { PropType } from 'vue'
-import { ElMenu, ElScrollbar } from 'element-plus'
+import { ElMenu, ElScrollbar, ElButton } from 'element-plus'
 import { useAppStore } from '@/store/modules/app'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useRenderMenuItem } from './components/useRenderMenuItem'
 import { isUrl } from '@/utils/is'
 import { useDesign } from '@/hooks/web/useDesign'
 import { LayoutType } from '@/types/layout'
+import { Search } from '@element-plus/icons-vue'
 
 const { getPrefixCls } = useDesign()
 
@@ -91,7 +92,7 @@ export default defineComponent({
         push(index)
       }
     }
-
+ 
     const renderMenuWrap = () => {
       if (unref(layout) === 'top') {
         return renderMenu()
@@ -99,7 +100,18 @@ export default defineComponent({
         return <ElScrollbar>{renderMenu()}</ElScrollbar>
       }
     }
-
+    const renderMenuWrapAddButton = () => {
+      return (
+        <div style='position:relative'>
+            <ElButton type="text" icon={Search} style="color:var(--el-button-text-color);position:absolute;right:-20px;top:120px;z-index:999" ></ElButton>
+            <ElScrollbar>
+         
+          {renderMenu()}
+        </ElScrollbar>
+        </div>
+      
+      )
+    }
     const renderMenu = () => {
       return (
         <ElMenu
@@ -113,6 +125,7 @@ export default defineComponent({
           activeTextColor="var(--left-menu-text-active-color)"
           onSelect={menuSelect}
         >
+     
           {{
             default: () => {
               const { renderMenuItem } = useRenderMenuItem(unref(menuMode))
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index a48bfd803..cc95c2b3c 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -54,7 +54,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorychangeRequestMainRules"
     :formAllSchemas="InventorychangeRequestMain.allSchemas"
@@ -135,13 +135,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField=='toOwnerCode'){
         //到货主代码
         row['toOwnerCode'] = val[0]['code']
-      }else if(formField == 'fromPackingNumber'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+      }else if(formField == 'itemCode'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['locationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
           newRow[formField] = item[searchField]
-          newRow['fromPackingNumber'] = item['packingNumber']
           newRow['toPackingNumber'] = item['packingNumber']
           newRow['fromBatch'] = item['batch']
           newRow['toBatch'] = item['batch']
@@ -173,7 +172,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['fromPackingNumber'] = val[0]['fromPackingNumber']
       setV['toPackingNumber'] = val[0]['packingNumber']
       setV['fromBatch'] = val[0]['batch']
       setV['toBatch'] = val[0]['batch']
@@ -204,8 +202,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-      if(formField == 'fromPackingNumber') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
+      if(formField == 'itemCode') {
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
       setV['toBatch'] = val[0]['batch']
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index 428350a3a..8a8dc0e26 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -391,38 +391,12 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    tableForm:{
-      multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
-      searchCondition: [{
-        key: 'businessType',
-        value: businessTypeData.code,
-      },{
-        key: 'noCheckExpireDateFlag',
-        value: 'TRUE',
-      }]
+    tableForm: {
+      disabled: true
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
-        searchCondition: [{
-          key: 'businessType',
-          value: businessTypeData.code,
-        },{
-          key: 'noCheckExpireDateFlag',
-          value: 'TRUE',
-        }]
+        disabled: true
       }
     }
   },
@@ -443,12 +417,39 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+  
     tableForm: {
-      disabled: true
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+      searchCondition: [{
+        key: 'businessType',
+        value: businessTypeData.code,
+      }, {
+        key: 'noCheckExpireDateFlag',
+        value: 'TRUE',
+      }]
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+        }, {
+          key: 'noCheckExpireDateFlag',
+          value: 'TRUE',
+        }]
       }
     }
   },
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 9bb29c449..2ae34438a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -251,7 +251,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -354,12 +354,12 @@ const fromManagementPrecision = ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      if(formField == 'fromPackingNumber'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+      if(formField == 'itemCode'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(async item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['fromPackingNumber'] = item['packingNumber']
+          // newRow['fromPackingNumber'] = item['packingNumber']
           newRow['fromContainerNumber'] = item['containerNumber']
           newRow['itemCode'] = item['itemCode']
           if (item['batch'] != '') {
@@ -406,14 +406,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       if (formField == 'fromWarehouseCode') {
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        if(InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail?.allSchemas?.tableFormColumns?.find(item => (item.field == 'itemCode'))?.tableForm?.searchCondition?.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -429,8 +429,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
+    if(formField == 'itemCode') {
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -625,14 +624,14 @@ const detailOpenForm = (type, row) => {
       item.componentProps.disabled = routeName.value == "HoldtookRequestMain"
     }
   })
-    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
           key: 'warehouseCode',
           value: fromWarehouseCodeMain.value,
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = fromWarehouseCodeMain.value
           }
@@ -741,7 +740,7 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
     console.log(rs,5666);
    if(rs.length > 1) isExist = true
   })
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index aeb533c0b..62e94ffce 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -512,11 +512,23 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -588,23 +600,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm:{
-      multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
+      disabled: true,
+      placeholder: '请选择从包装号',
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
+        disabled: true,
+        placeholder: '请选择从包装号',
       }
     }
   },
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
index c11f9b414..eb96510e4 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue
@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -206,7 +206,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -296,12 +296,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(async () => {
     console.log(formField)
     if (type == 'tableForm') {
-      if (formField == 'fromPackingNumber') {
-        val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch'] && item1['fromPackingNumber'] == item['packingNumber'] && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
+      if (formField == 'itemCode') {
+        val = val.filter(item => !tableData.value.find(item1 => item1['itemCode'] == item['itemCode'] && item1['fromBatch'] == item['batch']  && item1['fromLocationCode'] == item['locationCode'] && item1['fromInventoryStatus'] == item['inventoryStatus']))
         if (val.length == 0) return
         val.forEach(item => {
           const newRow = JSON.parse(JSON.stringify({ ...tableFormKeys, ...item }))
-          newRow['fromPackingNumber'] = item['packingNumber']
           newRow['fromContainerNumber'] = item['containerNumber']
           newRow['itemCode'] = item['itemCode']
           newRow['fromBatch'] = item['batch']
@@ -349,14 +348,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       const setV = {}
       if (formField == 'fromWarehouseCode') {
         tableData.value = []
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -372,8 +371,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
+    if(formField == 'itemCode') {
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -546,14 +544,14 @@ const openForm =async (type: string, row?: number) => {
  * 详情 新增/编辑事件
  */
 const detailOpenForm = (type, row) => {
-    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+    if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
           key: 'warehouseCode',
           value: fromWarehouseCodeMain.value,
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = fromWarehouseCodeMain.value
           }
@@ -646,7 +644,7 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
     console.log(rs,5666);
    if(rs.length > 1) isExist = true
   })
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts
index 357a9e070..a89a01cb8 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts
@@ -510,12 +510,25 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    
+      tableForm: {
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -586,24 +599,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm:{
-      multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
+    tableForm: {
+      disabled: true
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
+        disabled: true
       }
     }
   },
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
index 35c787d9b..f5ad6cd68 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue
@@ -43,7 +43,7 @@
   <BasicForm
     ref="formRef"
     :isOpenSearchTable="true"
-    fieldTableColumn="fromPackingNumber"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"
@@ -197,7 +197,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
 })
 // 修改 tableform 属性
 InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
-  if(item.field == 'fromPackingNumber') {
+  if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
@@ -311,12 +311,11 @@ let toManagementPrecision =  ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
     if (type == 'tableForm') {
-      if(formField == 'fromPackingNumber'){
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
+      if(formField == 'itemCode'){
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
-          newRow['fromPackingNumber'] = item['packingNumber']
           newRow['fromContainerNumber'] = item['containerNumber']
           newRow['itemCode'] = item['itemCode']
           newRow['fromBatch'] = item['batch']
@@ -354,14 +353,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     } else {
       const setV = {}
       if (formField == 'fromWarehouseCode') {
-        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
+        if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.push({
           key: 'warehouseCode',
           value: val[0]["code"],
           isMainValue: false
         })
       } else {
-        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
+        InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'itemCode')).tableForm.searchCondition.find(item => {
           if (item.key == 'warehouseCode') {
             item.value = val[0]["code"]
           }
@@ -377,8 +376,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
   nextTick(async() => {
     const setV = {}
-    if(formField == 'fromPackingNumber') {
-      setV['fromPackingNumber'] = val[0]['packingNumber']
+    if(formField == 'itemCode') {
       setV['fromContainerNumber'] = val[0]['containerNumber']
       setV['itemCode'] = val[0]['itemCode']
       setV['fromBatch'] = val[0]['batch']
@@ -576,14 +574,14 @@ const openForm =async (type: string, row?: number) => {
  * 详情 新增/编辑事件
  */
 const detailOpenForm =async (type, row) => {
-  if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
-    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
+  if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
+    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.push({
       key: 'warehouseCode',
       value: fromWarehouseCodeMain.value,
       isMainValue: false
     })
   } else {
-    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
+    InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'itemCode'))?.componentProps?.searchCondition.find(item => {
       if (item.key == 'warehouseCode') {
         item.value = fromWarehouseCodeMain.value
       }
@@ -712,7 +710,7 @@ const submitForm = async (formType, submitData) => {
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {
-    let rs =  tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber)   )
+    let rs =  tableData.value.filter(filterItem => (filterItem.itemCode&&filterItem.itemCode == item.itemCode)   )
    if(rs.length > 1) isExist = true
   })
   if (isExist) {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
index bf6454003..189ee0a2f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts
@@ -511,11 +511,23 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      multiple: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'itemCode',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disabled: true
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码',
+        searchField: 'itemCode',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }
   },
@@ -619,24 +631,12 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    tableForm:{
-      multiple:true,
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择从包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.selectLocationTypeToBalance,
+    tableForm: {
+      disabled: true
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择从包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.selectLocationTypeToBalance,
+        disabled: true
       }
     }
   },