From b5c1cdac12f24d2584a92121574a9a71e9f145db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 13 Jul 2026 11:19:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms/annealPerformance):=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=89=8D=E9=92=A2=E5=8D=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构退火性能报表页面，增加双标签页切换，分别展示退火后和加工前钢卷数据，新增加工前钢卷查询接口调用和对应的查询、统计、表格展示逻辑
---
 klp-ui/src/api/wms/annealPerformance.js       |   9 +
 .../views/wms/anneal/performance/report.vue   | 228 ++++++++++++------
 2 files changed, 158 insertions(+), 79 deletions(-)

diff --git a/klp-ui/src/api/wms/annealPerformance.js b/klp-ui/src/api/wms/annealPerformance.js
index bf0b6bf1a..076a7bb67 100644
--- a/klp-ui/src/api/wms/annealPerformance.js
+++ b/klp-ui/src/api/wms/annealPerformance.js
@@ -8,3 +8,12 @@ export function getAnnealPerformance(query) {
     params: query
   })
 }
+
+// 查询退火计划中的加工前钢卷列表
+export function getAnnealRawCoils(query) {
+  return request({
+    url: '/wms/anneal/performance/rawCoils',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/klp-ui/src/views/wms/anneal/performance/report.vue b/klp-ui/src/views/wms/anneal/performance/report.vue
index 08c43731f..6f17560ea 100644
--- a/klp-ui/src/views/wms/anneal/performance/report.vue
+++ b/klp-ui/src/views/wms/anneal/performance/report.vue
@@ -1,75 +1,119 @@
 <template>
   <div class="app-container" v-loading="loading">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
-      <el-form-item label="时间">
-        <time-range-picker v-model="timeRangeParams" start-key="startTime" end-key="endTime"
-          :default-start-time="queryParams.startTime" :default-end-time="queryParams.endTime"
-          @quick-select="handleQuery" />
-      </el-form-item>
-      <el-form-item label="目标炉" prop="targetFurnaceId">
-        <el-select v-model="queryParams.targetFurnaceId" placeholder="请选择" clearable filterable>
-          <el-option v-for="item in furnaceOptions" :key="item.furnaceId" :label="item.furnaceName"
-            :value="item.furnaceId" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="计划号" prop="planNo">
-        <el-input v-model="queryParams.planNo" placeholder="请输入计划号" clearable />
-      </el-form-item>
-      <el-form-item label="入场钢卷号" prop="enterCoilNo">
-        <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable />
-      </el-form-item>
-      <el-form-item label="当前钢卷号" prop="currentCoilNo">
-        <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable />
-      </el-form-item>
-      <el-form-item label="出炉库区" prop="warehouseId">
-        <WarehouseSelect v-model="queryParams.warehouseId" placeholder="请选择" clearable filterable />
-      </el-form-item>
-      <el-form-item label="逻辑库区" prop="coilWarehouseId">
-        <WarehouseSelect v-model="queryParams.coilWarehouseId" placeholder="请选择" clearable filterable />
-      </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-button icon="el-icon-download" size="mini" @click="exportData">导出</el-button>
-      </el-form-item>
-    </el-form>
+    <!-- <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+      <el-tab-pane label="退火后" name="processed" />
+      <el-tab-pane label="加工前" name="raw" />
+    </el-tabs> -->
 
-    <el-descriptions title="统计信息" :column="3" class="summary-block" border>
-      <el-descriptions-item label="计划数量">{{ summary.planCount || 0 }}</el-descriptions-item>
-      <el-descriptions-item label="钢卷数量">{{ summary.coilCount || 0 }}</el-descriptions-item>
-      <el-descriptions-item label="总重量">{{ summary.totalWeight || 0 }} t</el-descriptions-item>
-    </el-descriptions>
+    <!-- ========== 退火后 ========== -->
+    <template v-if="activeTab === 'processed'">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
+        <el-form-item label="时间">
+          <time-range-picker v-model="timeRangeParams" start-key="startTime" end-key="endTime"
+            :default-start-time="queryParams.startTime" :default-end-time="queryParams.endTime"
+            @quick-select="handleQuery" />
+        </el-form-item>
+        <el-form-item label="目标炉" prop="targetFurnaceId">
+          <el-select v-model="queryParams.targetFurnaceId" placeholder="请选择" clearable filterable>
+            <el-option v-for="item in furnaceOptions" :key="item.furnaceId" :label="item.furnaceName"
+              :value="item.furnaceId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计划号" prop="planNo">
+          <el-input v-model="queryParams.planNo" placeholder="请输入计划号" clearable />
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="enterCoilNo">
+          <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="currentCoilNo">
+          <el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable />
+        </el-form-item>
+        <el-form-item label="出炉库区" prop="warehouseId">
+          <WarehouseSelect v-model="queryParams.warehouseId" placeholder="请选择" clearable filterable />
+        </el-form-item>
+        <el-form-item label="逻辑库区" prop="coilWarehouseId">
+          <WarehouseSelect v-model="queryParams.coilWarehouseId" placeholder="请选择" clearable filterable />
+        </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-button icon="el-icon-download" size="mini" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
 
-    <el-table :data="detailList" border height="calc(100vh - 330px)">
-      <el-table-column label="计划号" prop="planNo" align="center" />
-      <el-table-column label="目标炉" prop="targetFurnaceName" align="center" />
-      <el-table-column label="开始时间" prop="actualStartTime" align="center" width="160">
-        <template slot-scope="scope">
-          {{ parseTime(scope.row.actualStartTime, '{y}-{m}-{d} {h}:{i}') }}
-        </template>
-      </el-table-column>
-      <el-table-column label="结束时间" prop="endTime" align="center" width="160">
-        <template slot-scope="scope">
-          {{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}') }}
-        </template>
-      </el-table-column>
-      <el-table-column label="产品类型" align="center" width="250">
-        <template slot-scope="scope">
-          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
-          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
-        </template>
-      </el-table-column>
-      <el-table-column label="出炉库区" prop="logicWarehouseName" align="center" />
-      <el-table-column label="逻辑库区" prop="warehouseName" align="center" />
-      <el-table-column label="入场钢卷号" prop="enterCoilNo" align="center" />
-      <el-table-column label="当前钢卷号" prop="currentCoilNo" align="center" />
-      <el-table-column label="重量(t)" prop="netWeight" align="center" />
-    </el-table>
+      <el-descriptions title="统计信息" :column="3" class="summary-block" border>
+        <el-descriptions-item label="计划数量">{{ summary.planCount || 0 }}</el-descriptions-item>
+        <el-descriptions-item label="钢卷数量">{{ summary.coilCount || 0 }}</el-descriptions-item>
+        <el-descriptions-item label="总重量">{{ summary.totalWeight || 0 }} t</el-descriptions-item>
+      </el-descriptions>
+
+      <el-table :data="detailList" border height="calc(100vh - 330px)">
+        <el-table-column label="计划号" prop="planNo" align="center" />
+        <el-table-column label="目标炉" prop="targetFurnaceName" align="center" />
+        <el-table-column label="开始时间" prop="actualStartTime" align="center" width="160">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.actualStartTime, '{y}-{m}-{d} {h}:{i}') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" prop="endTime" align="center" width="160">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="产品类型" align="center" width="250">
+          <template slot-scope="scope">
+            <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
+            <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
+          </template>
+        </el-table-column>
+        <el-table-column label="出炉库区" prop="logicWarehouseName" align="center" />
+        <el-table-column label="逻辑库区" prop="warehouseName" align="center" />
+        <el-table-column label="入场钢卷号" prop="enterCoilNo" align="center" />
+        <el-table-column label="当前钢卷号" prop="currentCoilNo" align="center" />
+        <el-table-column label="重量(t)" prop="netWeight" align="center" />
+      </el-table>
+    </template>
+
+    <!-- ========== 加工前 ========== -->
+    <template v-if="activeTab === 'raw'">
+      <el-form :model="rawQueryParams" ref="rawQueryForm" size="small" :inline="true" label-width="90px">
+        <el-form-item label="入场钢卷号" prop="enterCoilNo">
+          <el-input v-model="rawQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="currentCoilNo">
+          <el-input v-model="rawQueryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable />
+        </el-form-item>
+        <el-form-item label="逻辑库区" prop="warehouseId">
+          <WarehouseSelect v-model="rawQueryParams.warehouseId" placeholder="请选择" clearable filterable />
+        </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="resetRawQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-descriptions title="统计信息" :column="2" class="summary-block" border>
+        <el-descriptions-item label="钢卷数量">{{ rawSummary.coilCount || 0 }}</el-descriptions-item>
+        <el-descriptions-item label="总重量">{{ rawSummary.totalWeight || 0 }} t</el-descriptions-item>
+      </el-descriptions>
+
+      <el-table :data="rawDetailList" border height="calc(100vh - 330px)">
+        <el-table-column label="入场钢卷号" prop="enterCoilNo" align="center" width="140" />
+        <el-table-column label="当前钢卷号" prop="currentCoilNo" align="center" width="140" />
+        <el-table-column label="物料名称" prop="itemName" align="center" />
+        <el-table-column label="物料编码" prop="itemCode" align="center" />
+        <el-table-column label="规格" prop="specification" align="center" />
+        <el-table-column label="材质" prop="material" align="center" />
+        <el-table-column label="锌层" prop="zincLayer" align="center" />
+        <el-table-column label="重量(t)" prop="netWeight" align="center" />
+        <el-table-column label="逻辑库区" prop="warehouseName" align="center" />
+      </el-table>
+    </template>
   </div>
 </template>
 
 <script>
-import { getAnnealPerformance } from "@/api/wms/annealPerformance";
+import { getAnnealPerformance, getAnnealRawCoils } from "@/api/wms/annealPerformance";
 import { listAnnealFurnace } from "@/api/wms/annealFurnace";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
@@ -96,7 +140,9 @@ export default {
       return `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,'0')}-${String(d.getDate()).padStart(2,'0')} 00:00:00`;
     })()
     return {
+      activeTab: 'processed',
       loading: false,
+      // 退火后查询参数
       timeRangeParams: {
         startTime,
         endTime,
@@ -114,6 +160,14 @@ export default {
       summary: {},
       detailList: [],
       furnaceOptions: [],
+      // 加工前查询参数
+      rawQueryParams: {
+        enterCoilNo: undefined,
+        currentCoilNo: undefined,
+        warehouseId: undefined,
+      },
+      rawSummary: {},
+      rawDetailList: [],
     };
   },
   watch: {
@@ -138,26 +192,42 @@ export default {
     },
     handleQuery() {
       this.loading = true;
-      getAnnealPerformance(this.queryParams).then(response => {
-        const data = response.data || {};
-        this.summary = data.summary || {};
-        this.detailList = data.details.map(item => {
-          return item.coils?.map(coil => {
-            return {
-              ...item,
-              ...coil,
-            }
-          }) || []
-        }).flat();
-        this.loading = false;
-      }).catch(() => {
-        this.loading = false;
-      });
+      if (this.activeTab === 'raw') {
+        getAnnealRawCoils(this.rawQueryParams).then(response => {
+          const list = response.data || [];
+          this.rawDetailList = list;
+          this.rawSummary = {
+            coilCount: list.length,
+            totalWeight: list.reduce((s, r) => s + Number(r.netWeight || 0), 0).toFixed(3),
+          };
+          this.loading = false;
+        }).catch(() => {
+          this.loading = false;
+        });
+      } else {
+        getAnnealPerformance(this.queryParams).then(response => {
+          const data = response.data || {};
+          this.summary = data.summary || {};
+          this.detailList = (data.details || []).map(item => {
+            return item.coil ? { ...item, ...item.coil } : item;
+          });
+          this.loading = false;
+        }).catch(() => {
+          this.loading = false;
+        });
+      }
+    },
+    handleTabClick() {
+      this.handleQuery();
     },
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    resetRawQuery() {
+      this.resetForm("rawQueryForm");
+      this.handleQuery();
+    },
     exportData() {
       this.download('/wms/materialCoil/exportAnneal', {
         coilIds: this.detailList.map(item => item.coilId).join(','),