From 6a0b06bf40c470363c6a774e448e99e0904d73eb Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 22 Jan 2024 17:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=89=A9=E6=96=99=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

出库物料联动
---
 .../src/views/heli/storage/StorageForm.vue    |  8 ++++-
 .../src/views/heli/storage/StorageOut.vue     | 34 +++++++++++++++----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index d82473aa..aa442e10 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -408,7 +408,11 @@ const handleStatus = (async (num) => {
     isShowBtnCancel.value = false;
     isShowBtnOther.value = true;
   }
+  query.type= 'update'
+  query.id = storageid.value
+  formData.value.id = storageid.value
   reload();
+  
 })
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -508,8 +512,10 @@ const submitForm = async () => {
 
 
     // 成功后刷新
+    query.type= 'update'
+    query.id = storageid.value
+    formData.value.id = storageid.value
     reload();
-
   } finally {
     formLoading.value = false
   }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 4aa88463..9afc04e4 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -387,6 +387,9 @@ const handleStatus = (async (num) => {
     isShowBtnCancel.value = false;
     isShowBtnOther.value = true;
   }
+  query.id = storageid.value
+  query.type= 'update'
+  formData.value.id = storageid.value
   reload()
 })
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
@@ -503,7 +506,10 @@ const submitForm = async () => {
 
 
     // 成功后刷新
-    reload();
+    query.id = storageid.value
+    query.type= 'update'
+    formData.value.id = storageid.value
+    reload()
   } finally {
     formLoading.value = false
   }
@@ -532,6 +538,8 @@ const onAddItem = () => {
       productBomItemValueDOList: []
     }
     matCount = matCount + 1
+
+    
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('清选择出库仓库')
@@ -562,11 +570,23 @@ const handleWh = (async (wid) => {
   pnList.value = []
   rgList.value = dataRg.list
 
-  formData.value.matItemDOList.forEach(item => {
-    item.rgId = ''
-    item.pnId = ''
-    item.pnlist.value = []
-  })
+  const matLastRemoteData = await StorageMatApi.getStorageMatList()
+
+  let matParams = {
+    pageNo: 1,
+    pageSize: 10,
+    status: "1"
+  }
+  const dataMat = await MaterialApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
+
+  formData.value.matItemDOList = []
+  // formData.value.matItemDOList.forEach(item => {
+  //   item.rgId = ''
+  //   item.pnId = ''
+  //   item.pnlist.value = []
+  // })
   //-------------------
 })
 const handleRg = (async (scope) => {
@@ -599,7 +619,7 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id) !== undefined)
+  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
   matSelectLoading.value = false
 
 }