From fef2f132d0d06a1e376b91d50244912ba7548091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 9 Mar 2026 16:07:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=86=B7?=
 =?UTF-8?q?=E7=A1=AC=E5=8D=B7=E6=9D=BF=E5=88=87=E8=BE=B9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=92=8C=E7=B1=BB=E5=88=AB=E5=AE=BD=E5=BA=A6=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增冷硬卷板切边统计页面和API接口
- 新增类别宽度统计页面和API接口
- 修改发货单页面，调整列显示
- 扩展统计预览功能，支持多种统计类型展示
---
 klp-ui/src/api/wms/coil.js                    |  18 +++
 .../Perspective/CategoryWidthStatistics.vue   |   0
 .../panels/Perspective/TrimStatistics.vue     | 152 ++++++++++++++++++
 .../wms/coil/panels/Perspective/index.vue     |  13 +-
 .../src/views/wms/coil/perspective/index.vue  |  31 +++-
 .../src/views/wms/delivery/waybill/index.vue  |   9 +-
 6 files changed, 211 insertions(+), 12 deletions(-)
 create mode 100644 klp-ui/src/views/wms/coil/panels/Perspective/CategoryWidthStatistics.vue
 create mode 100644 klp-ui/src/views/wms/coil/panels/Perspective/TrimStatistics.vue

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 559bc4ba..eb0f3971 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -328,3 +328,21 @@ export function returnCoil(coilId) {
     }
   })
 }
