From 273d7c44b7d75f242d891bafdeadc7c114591316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 7 Mar 2026 10:24:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms/coil):=20=E6=96=B0=E5=A2=9E=E6=8C=89?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E9=92=A2=E5=8D=B7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BA=A7=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加镀锌卷、热轧卷、冷轧卷、冷硬卷的按名称查询页面组件
在产品信息和原材料信息展示中增加镀层信息显示
移除base.vue中未使用的BomInfoMini组件
优化DrillDownTable.vue的代码结构
新增ByName.vue作为通用查询面板
---
 .../KLPService/Renderer/ProductInfo.vue       |   2 +-
 .../KLPService/Renderer/RawMaterialInfo.vue   |   2 +-
 klp-ui/src/views/wms/coil/panels/ByName.vue   | 229 ++++++++++++++++++
 .../views/wms/coil/panels/DrillDownTable.vue  |  16 --
 klp-ui/src/views/wms/coil/panels/base.vue     |   2 -
 .../src/views/wms/coil/views/ByName/duxin.vue |  19 ++
 .../views/wms/coil/views/ByName/lengying.vue  |  19 ++
 .../views/wms/coil/views/ByName/lengzha.vue   |  19 ++
 .../src/views/wms/coil/views/ByName/rezha.vue |  19 ++
 9 files changed, 307 insertions(+), 20 deletions(-)
 create mode 100644 klp-ui/src/views/wms/coil/panels/ByName.vue
 create mode 100644 klp-ui/src/views/wms/coil/views/ByName/duxin.vue
 create mode 100644 klp-ui/src/views/wms/coil/views/ByName/lengying.vue
 create mode 100644 klp-ui/src/views/wms/coil/views/ByName/lengzha.vue
 create mode 100644 klp-ui/src/views/wms/coil/views/ByName/rezha.vue

diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
index 97cecf68..f538c8e2 100644
--- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
@@ -36,7 +36,7 @@
       <!-- 触发元素（原产品名称文本） -->
       <span slot="reference" class="product-name">
         <slot name="default" :product="productFull">
-          {{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}]({{ productFull.material || '无材质' }})-{{ productFull.manufacturer || '无厂家' }}
+          {{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}]({{ productFull.material || '无材质' }})-{{ productFull.manufacturer || '无厂家' }}-{{ productFull.zincLayer || '无镀层' }}
         </slot>
       </span>
     </el-popover>
diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
index 1042ca16..85d6fa29 100644
--- a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
@@ -23,7 +23,7 @@
       <!-- 触发元素（原材料名称文本） -->
       <span slot="reference" class="material-name">
         <slot name="default" :material="materialFull">
-          {{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}]({{ materialFull.material || '无材质' }})-{{ materialFull.manufacturer || '无厂家' }}
+          {{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}]({{ materialFull.material || '无材质' }})-{{ materialFull.manufacturer || '无厂家' }}-{{ materialFull.zincLayer || '无镀层' }}
         </slot>
       </span>
     </el-popover>
