From fe556cfc6c463c4519c5455d307eb40351e3ff57 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Thu, 29 May 2025 10:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/startprint.vue        |  2 +-
 .../src/views/heli/storage/StorageForm.vue            | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
index f855c8a..18bf2c6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue
@@ -164,7 +164,7 @@
                 <!-- </div> -->
               </td>
               <td colspan="1"  style="max-width: 90px;min-width: 90px">{{ item.compositionName }} </td>
-              <td colspan="2"  style="max-width: 180px;min-width: 200px">{{equipInit.find((equip) => equip.id == item.equipId)?.name}} </td>
+              <td colspan="2"  style="max-width: 180px;min-width: 200px">{{equipInit.find((equip) => equip.id == item.deviceModel)?.name}} </td>
               <td colspan="1"  style="max-width: 60px;min-width: 60px">{{item.amount}} </td>
               <td  colspan="1"  style="max-width: 60px;min-width: 60px">{{}} </td>
             </tr>
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 b28ca5b..eb968c3 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
@@ -475,6 +475,7 @@ const getList = async (arrMat) => {
       break;
     }
   }
+  console.log("库位1"+pnList.value)
   arrMat.forEach((row) => {
     if (
       formData.value.matItemDOList.filter(
@@ -493,6 +494,8 @@ const getList = async (arrMat) => {
       }
       row.pnlist = ref([])
       row.pnlist = pnList.value.filter((pn) => pn.rg_id == row.rgId)
+      console.log("库位"+pnList.value)
+      console.log("库位长度"+pnList.value.length)
       if (row.pnlist.length == 1) {
         row.pnId =  row.pnlist[0].id
       }else if (pnList.value.length == 0) {
@@ -835,7 +838,7 @@ const handleWh = async (wid) => {
   const dataPnList = await PnApi.getSimpList()
   rgList.value = dataRgList.filter((rg) => rg.wh_id == wid)
   pnList.value = dataPnList.filter((pn) => pn.wh_id == wid)
-
+  console.log("1")
   formData.value.matItemDOList.forEach((item) => {
     item.rgId = ''
     item.pnId = ''
@@ -948,7 +951,12 @@ onMounted(async () => {
 
   if (whList.value.length==1){
  formData.value.whId = whList.value[0].id;
+    const dataRgList = await RgApi.getSimpList()
+    rgList.value = dataRgList.filter((rg) => rg.wh_id == formData.value.whId)
+    // 获得库区列表
+    const dataPnList = await PnApi.getSimpList()
 
+    pnList.value = dataPnList.filter((pn) => pn.wh_id == formData.value.whId)
   }
   // formData.value.whId = Math.min.apply(Math, whList.value.map(function(i) {return i.id}));
 
@@ -971,6 +979,7 @@ onMounted(async () => {
 
     // 获得库区列表
     const dataPnList = await PnApi.getSimpList()
+
     pnList.value = dataPnList.filter((pn) => pn.wh_id == formData.value.whId)
 
     // 获取库存物料列表信息