+
+/**
+ * 冷硬卷切边统计
+ */
+export function listCoilTrimStatistics() {
+  return request({
+    url: '/wms/materialCoil/statistics/trimStatistics',
+    method: 'get',
+  })
+}
+
+// 类别宽度统计,汇总统计
+export function categoryWidthStatistics() {
+  return request({
+    url: '/wms/materialCoil/statistics/categoryWidthStatistics',
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/Perspective/CategoryWidthStatistics.vue b/klp-ui/src/views/wms/coil/panels/Perspective/CategoryWidthStatistics.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/wms/coil/panels/Perspective/TrimStatistics.vue b/klp-ui/src/views/wms/coil/panels/Perspective/TrimStatistics.vue
new file mode 100644
index 00000000..33995a9f
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/panels/Perspective/TrimStatistics.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="trim-statistics-table">
+    <el-table
+      :data="tableData"
+      border
+      stripe
+      :span-method="objectSpanMethod"
+      style="width: 100%;"
+    >
+      <!-- 厚度列 -->
+      <el-table-column
+        prop="thickness"
+        label="厚度"
+        width="80"
+        align="center"
+      />
+
+      <!-- 冷硬卷板净边料现货库存 表头组 -->
+      <el-table-column
+        label="冷硬卷板净边料现货库存"
+        align="center"
+      >
+        <el-table-column
+          label="总计"
+          align="center"
+        >
+          <el-table-column label="数量(件)" prop="trimmedTotalCount" width="80" align="center" />
+          <el-table-column label="重量(吨)" prop="trimmedTotalWeight" width="80" align="center" />
+        </el-table-column>
+        <el-table-column
+          v-for="width in widthList"
+          :key="'trimmed-' + width"
+          :label="width"
+          align="center"
+        >
+          <el-table-column label="数量(件)" :prop="`trimmed_${width}_count`" width="80" align="center" />
+          <el-table-column label="重量(吨)" :prop="`trimmed_${width}_weight`" width="80" align="center" />
+        </el-table-column>
+      </el-table-column>
+
+      <!-- 冷硬卷板毛边料现货库存 表头组 -->
+      <el-table-column
+        label="冷硬卷板毛边料现货库存"
+        align="center"
+      >
+        <el-table-column
+          label="总计"
+          align="center"
+        >
+          <el-table-column label="数量(件)" prop="untrimmedTotalCount" width="80" align="center" />
+          <el-table-column label="重量(吨)" prop="untrimmedTotalWeight" width="80" align="center" />
+        </el-table-column>
+        <el-table-column
+          v-for="width in widthList"
+          :key="'untrimmed-' + width"
+          :label="width"
+          align="center"
+        >
+          <el-table-column label="数量(件)" :prop="`untrimmed_${width}_count`" width="80" align="center" />
+          <el-table-column label="重量(吨)" :prop="`untrimmed_${width}_weight`" width="80" align="center" />
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TrimStatistics',
+  props: {
+    data: {
+      type: Array,
+      default: () => []
+    }
+  },
+  computed: {
+    // 定义表格中需要展示的宽度规格（与图片中一致）
+    widthList() {
+      return [
+        '1000', '1200/1202', '1218/1220', '1240/1252', 
+        '1010/1015', '1210/1215', '1225/1235', '1260-1265',
+        '1000~1005', '1200~1215', '1218~1235', '1250~1265'
+      ];
+    },
+    // 处理后的数据（适配表格列结构）
+    tableData() {
+      return this.data.map(item => {
+        const row = {
+          thickness: item.thickness,
+          trimmedTotalCount: 0, // 净边料总计数量
+          trimmedTotalWeight: 0, // 净边料总计重量
+          untrimmedTotalCount: 0, // 毛边料总计数量
+          untrimmedTotalWeight: 0 // 毛边料总计重量
+        };
+
+        // 初始化所有宽度的数量和重量为0
+        this.widthList.forEach(width => {
+          row[`trimmed_${width}_count`] = 0;
+          row[`trimmed_${width}_weight`] = 0;
+          row[`untrimmed_${width}_count`] = 0;
+          row[`untrimmed_${width}_weight`] = 0;
+        });
+
+        // 处理净边料数据
+        item.trimmedList.forEach(trimmed => {
+          const widthKey = trimmed.width;
+          if (this.widthList.includes(widthKey)) {
+            row[`trimmed_${widthKey}_count`] = trimmed.coilCount;
+            row[`trimmed_${widthKey}_weight`] = trimmed.totalWeight;
+            // 累加总计
+            row.trimmedTotalCount += trimmed.coilCount;
+            row.trimmedTotalWeight = (Number(row.trimmedTotalWeight) + Number(trimmed.totalWeight)).toFixed(3);
+          }
+        });
+
+        // 处理毛边料数据
+        item.untrimmedList.forEach(untrimmed => {
+          const widthKey = untrimmed.width;
+          if (this.widthList.includes(widthKey)) {
+            row[`untrimmed_${widthKey}_count`] = untrimmed.coilCount;
+            row[`untrimmed_${widthKey}_weight`] = untrimmed.totalWeight;
+            // 累加总计
+            row.untrimmedTotalCount += untrimmed.coilCount;
+            row.untrimmedTotalWeight = (Number(row.untrimmedTotalWeight) + Number(untrimmed.totalWeight)).toFixed(3);
+          }
+        });
+
+        return row;
+      });
+    }
+  },
+  methods: {
+    // 合并表头的跨度方法（可选，若需要合并行/列可扩展）
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // 可根据需求实现行/列合并逻辑，例如合并重复的厚度行
+      // 示例：若需合并相同厚度的行，可在此处返回 { rowspan: n, colspan: m }
+      return { rowspan: 1, colspan: 1 };
+    }
+  }
+};
+</script>
+
+<style scoped>
+.trim-statistics-table {
+  padding: 10px;
+  overflow-x: auto;
+}
+.el-table {
+  --el-table-header-text-color: #333;
+  --el-table-row-hover-bg-color: #f5f7fa;
+}
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/Perspective/index.vue b/klp-ui/src/views/wms/coil/panels/Perspective/index.vue
index f404f3be..1e3a5def 100644
--- a/klp-ui/src/views/wms/coil/panels/Perspective/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/Perspective/index.vue
@@ -1,11 +1,18 @@
 <template>
   <div class="perspective">
-    <hot-zha-raw :data="data" />
+    <hot-zha-raw v-if="statType == '热轧原料'" :data="data" />
+    <trim-statistics v-else-if="statType == '冷硬卷板'" :data="data" />
+    <category-width-statistics v-else-if="statType == '汇总'" :data="data" />
+    <div v-else>
+      <el-alert type="warning" message="请选择有效统计类型" show-icon />
+    </div>
   </div>
 </template>
 
 <script>
   import HotZhaRaw from "@/views/wms/coil/panels/Perspective/HotZhaRaw.vue";
+  import TrimStatistics from "@/views/wms/coil/panels/Perspective/TrimStatistics.vue";
+  import CategoryWidthStatistics from "@/views/wms/coil/panels/Perspective/CategoryWidthStatistics.vue";
   export default {
     name: 'Perspective',
     props: {
@@ -13,7 +20,7 @@
         type: Array,
         default: () => ([]) 
       },
-      type: {
+      statType: {
         type: String,
         default: ''
       },
@@ -25,6 +32,8 @@
     },
     components: {
       HotZhaRaw,
+      TrimStatistics,
+      CategoryWidthStatistics,
     },
     methods: {
       handleSave(data) {
diff --git a/klp-ui/src/views/wms/coil/perspective/index.vue b/klp-ui/src/views/wms/coil/perspective/index.vue
index 60bcca5d..7afa2088 100644
--- a/klp-ui/src/views/wms/coil/perspective/index.vue
+++ b/klp-ui/src/views/wms/coil/perspective/index.vue
@@ -8,18 +8,17 @@
       <el-col :span="18">
         <div style="height: calc(100vh - 124px); overflow-y: scroll; overflow-x: hidden;">
           <div v-if="currentRow.summaryId">
-            <Preview :data="currentRow.statJson" />
+            <Preview :data="currentRow.statJson" :statType="currentRow.statType" />
           </div>
           <div v-else>
             <div>钢卷生产统计详情</div>
           </div>
         </div>
-       
       </el-col>
     </el-row>
 
-    <el-dialog v-loading="previewLoading" title="效果预览" :visible.sync="previewOpen" width="800px" append-to-body>
-      <Preview :data="liveData" />
+    <el-dialog v-loading="previewLoading" title="效果预览" :visible.sync="previewOpen" width="100vw" fullscreen append-to-body>
+      <Preview :data="liveData" :statType="form.statType" />
       <el-button type="primary" @click="handleSave">保存</el-button>
     </el-dialog>
   </div>
@@ -31,6 +30,7 @@ import LeftList from "./components/LeftList.vue";
 import Preview from "@/views/wms/coil/panels/Perspective/index.vue";
 
 import { listRawMaterialPerspective } from "@/api/wms/rawMaterial";
+import { listCoilTrimStatistics, categoryWidthStatistics } from "@/api/wms/coil";
 
 export default {
   name: "CoilStatisticsSummary",
@@ -74,7 +74,7 @@ export default {
       },
       previewLoading: false,
       previewOpen: false,
-      liveData: {},
+      liveData: [],
       currentRow: {},
     };
   },
@@ -162,7 +162,26 @@ export default {
           this.previewLoading = false;
         });
       }
-     
+      else if (form.statType == '冷硬卷板') {
+        this.previewLoading = true;
+        listCoilTrimStatistics().then(response => {
+          this.liveData = response.data;
+        }).finally(() => {
+          this.previewLoading = false;
+        });
+      }
+      else if (form.statType == '汇总') {
+        this.previewLoading = true;
+        categoryWidthStatistics().then(response => {
+          this.liveData = response.data;
+        }).finally(() => {
+          this.previewLoading = false;
+        });
+      }
+      else {
+        this.$modal.msgError("未知类型");
+      }
+      this.previewLoading = false;
     },
     handleSave() {
       addCoilStatisticsSummary({
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 7801cac2..90362959 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -42,13 +42,14 @@
             <el-table-column label="发货单名称" align="center" prop="waybillName" />
             <el-table-column label="车牌" align="center" prop="licensePlate" width="100" />
             <el-table-column label="收货单位" align="center" prop="consigneeUnit" />
-            <el-table-column label="发货单位" align="center" prop="senderUnit" />
+            <!-- <el-table-column label="发货单位" align="center" prop="senderUnit" /> -->
+            <el-table-column label="订单编号" align="center" prop="orderNo" />
             <el-table-column label="发货时间" align="center" prop="deliveryTime" width="100">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="负责人" align="center" prop="principal" />
+            <el-table-column label="负责人" align="center" prop="principal" width="60" />
             <!-- <el-table-column label="负责人电话" align="center" prop="principalPhone" width="100" /> -->
             <el-table-column label="完成状态" align="center" prop="status" width="120">
               <template slot-scope="scope">
@@ -108,9 +109,9 @@
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="form.principal" placeholder="请输入负责人" />
         </el-form-item>
-        <el-form-item label="负责人电话" prop="principalPhone">
+        <!-- <el-form-item label="负责人电话" prop="principalPhone">
           <el-input v-model="form.principalPhone" placeholder="请输入负责人电话" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>