From b6387a53d8ed99e58a6702c2368d49c40e070de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 17 Mar 2026 14:52:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E5=BC=82=E5=B8=B8):=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B/?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E4=BD=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(发货单): 添加发货计划选择功能

feat(报表): 新增合并报表页面，支持投入产出钢卷统计

style: 移除多余的空格和注释代码
---
 klp-ui/src/views/wms/coil/abnormal.vue        |   2 +-
 klp-ui/src/views/wms/coil/abnormalCoil.vue    |  13 +-
 klp-ui/src/views/wms/coil/abnormalDetail.vue  |  18 +-
 klp-ui/src/views/wms/coil/panels/abnormal.vue |  15 +-
 klp-ui/src/views/wms/coil/panels/base.vue     |  10 +-
 klp-ui/src/views/wms/coil/panels/do.vue       |  17 +-
 .../wms/delivery/components/planList.vue      |   1 -
 .../wms/delivery/components/planSelector.vue  |   0
 .../src/views/wms/delivery/waybill/index.vue  |  20 +-
 klp-ui/src/views/wms/report/merge/index.vue   | 297 ++++++++++++++++++
 10 files changed, 367 insertions(+), 26 deletions(-)
 create mode 100644 klp-ui/src/views/wms/delivery/components/planSelector.vue
 create mode 100644 klp-ui/src/views/wms/report/merge/index.vue

