From 6f415c44d1bdb0ceff279e527aaae078b4d18718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 11 Aug 2025 16:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=9C=80=E8=A6=81=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/KLPService/MaterialSelect/index.vue |  2 +-
 .../src/components/KLPService/Renderer/BomInfo.vue |  4 ++--
 .../components/KLPService/Renderer/BomInfoMini.vue |  5 +++--
 .../components/KLPService/Renderer/ProductInfo.vue |  6 +++---
 .../KLPService/Renderer/RawMaterialInfo.vue        |  5 +++--
 klp-ui/src/views/wms/ledger/index.vue              | 14 ++++++++------
 klp-ui/src/views/wms/stockIo/move.vue              |  2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/klp-ui/src/components/KLPService/MaterialSelect/index.vue b/klp-ui/src/components/KLPService/MaterialSelect/index.vue
index 00cd49bd..888c06d6 100644
--- a/klp-ui/src/components/KLPService/MaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/MaterialSelect/index.vue
@@ -48,7 +48,7 @@
       },
       _itemId: {
         get() {
-          return this.itemId;
+          return this.itemId.toString();
         },
         set(val) {
           this.$emit('update:itemId', val);
diff --git a/klp-ui/src/components/KLPService/Renderer/BomInfo.vue b/klp-ui/src/components/KLPService/Renderer/BomInfo.vue
index 3387f47d..51765133 100644
--- a/klp-ui/src/components/KLPService/Renderer/BomInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/BomInfo.vue
@@ -63,9 +63,9 @@ export default {
       let bomId = this.bomId;
       if (!bomId) {
         if (this.itemType === 'product') {
-          bomId = this.productMap[this.itemId].bomId;
+          bomId = this.productMap[this.itemId]?.bomId;
         } else if (this.itemType === 'raw_material') {
-          bomId = this.rawMaterialMap[this.itemId].bomId;
+          bomId = this.rawMaterialMap[this.itemId]?.bomId;
         }
       }
       if (!bomId) {
diff --git a/klp-ui/src/components/KLPService/Renderer/BomInfoMini.vue b/klp-ui/src/components/KLPService/Renderer/BomInfoMini.vue
index e08552e1..52c24df0 100644
--- a/klp-ui/src/components/KLPService/Renderer/BomInfoMini.vue
+++ b/klp-ui/src/components/KLPService/Renderer/BomInfoMini.vue
@@ -63,12 +63,13 @@ export default {
       let bomId = this.bomId;
       if (!bomId) {
         if (this.itemType === 'product') {
-          bomId = this.productMap[this.itemId].bomId;
+          bomId = this.productMap[this.itemId]?.bomId;
         } else if (this.itemType === 'raw_material') {
-          bomId = this.rawMaterialMap[this.itemId].bomId;
+          bomId = this.rawMaterialMap[this.itemId]?.bomId;
         }
       }
       if (!bomId) {
+        this.bomInfo = [];
         return;
       }
       if (bomMap[bomId]) {
diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
index 0830efb1..6e5580cb 100644
--- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
@@ -62,9 +62,9 @@ export default {
   watch: {
     productId: {
       handler(newVal) {
-        this.product = this.productMap && this.productMap[this.productId] 
-          ? { ...this.productMap[this.productId] } 
-          : {};
+        const res = this.productMap[this.productId] ? this.productMap[this.productId] : {};
+        console.log(res)
+        this.product = res;
       },
       immediate: true
     }
diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
index 79975da6..00f76682 100644
--- a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
@@ -3,7 +3,7 @@
     <!-- 作用域插槽 -->
     <span class="material-name" @click="showDetail = true">
       <slot name="default" :material="material">
-        {{ material.rawMaterialName ? material.rawMaterialName : '--' }}
+        {{ material.rawMaterialName ? material.rawMaterialName : '-' }}
       </slot>
     </span>
     <el-dialog :visible="showDetail" @close="showDetail = false" :title="material.rawMaterialName" width="600px"
@@ -47,7 +47,8 @@ export default {
   watch: {
     materialId: {
       handler: function (newVal) {
-        const res = this.materialMap ? this.materialMap[this.materialId] : {};
+        const res = this.materialMap[this.materialId] ? this.materialMap[this.materialId] : {};
+        console.log(res)
         this.material = res;
       },
       immediate: true
diff --git a/klp-ui/src/views/wms/ledger/index.vue b/klp-ui/src/views/wms/ledger/index.vue
index eae0e56f..ee786d4c 100644
--- a/klp-ui/src/views/wms/ledger/index.vue
+++ b/klp-ui/src/views/wms/ledger/index.vue
@@ -5,6 +5,7 @@
         <WarehouseSelect v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位" clearable @change="getList" />
       </el-form-item>
       <MaterialSelect :itemType.sync="queryParams.itemType" :itemId.sync="queryParams.itemId" @change="getList" />
+
       <el-form-item label="变动时间" prop="changeTime">
         <el-date-picker 
           clearable
@@ -36,7 +37,7 @@
     <el-table v-loading="loading" :data="stockLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键ID" align="center" prop="id" v-if="true"/>
-      <el-table-column label="仓库/库区/库位ID" align="center" prop="warehouseId" />
+      <el-table-column label="存储位置" align="center" prop="warehouseName" />
       <el-table-column label="物品ID" align="center" prop="itemId">
         <template slot-scope="scope">
           <RawMaterialInfo v-if="scope.row.itemType == 'raw_material'" :material-id="scope.row.itemId" />
@@ -80,19 +81,20 @@
     <!-- 添加或修改库存流水对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="仓库/库区/库位ID" prop="warehouseId" disabled>
+        <el-form-item label="存储位置" prop="warehouseId" disabled>
           <el-input v-model="form.warehouseId" placeholder="请输入仓库/库区/库位ID" disabled />
         </el-form-item>
-        <el-form-item label="物品ID" prop="itemId" disabled>
-          <el-input v-model="form.itemId" placeholder="请输入物品ID" disabled />
+        <el-form-item label="物品信息" prop="itemId" disabled>
+          <RawMaterialInfo v-if="form.itemType == 'raw_material'" :material-id="form.itemId" />
+          <ProductInfo v-else-if="form.itemType == 'product' || form.itemType == 'semi'" :product-id="form.itemId" />
         </el-form-item>
         <el-form-item label="变动数量" prop="changeQty" disabled>
           <el-input v-model="form.changeQty" placeholder="请输入变动数量" disabled />
         </el-form-item>
-        <el-form-item label="变动后的库存数量" prop="afterQty" disabled>
+        <el-form-item label="库存数量" prop="afterQty" disabled>
           <el-input v-model="form.afterQty" placeholder="请输入变动后的库存数量" disabled />
         </el-form-item>
-        <el-form-item label="实际库存变动时间" prop="changeTime" disabled>
+        <el-form-item label="变动时间" prop="changeTime" disabled>
           <el-date-picker clearable
             v-model="form.changeTime"
             type="datetime"
diff --git a/klp-ui/src/views/wms/stockIo/move.vue b/klp-ui/src/views/wms/stockIo/move.vue
index b38239a7..e505064a 100644
--- a/klp-ui/src/views/wms/stockIo/move.vue
+++ b/klp-ui/src/views/wms/stockIo/move.vue
@@ -1,5 +1,5 @@
 <template>
-  <StockIoPage ioType="move" />
+  <StockIoPage ioType="transfer" />
 </template>
 
 <script>