From cb818cc72888a2e5cf34a57069b28cfdc3fdeee6 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 14 Aug 2024 13:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=BA=93=E4=BD=8D=E5=92=8C=E5=88=B0?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=B8=8D=E8=83=BD=E7=9B=B8=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymove/inventorymoveRecordMainNew/index.vue       | 5 +++++
 .../inventorymove/inventorymoveRequestMain/index.vue         | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
index aafffdb83..e81f61d67 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue
@@ -346,6 +346,11 @@ const submitForm = async (formType, submitData) => {
       return;
     }
   })
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
+  if(findLocation){
+    message.warning('从库位和到库位不能相同')
+    return
+  }
   if(flag.value){
     formRef.value.formLoading = false
     return
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index d3e3a6822..d51adbb4f 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -345,6 +345,7 @@ if(routeName.value == 'HoldtookRequestMain'){
       item.hidden = false
     }
   })
+  
 }
 console.log('tableFormColumns',InventorymoveRequestDetail.allSchemas.tableFormColumns)
 // 字段设置 更新主列表字段
@@ -714,7 +715,7 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode)
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
   if(findLocation){
     message.warning('从库位和到库位不能相同')
     return