diff --git a/klp-ui/src/views/wms/coil/abnormal.vue b/klp-ui/src/views/wms/coil/abnormal.vue
index db0bbe06..456543e6 100644
--- a/klp-ui/src/views/wms/coil/abnormal.vue
+++ b/klp-ui/src/views/wms/coil/abnormal.vue
@@ -14,7 +14,7 @@ export default {
       querys: {
         dataType: 1,
         // 筛选异常数量大于等于1的
-        minAbnormalCount: 1
+        // minAbnormalCount: 1
       },
       labelType: '2',
       qrcode: false,
diff --git a/klp-ui/src/views/wms/coil/abnormalCoil.vue b/klp-ui/src/views/wms/coil/abnormalCoil.vue
index eb989a65..10dfd152 100644
--- a/klp-ui/src/views/wms/coil/abnormalCoil.vue
+++ b/klp-ui/src/views/wms/coil/abnormalCoil.vue
@@ -65,7 +65,9 @@
               <dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position" />
             </template>
           </el-table-column>
-          <el-table-column label="长度坐标" align="center" prop="lengthCoord" />
+          <el-table-column label="开始位置" align="center" prop="startPosition" />
+          <el-table-column label="结束位置" align="center" prop="endPosition" />
+          <el-table-column label="缺陷长度" align="center" prop="length" />
           <el-table-column label="缺陷代码" align="center" prop="defectCode">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
@@ -120,7 +122,10 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="长度坐标" prop="lengthCoord">
-          <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
+          <!-- <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" /> -->
+          <el-input v-model="form.startPosition" placeholder="请输入开始位置" />
+          <el-input v-model="form.endPosition" placeholder="请输入结束位置" />
+          <!-- <el-input v-model="form.length" placeholder="请输入缺陷长度" /> -->
         </el-form-item>
         <el-form-item label="缺陷代码" prop="defectCode">
           <el-radio-group v-model="form.defectCode">
@@ -339,7 +344,7 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.abnormalId != null) {
-            updateCoilAbnormal(this.form).then(response => {
+            updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -347,7 +352,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addCoilAbnormal(this.form).then(response => {
+            addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
diff --git a/klp-ui/src/views/wms/coil/abnormalDetail.vue b/klp-ui/src/views/wms/coil/abnormalDetail.vue
index e9e8a433..faa8929a 100644
--- a/klp-ui/src/views/wms/coil/abnormalDetail.vue
+++ b/klp-ui/src/views/wms/coil/abnormalDetail.vue
@@ -58,7 +58,9 @@
           <dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position" />
         </template>
       </el-table-column>
-      <el-table-column label="长度坐标" align="center" prop="lengthCoord" />
+      <el-table-column label="开始位置" align="center" prop="startPosition" />
+      <el-table-column label="结束位置" align="center" prop="endPosition" />
+      <el-table-column label="缺陷长度" align="center" prop="length" />
       <el-table-column label="缺陷代码" align="center" prop="defectCode">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
@@ -106,9 +108,15 @@
               dict.label }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="长度坐标" prop="lengthCoord">
-          <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
+        <el-form-item label="开始位置" prop="startPosition">
+          <el-input v-model="form.startPosition" prop="startPosition" />
         </el-form-item>
+        <el-form-item label="结束位置" prop="endPosition">
+          <el-input v-model="form.endPosition" prop="endPosition" />
+        </el-form-item>
+        <!-- <el-form-item label="缺陷长度" prop="length">
+          <el-input v-model="form.length" placeholder="请输入缺陷长度" />
+        </el-form-item> -->
         <el-form-item label="缺陷代码" prop="defectCode">
           <el-radio-group v-model="form.defectCode">
             <el-radio-button v-for="dict in dict.type.coil_abnormal_code" :key="dict.value" :label="dict.value">{{
@@ -293,7 +301,7 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.abnormalId != null) {
-            updateCoilAbnormal(this.form).then(response => {
+            updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -301,7 +309,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addCoilAbnormal(this.form).then(response => {
+            addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
diff --git a/klp-ui/src/views/wms/coil/panels/abnormal.vue b/klp-ui/src/views/wms/coil/panels/abnormal.vue
index 20bf52e5..216817e9 100644
--- a/klp-ui/src/views/wms/coil/panels/abnormal.vue
+++ b/klp-ui/src/views/wms/coil/panels/abnormal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="位置" prop="position">
         <el-select v-model="queryParams.position" placeholder="请选择位置" clearable>
@@ -32,7 +32,9 @@
           <dict-tag :options="dict.type.coil_abnormal_position" :value="scope.row.position" />
         </template>
       </el-table-column>
-      <el-table-column label="长度坐标" align="center" prop="lengthCoord" />
+      <el-table-column label="开始位置" align="center" prop="startPosition" />
+      <el-table-column label="结束位置" align="center" prop="endPosition" />
+      <el-table-column label="缺陷长度" align="center" prop="length" />
       <el-table-column label="缺陷代码" align="center" prop="defectCode">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
@@ -64,7 +66,10 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="长度坐标" prop="lengthCoord">
-          <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" />
+          <!-- <el-input v-model="form.lengthCoord" placeholder="请输入长度坐标" /> -->
+          <el-input v-model="form.startPosition" placeholder="请输入开始位置" />
+          <el-input v-model="form.endPosition" placeholder="请输入结束位置" />
+          <!-- <el-input v-model="form.length" placeholder="请输入缺陷长度" /> -->
         </el-form-item>
         <el-form-item label="缺陷代码" prop="defectCode">
           <el-radio-group v-model="form.defectCode">
@@ -228,7 +233,7 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.abnormalId != null) {
-            updateCoilAbnormal(this.form).then(response => {
+            updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -236,7 +241,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addCoilAbnormal(this.form).then(response => {
+            addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 977d2b3e..1151390c 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -251,8 +251,8 @@
             @click="handleReturnCoil(scope.row)">
             退货钢卷
           </el-button>
-          <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
-            @click="handleAbnormal(scope.row)">查看异常</el-button>
+          <!-- <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
+            @click="handleAbnormal(scope.row)">查看异常</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
             v-if="showControl">修正</el-button>
           <!-- <el-button size="mini" type="text" icon="el-icon-time" @click="handleLog(scope.row)"
@@ -396,9 +396,9 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="异常信息" :visible.sync="abnormalOpen" width="90%" append-to-body>
-      <abnormal-list :coil-id="currentCoilId"></abnormal-list>
-    </el-dialog>
+    <!-- <el-dialog title="异常信息" :visible.sync="abnormalOpen" width="90%" append-to-body> -->
+    <abnormal-list v-if="showAbnormal && currentCoilId" :coil-id="currentCoilId"></abnormal-list>
+    <!-- </el-dialog> -->
 
     <!-- 吞吐记录 -->
     <!-- <el-dialog v-if="showWareLog" title="吞吐记录" :visible.sync="logOpen" width="90%" append-to-body> -->
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 36b0b31e..7d95db2e 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -446,7 +446,11 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="长度坐标" prop="lengthCoord">
-          <el-input v-model="exceptionForm.lengthCoord" placeholder="请输入长度坐标" />
+          <div style="display: flex; gap: 10px;">
+            <el-input v-model="exceptionForm.startPosition" placeholder="请输入开始位置" />
+            -
+            <el-input v-model="exceptionForm.endPosition" placeholder="请输入结束位置" />
+          </div>
         </el-form-item>
         <el-form-item label="缺陷代码" prop="defectCode">
           <el-radio-group v-model="exceptionForm.defectCode">
@@ -557,6 +561,8 @@ export default {
         coilId: null,
         position: null,
         lengthCoord: null,
+        startPosition: 0,
+        endPosition: 0,
         defectCode: null,
         degree: null,
         remark: null
@@ -975,7 +981,10 @@ export default {
       this.exceptionDialogVisible = true
     },
     confirmException() {
-      addCoilAbnormal(this.exceptionForm).then(response => {
+      addCoilAbnormal({
+        ...this.exceptionForm,
+        length: this.exceptionForm.endPosition - this.exceptionForm.startPosition,
+      }).then(response => {
         this.$message.success('异常记录添加成功')
         this.cancelException();
         // 重置表单
@@ -1033,7 +1042,9 @@ export default {
       this.exceptionForm = {
         coilId: null,
         position: null,
-        lengthCoord: null,
+        lengthCoord: 0,
+        startPosition: 0,
+        endPosition: 0,
         defectCode: null,
         degree: null,
         remark: null
diff --git a/klp-ui/src/views/wms/delivery/components/planList.vue b/klp-ui/src/views/wms/delivery/components/planList.vue
index 10cfdb51..3443b760 100644
--- a/klp-ui/src/views/wms/delivery/components/planList.vue
+++ b/klp-ui/src/views/wms/delivery/components/planList.vue
@@ -10,7 +10,6 @@
       />
       <el-button icon="el-icon-plus" @click="handleAdd"></el-button>
     </div>
-    
 
     <el-tree 
       v-loading="planLoading" 
diff --git a/klp-ui/src/views/wms/delivery/components/planSelector.vue b/klp-ui/src/views/wms/delivery/components/planSelector.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 1a6afc5f..a252f5d5 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -100,6 +100,12 @@
     <!-- 添加或修改发货单对话框 -->
     <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="发货计划" prop="planId">
+          <!-- <PlanSelector v-model="form.planId" /> -->
+          <el-select v-model="form.planId" placeholder="请选择发货计划" filterable>
+            <el-option v-for="plan in planListOption" :key="plan.planId" :label="plan.planName" :value="plan.planId" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="发货单名称" prop="waybillName">
           <el-input v-model="form.waybillName" placeholder="请输入发货单名称" />
         </el-form-item>
@@ -147,6 +153,7 @@
 <script>
 import { listDeliveryWaybill, getDeliveryWaybill, delDeliveryWaybill, addDeliveryWaybill, updateDeliveryWaybill, updateDeliveryWaybillStatus } from "@/api/wms/deliveryWaybill";
 import { listSelectableCoils } from "@/api/wms/deliveryPlan"; // 导入发货计划API
+import { listDeliveryPlan } from "@/api/wms/deliveryPlan"; 
 import { listCoilByIds } from "@/api/wms/coil";
 import { listDeliveryWaybillDetail } from "@/api/wms/deliveryWaybillDetail";
 import MemoInput from "@/components/MemoInput";
@@ -154,7 +161,7 @@ import DeliveryWaybillDetail from "../components/detailTable.vue";
 import WayBill from "../components/wayBill.vue";
 import PlanList from "../components/planList.vue";
 import WayBill2 from "../components/wayBill2.vue";
-
+import PlanSelector from "../components/planSelector.vue";
 
 export default {
   name: "DeliveryWaybill",
@@ -163,7 +170,8 @@ export default {
     DeliveryWaybillDetail,
     WayBill,
     PlanList,
-    WayBill2
+    WayBill2,
+    PlanSelector
   },
   data() {
     return {
@@ -194,6 +202,8 @@ export default {
       printType: 0,
       // 是否显示弹出层
       open: false,
+      // 发货计划列表
+      planListOption: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -228,6 +238,7 @@ export default {
     };
   },
   created() {
+    this.loadPlanList();
     this.getList();
   },
   computed: {
@@ -242,6 +253,11 @@ export default {
   },
   methods: {
     /** 查询发货单列表 */
+    loadPlanList() {
+      listDeliveryPlan({ pageSize: 100, pageNum: 1, planType: 0 }).then(response => {
+        this.planListOption = response.rows || [];
+      });
+    },
     getList() {
       this.loading = true;
       // 确保查询参数包含planId
diff --git a/klp-ui/src/views/wms/report/merge/index.vue b/klp-ui/src/views/wms/report/merge/index.vue
new file mode 100644
index 00000000..9ccc702d
--- /dev/null
+++ b/klp-ui/src/views/wms/report/merge/index.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-row>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="enterCoilNo">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="currentCoilNo">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="itemName">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="itemSpecification">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="itemMaterial">
+          <muti-select style="width: 200px;" 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 style="width: 200px;" 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" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出产出钢卷</el-button>
+          <el-button type="primary" @click="exportLossData">导出消耗钢卷</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="产出数量">{{ summary.outCount }}</el-descriptions-item>
+      <el-descriptions-item label="产出总重">{{ summary.outTotalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="产出均重">{{ summary.outAvgWeight }}t</el-descriptions-item>
+
+      <el-descriptions-item label="消耗数量">{{ summary.lossCount }}</el-descriptions-item>
+      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>
+
+      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+
+      <!-- 成品率 -->
+      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
+      <el-descriptions-item label="损耗率">{{ summary.lossRate }}</el-descriptions-item>
+      <!-- 异常率 -->
+      <el-descriptions-item label="异常率">{{ summary.abRate }}</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="投入钢卷" name="loss">
+        <el-table :data="lossList" border height="calc(100vh - 320px)">
+          <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">
+              <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" />
+          <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+          <!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
+          <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="netWeight" />
+          <el-table-column label="长度 (米)" align="center" prop="length" />
+          <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+          <el-table-column label="更新人" align="center" prop="updateByName" />
+          <el-table-column label="更新时间" align="center" prop="updateTime" />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="产出钢卷" name="output">
+        <el-table :data="outList" border height="calc(100vh - 320px)">
+          <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">
+              <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" />
+          <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+          <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+          <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="netWeight" />
+          <el-table-column label="长度 (米)" align="center" prop="length" />
+          <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+          <el-table-column label="出库状态" align="center" prop="status">
+            <!-- 0在库，1已出库 -->
+            <template slot-scope="scope">
+              {{ scope.row.status === 0 ? '在库' : '已出库' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="更新人" align="center" prop="updateByName" />
+          <el-table-column label="更新时间" align="center" prop="updateTime" />
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { listCoilWithIds } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import { calcSummary } from "@/views/wms/report/js/calc";
+
+export default {
+  name: 'MergeTemplate',
+  props: {
+    actionType: {
+      type: Number,
+      required: true
+    }
+  },
+  components: {
+    MemoInput,
+    MutiSelect,
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+  },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  data() {
+    // 工具函数：个位数补零
+    const addZero = (num) => num.toString().padStart(2, '0')
+
+    // 获取当前日期（默认选中当天）
+    const now = new Date()
+    const currentDate = `${now.getFullYear()}-${addZero(now.getMonth() + 1)}`
+
+    /**
+     * 生成指定日期/月份的时间范围字符串
+     * @param {string} dateStr - 支持格式：yyyy-MM（月份） 或 yyyy-MM-dd（具体日期）
+     * @returns {object} 包含start（开始时间）和end（结束时间）的对象
+     */
+    const getDayTimeRange = (dateStr) => {
+      // 先校验输入格式是否合法
+      const monthPattern = /^\d{4}-\d{2}$/; // yyyy-MM 正则
+      const dayPattern = /^\d{4}-\d{2}-\d{2}$/; // yyyy-MM-dd 正则
+
+      if (!monthPattern.test(dateStr) && !dayPattern.test(dateStr)) {
+        throw new Error('输入格式错误，请传入 yyyy-MM 或 yyyy-MM-dd 格式的字符串');
+      }
+
+      let startDate, endDate;
+
+      if (monthPattern.test(dateStr)) {
+        // 处理 yyyy-MM 格式：获取本月第一天和最后一天
+        const [year, month] = dateStr.split('-').map(Number);
+        // 月份是0基的（0=1月，1=2月...），所以要减1
+        // 第一天：yyyy-MM-01
+        startDate = `${dateStr}-01`;
+        // 最后一天：通过 new Date(year, month, 0) 计算（month是原始月份，比如2代表2月，传2则取3月0日=2月最后一天）
+        const lastDayOfMonth = new Date(year, month, 0).getDate();
+        endDate = `${dateStr}-${lastDayOfMonth.toString().padStart(2, '0')}`;
+      } else {
+        // 处理 yyyy-MM-dd 格式：直接使用传入的日期
+        startDate = dateStr;
+        endDate = dateStr;
+      }
+
+      // 拼接时间部分
+      return {
+        start: `${startDate} 00:00:00`,
+        end: `${endDate} 23:59:59`
+      };
+    };
+
+    const { start, end } = getDayTimeRange(currentDate)
+    return {
+      lossList: [],
+      outList: [],
+      activeTab: 'loss',
+      loading: false,
+      queryParams: {
+        startTime: start,
+        endTime: end,
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        itemName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
+        pageSize: 9999,
+        pageNum: 1,
+      }
+    }
+  },
+  computed: {
+    summary() {
+      return calcSummary(this.outList, this.lossList)
+    },
+  },
+  created() {
+    this.handleQuery()
+  },
+  methods: {
+    handleQuery() {
+      this.getList()
+    },
+    async getList() {
+      this.loading = true;
+      const res1 = await listPendingAction({ ...this.queryParams, actionType: 201, actionStatus: 2 });
+      const res2 = await listPendingAction({ ...this.queryParams, actionType: 202, actionStatus: 2 });
+      
+      const res3 = await listPendingAction({ ...this.queryParams, actionType: 203, actionStatus: 2 });
+      const res4 = await listPendingAction({ ...this.queryParams, actionType: 204, actionStatus: 2 });
+      const res5 = await listPendingAction({ ...this.queryParams, actionType: 205, actionStatus: 2 });
+      const res6 = await listPendingAction({ ...this.queryParams, actionType: 206, actionStatus: 2 });
+
+      const res = res1.rows.concat(res2.rows, res3.rows, res4.rows, res5.rows, res6.rows);
+      // 获取两层数据
+      const lossIds = res.map(item => item.coilId);
+      // 使用new Set去重
+      const outIds = [...new Set(res.map(item => item.processedCoilIds))];
+
+      if (lossIds.length === 0 || outIds.length === 0) {
+        this.$message({
+          message: '查询结果为空',
+          type: 'warning'
+        })
+        this.loading = false;
+        return
+      }
+
+      const [lossRes, outRes] = await Promise.all([
+        listCoilWithIds({ ...this.queryParams, coilIds: lossIds.join(',') || '' }),
+        listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '' }),
+      ]);
+      this.lossList = lossRes.rows;
+      this.outList = outRes.rows;
+      this.loading = false;
+    },
+    // 导出
+    exportData() {
+      if (this.outList.length === 0) {
+        this.$message.warning('暂无数据可导出')
+        return
+      }
+      this.download('wms/materialCoil/export', {
+        coilIds: this.outList.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+    exportLossData() {
+      if (this.lossList.length === 0) {
+        this.$message.warning('暂无数据可导出')
+        return
+      }
+      this.download('wms/materialCoil/export', {
+        coilIds: this.lossList.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  }
+}
+</script>
+
+<style></style>
\ No newline at end of file