diff --git a/klp-ui/src/views/wms/coil/panels/ByName.vue b/klp-ui/src/views/wms/coil/panels/ByName.vue
new file mode 100644
index 00000000..1b0fa81e
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/panels/ByName.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <!-- 查询条件设置 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
+      <el-form-item label="入场钢卷号" prop="enterCoilNo">
+        <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="当前钢卷号" prop="currentCoilNo">
+        <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="逻辑库位" prop="warehouseId">
+        <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+          style="width: 100%; display: inline-block;" clearable />
+      </el-form-item>
+
+      <el-form-item label="实际库区" prop="actualWarehouseId">
+        <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择仓库/库区/库位"
+          style="width: 100%; display: inline-block;" clearable :canSelectDisabled="true" :canSelectLevel2="true"
+          :clearInput="false" :showEmpty="true" />
+      </el-form-item>
+
+      <el-form-item label="规格" prop="itemSpecification">
+        <memo-input v-model="queryParams.itemSpecification" storageKey="coilSpec" placeholder="请选择规格" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="材质" prop="itemMaterial">
+        <muti-select v-model="queryParams.itemMaterial" :options="dict.type.coil_material" placeholder="请选择材质" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="厂家" prop="itemManufacturer">
+        <muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家"
+          clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 数据汇总 -->
+    <el-descriptions title="统计数据" :column="3" border>
+      <el-descriptions-item label="总长度 (米)">{{ summaryData.totalLength }}</el-descriptions-item>
+      <el-descriptions-item label="总重量 (吨)">{{ summaryData.totalNetWeight }}</el-descriptions-item>
+      <el-descriptions-item label="平均重量 (吨)">{{ summaryData.avgNetWeight }}</el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 本地筛选 -->
+    <!-- <el-tabs v-model="filters.itemType" type="border-card">
+      <el-tab-pane label="全部" name="all"></el-tab-pane>
+      <el-tab-pane label="产品" name="product"></el-tab-pane>
+      <el-tab-pane label="原材料" name="raw_material"></el-tab-pane>
+    </el-tabs>
+    <el-tabs v-model="filters.itemManufacturer" type="border-card">
+      <el-tab-pane label="全部" name="all"></el-tab-pane>
+      <el-tab-pane v-for="item in dict.type.coil_manufacturer" :label="item.label" :name="item.value"></el-tab-pane>
+    </el-tabs> -->
+
+    <!-- 数据明细展示 -->
+    <el-table v-loading="filterLoading" :data="filteredList" height="calc(100vh - 300px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" /> -->
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+      <el-table-column label="物料类型" align="center" prop="materialType" />
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+
+      <el-table-column label="发货状态" align="center" prop="status" width="150">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status === 1" type="success" size="mini">已发货</el-tag>
+          <el-tag v-else type="info" size="mini">未发货</el-tag>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listMaterialCoil } from "@/api/wms/coil";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+
+export default {
+  name: 'ByName',
+  props: {
+    itemName: {
+      type: String,
+      default: ''
+    }
+  },
+  dicts: ['coil_material', 'coil_manufacturer'],
+  created() {
+    this.fetchData();
+  },
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+    MemoInput,
+    MutiSelect,
+    ActualWarehouseSelect,
+    WarehouseSelect,
+  },
+  data() {
+    return {
+      queryParams: {
+        dataType: 1,
+        status: 0,
+        pageNum: 1,
+        pageSize: 5000,
+        itemName: this.itemName,
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        actualWarehouseId: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
+      },
+      list: [],
+      loading: false,
+      filters: {
+        itemType: 'all',
+        itemManufacturer: 'all',
+      },
+      filterLoading: false,
+      // 汇总维度
+      // filterDimension: ['itemType'],
+      // filterConfig: {
+
+      // }
+    }
+  },
+  computed: {
+    summaryData() {
+      // 总数量，总重量，平均重量
+      const total = this.list.reduce((acc, cur) => {
+        acc.length += 1;
+        acc.netWeight += parseFloat(cur.netWeight);
+        return acc;
+      }, { length: 0, netWeight: 0 });
+      return {
+        totalLength: total.length,
+        totalNetWeight: total.netWeight.toFixed(2),
+        avgNetWeight: (total.netWeight / this.list.length).toFixed(2)
+      };
+    },
+    filteredList() {
+      this.filterLoading = true;
+      const filteredList = this.list.filter(item => {
+        if (this.filters.itemType !== 'all' && item.itemType !== this.filters.itemType) {
+          return false;
+        }
+        if (this.filters.itemManufacturer !== 'all' && item.itemManufacturer !== this.filters.itemManufacturer) {
+          return false;
+        }
+        return true;
+      });
+      this.filterLoading = false;
+      return filteredList;
+    }
+  },
+  methods: {
+    async fetchData() {
+      this.loading = true;
+      try {
+        const res1 = await listMaterialCoil({...this.queryParams, itemType: 'product', materialType: '成品', selectType: 'product'});
+        const res2 = await listMaterialCoil({...this.queryParams, itemType: 'raw_material', materialType: '原料', selectType: 'raw_material'});
+        const res = [...res1.rows, ...res2.rows];
+        this.list = res || [];
+      } catch (err) {
+        this.$message.error("获取数据失败：" + err.message);
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleQuery() {
+      this.fetchData();
+    },
+    resetQuery() {
+      this.queryParams = {
+        dataType: 1,
+        status: 0,
+        pageNum: 1,
+        pageSize: 5000,
+        itemName: this.itemName,
+      };
+      this.fetchData();
+    },
+  }
+}
+</script>
+
+<style scoped>
+  /* 样式穿透 */
+  ::v-deep .el-tabs .el-tabs__content {
+    padding: 0;
+  }
+</style>
diff --git a/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue b/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
index 1272fc27..50147b1a 100644
--- a/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
+++ b/klp-ui/src/views/wms/coil/panels/DrillDownTable.vue
@@ -1,21 +1,5 @@
 <template>
   <div class="drill-down-content">
-    <!-- 钻取条件显示 -->
-    <!-- <div class="drill-down-header">
-      <el-tag size="large" v-if="queryParams.itemType">
-        {{ queryParams.itemType === 'product' ? '成品' : '原材料' }}
-      </el-tag>
-      <el-tag size="large" v-if="itemName" type="primary">
-        {{ itemName }}
-      </el-tag>
-      <el-tag size="large" v-if="warehouseName" type="success">
-        {{ warehouseName }}
-      </el-tag>
-      <el-tag size="large" v-if="actualWarehouseName" type="info">
-        {{ actualWarehouseName }}
-      </el-tag>
-    </div> -->
-
     <!-- 加载状态 -->
     <el-skeleton :loading="loading" animated>
       <template #template>
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index f120b304..cbf20833 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -399,7 +399,6 @@ import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 // import MaterialSelect from "@/components/KLPService/ProductSelect";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
-import BomInfoMini from "@/components/KLPService/Renderer/BomInfoMini";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 // 引入封装的追溯结果组件
 import CoilTraceResult from "./CoilTraceResult.vue";
@@ -427,7 +426,6 @@ export default {
     RawMaterialSelect,
     ProductInfo,
     RawMaterialInfo,
-    BomInfoMini,
     CoilTraceResult,
     LabelRender,
     ActualWarehouseSelect,
diff --git a/klp-ui/src/views/wms/coil/views/ByName/duxin.vue b/klp-ui/src/views/wms/coil/views/ByName/duxin.vue
new file mode 100644
index 00000000..650fd5dd
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/ByName/duxin.vue
@@ -0,0 +1,19 @@
+<template>
+  <ByName :itemName="itemName" />
+</template>
+
+<script>
+  import ByName from '@/views/wms/coil/panels/ByName.vue';
+
+  export default {
+    name: 'Duxin',
+    components: {
+      ByName
+    },
+    data() {
+      return {
+        itemName: '镀锌卷'
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/views/ByName/lengying.vue b/klp-ui/src/views/wms/coil/views/ByName/lengying.vue
new file mode 100644
index 00000000..c84479f6
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/ByName/lengying.vue
@@ -0,0 +1,19 @@
+<template>
+  <ByName :itemName="itemName" />
+</template>
+
+<script>
+  import ByName from '@/views/wms/coil/panels/ByName.vue';
+
+  export default {
+    name: 'Lengying',
+    components: {
+      ByName
+    },
+    data() {
+      return {
+        itemName: '冷硬卷'
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/views/ByName/lengzha.vue b/klp-ui/src/views/wms/coil/views/ByName/lengzha.vue
new file mode 100644
index 00000000..4642c497
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/ByName/lengzha.vue
@@ -0,0 +1,19 @@
+<template>
+  <ByName :itemName="itemName" />
+</template>
+
+<script>
+  import ByName from '@/views/wms/coil/panels/ByName.vue';
+
+  export default {
+    name: 'Lengzha',
+    components: {
+      ByName
+    },
+    data() {
+      return {
+        itemName: '冷轧卷'
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/views/ByName/rezha.vue b/klp-ui/src/views/wms/coil/views/ByName/rezha.vue
new file mode 100644
index 00000000..3024877b
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/ByName/rezha.vue
@@ -0,0 +1,19 @@
+<template>
+  <ByName :itemName="itemName" />
+</template>
+
+<script>
+  import ByName from '@/views/wms/coil/panels/ByName.vue';
+
+  export default {
+    name: 'Rezha',
+    components: {
+      ByName
+    },
+    data() {
+      return {
+        itemName: '热轧卷'
+      }
+    }
+  }
+</script>
\ No newline at end of file