From 84f141896c4a0a43c236a0d9c82cd33c9045bf5c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 2 Feb 2026 09:55:17 +0800
Subject: [PATCH 01/29] =?UTF-8?q?feat(order):=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9E=E4=BD=93=E5=A2=9E=E5=8A=A0=E5=8E=9F?=
 =?UTF-8?q?=E6=96=99=E8=A7=84=E6=A0=BC=E7=AD=89=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 specRequire 字段重命名为 rawMaterialSpec（原料规格）
- 新增 finishedProductSpec 字段（成品规格）
- 新增 material 字段（材质）
- 新增 grade 字段（等级）
- 新增 weight 字段（重量）
- 新增 contractPrice 字段（合同定价）
- 新增 customizer 字段（定制人）
- 新增 shipper 字段（发货人）
- 新增 productionBatch 字段（排产批次）
- 更新数据库映射配置以支持新字段
- 更新查询条件构造逻辑以包含新字段过滤
- 更新 VO 对象以支持 Excel 导出新字段
---
 .../java/com/klp/crm/domain/CrmOrderItem.java | 38 ++++++++++++-
 .../com/klp/crm/domain/bo/CrmOrderItemBo.java | 46 ++++++++++++++-
 .../com/klp/crm/domain/vo/CrmOrderItemVo.java | 56 +++++++++++++++++--
 .../service/impl/CrmOrderItemServiceImpl.java | 12 +++-
 .../resources/mapper/CrmOrderItemMapper.xml   | 22 +++++++-
 5 files changed, 159 insertions(+), 15 deletions(-)

diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
index b6e8bd44..3911e740 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrderItem.java
@@ -34,9 +34,9 @@ public class CrmOrderItem extends BaseEntity {
      */
     private String productType;
     /**
-     * 规格要求
+     * 原料规格
      */
-    private String specRequire;
+    private String rawMaterialSpec;
     /**
      * 产品数量
      */
@@ -53,10 +53,42 @@ public class CrmOrderItem extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 成品规格
+     */
+    private String finishedProductSpec;
+    /**
+     * 材质
+     */
+    private String material;
+    /**
+     * 等级
+     */
+    private String grade;
+    /**
+     * 重量
+     */
+    private BigDecimal weight;
+    /**
+     * 合同定价
+     */
+    private BigDecimal contractPrice;
+    /**
+     * 定制人
+     */
+    private String customizer;
+    /**
+     * 发货人
+     */
+    private String shipper;
+    /**
+     * 排产批次
+     */
+    private String productionBatch;
     /**
      * 删除标识 0正常 2删除
      */
     @TableLogic
     private Long delFlag;
 
-}
+}
\ No newline at end of file
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
index b7e5fd91..ee08d021 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderItemBo.java
@@ -34,9 +34,9 @@ public class CrmOrderItemBo extends BaseEntity {
     private String productType;
 
     /**
-     * 规格要求
+     * 原料规格
      */
-    private String specRequire;
+    private String rawMaterialSpec;
 
     /**
      * 产品数量
@@ -57,6 +57,46 @@ public class CrmOrderItemBo extends BaseEntity {
      * 备注
      */
     private String remark;
+    
+    /**
+     * 成品规格
+     */
+    private String finishedProductSpec;
+
+    /**
+     * 材质
+     */
+    private String material;
+
+    /**
+     * 等级
+     */
+    private String grade;
+
+    /**
+     * 重量
+     */
+    private BigDecimal weight;
+
+    /**
+     * 合同定价
+     */
+    private BigDecimal contractPrice;
+
+    /**
+     * 定制人
+     */
+    private String customizer;
+
+    /**
+     * 发货人
+     */
+    private String shipper;
+
+    /**
+     * 排产批次
+     */
+    private String productionBatch;
 
 
-}
+}
\ No newline at end of file
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
index 51b6870d..4efd8b12 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderItemVo.java
@@ -41,10 +41,10 @@ public class CrmOrderItemVo {
     private String productType;
 
     /**
-     * 规格要求
+     * 原料规格
      */
-    @ExcelProperty(value = "规格要求")
-    private String specRequire;
+    @ExcelProperty(value = "原料规格")
+    private String rawMaterialSpec;
 
     /**
      * 产品数量
@@ -71,5 +71,53 @@ public class CrmOrderItemVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 成品规格
+     */
+    @ExcelProperty(value = "成品规格")
+    private String finishedProductSpec;
 
-}
+    /**
+     * 材质
+     */
+    @ExcelProperty(value = "材质")
+    private String material;
+
+    /**
+     * 等级
+     */
+    @ExcelProperty(value = "等级")
+    private String grade;
+
+    /**
+     * 重量
+     */
+    @ExcelProperty(value = "重量")
+    private BigDecimal weight;
+
+    /**
+     * 合同定价
+     */
+    @ExcelProperty(value = "合同定价")
+    private BigDecimal contractPrice;
+
+    /**
+     * 定制人
+     */
+    @ExcelProperty(value = "定制人")
+    private String customizer;
+
+    /**
+     * 发货人
+     */
+    @ExcelProperty(value = "发货人")
+    private String shipper;
+
+    /**
+     * 排产批次
+     */
+    @ExcelProperty(value = "排产批次")
+    private String productionBatch;
+
+
+}
\ No newline at end of file
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
index 3705995b..cee3853a 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java
@@ -63,10 +63,18 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
         LambdaQueryWrapper<CrmOrderItem> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getOrderId()), CrmOrderItem::getOrderId, bo.getOrderId());
         lqw.eq(StringUtils.isNotBlank(bo.getProductType()), CrmOrderItem::getProductType, bo.getProductType());
-        lqw.eq(StringUtils.isNotBlank(bo.getSpecRequire()), CrmOrderItem::getSpecRequire, bo.getSpecRequire());
+        lqw.eq(StringUtils.isNotBlank(bo.getRawMaterialSpec()), CrmOrderItem::getRawMaterialSpec, bo.getRawMaterialSpec());
         lqw.eq(bo.getProductNum() != null, CrmOrderItem::getProductNum, bo.getProductNum());
         lqw.eq(StringUtils.isNotBlank(bo.getSpecialRequire()), CrmOrderItem::getSpecialRequire, bo.getSpecialRequire());
         lqw.eq(bo.getItemAmount() != null, CrmOrderItem::getItemAmount, bo.getItemAmount());
+        lqw.eq(StringUtils.isNotBlank(bo.getFinishedProductSpec()), CrmOrderItem::getFinishedProductSpec, bo.getFinishedProductSpec());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), CrmOrderItem::getMaterial, bo.getMaterial());
+        lqw.eq(StringUtils.isNotBlank(bo.getGrade()), CrmOrderItem::getGrade, bo.getGrade());
+        lqw.eq(bo.getWeight() != null, CrmOrderItem::getWeight, bo.getWeight());
+        lqw.eq(bo.getContractPrice() != null, CrmOrderItem::getContractPrice, bo.getContractPrice());
+        lqw.eq(StringUtils.isNotBlank(bo.getCustomizer()), CrmOrderItem::getCustomizer, bo.getCustomizer());
+        lqw.eq(StringUtils.isNotBlank(bo.getShipper()), CrmOrderItem::getShipper, bo.getShipper());
+        lqw.eq(StringUtils.isNotBlank(bo.getProductionBatch()), CrmOrderItem::getProductionBatch, bo.getProductionBatch());
         return lqw;
     }
 
@@ -112,4 +120,4 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
-}
+}
\ No newline at end of file
diff --git a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
index 8cceba99..cab90b42 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderItemMapper.xml
@@ -8,11 +8,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="itemId" column="item_id"/>
         <result property="orderId" column="order_id"/>
         <result property="productType" column="product_type"/>
-        <result property="specRequire" column="spec_require"/>
+        <result property="rawMaterialSpec" column="raw_material_spec"/>
         <result property="productNum" column="product_num"/>
         <result property="specialRequire" column="special_require"/>
         <result property="itemAmount" column="item_amount"/>
         <result property="remark" column="remark"/>
+        <result property="finishedProductSpec" column="finished_product_spec"/>
+        <result property="material" column="material"/>
+        <result property="grade" column="grade"/>
+        <result property="weight" column="weight"/>
+        <result property="contractPrice" column="contract_price"/>
+        <result property="customizer" column="customizer"/>
+        <result property="shipper" column="shipper"/>
+        <result property="productionBatch" column="production_batch"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -25,11 +33,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         item_id,
         order_id,
         product_type,
-        spec_require,
+        raw_material_spec,
         product_num,
         special_require,
         item_amount,
         remark,
+        finished_product_spec,
+        material,
+        grade,
+        weight,
+        contract_price,
+        customizer,
+        shipper,
+        production_batch,
         create_by,
         create_time,
         update_by,
@@ -45,4 +61,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
+</mapper>
\ No newline at end of file

From 0cb51f6117f44f4df5a3622a992b914d395fe60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 10:55:15 +0800
Subject: [PATCH 02/29] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E5=92=8C=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在订单和客户管理界面中新增联系方式和公司名称字段显示
调整客户列表和订单列表的布局及字段展示
优化收款表单首次加载时的处理逻辑
---
 .../java/com/klp/crm/domain/vo/CrmOrderVo.java     |  4 ++++
 .../src/main/resources/mapper/CrmOrderMapper.xml   |  2 ++
 klp-ui/src/views/crm/components/ReceiveTable.vue   |  7 ++++++-
 klp-ui/src/views/crm/customer/index.vue            |  8 +++++---
 klp-ui/src/views/crm/order/index.vue               | 14 +++++++++-----
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
index 13463f31..e56ea33e 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
@@ -116,6 +116,10 @@ public class CrmOrderVo extends BaseEntity {
 //    @ExcelProperty(value = "地址")
     private String address;
 
+    private String contactWay;
+
+    private String companyName;
+
     //创建人
     private String createByName;
     //更新人
diff --git a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
index 88dea3e1..d8421338 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
@@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             co.update_time AS updateTime,
             cu.customer_code AS customerCode,
             cu.contact_person AS contactPerson,
+            cu.contact_way AS contactWay,
+            cu.company_name AS companyName,
             cu.address AS address
         FROM crm_order co
                LEFT JOIN crm_customer cu ON co.customer_id = cu.customer_id
diff --git a/klp-ui/src/views/crm/components/ReceiveTable.vue b/klp-ui/src/views/crm/components/ReceiveTable.vue
index 68f793f9..77eb27a1 100644
--- a/klp-ui/src/views/crm/components/ReceiveTable.vue
+++ b/klp-ui/src/views/crm/components/ReceiveTable.vue
@@ -247,7 +247,8 @@ export default {
       // 收款表单参数
       receiveForm: {},
       // 是否显示收款弹出层
-      receiveOpen: false
+      receiveOpen: false,
+      isFirst: true,
     };
   },
   methods: {
@@ -258,6 +259,10 @@ export default {
         this.receivableList = response.rows;
         this.total = response.total;
         this.loading = false;
+        if (this.isFirst) {
+          this.isFirst = false;
+          return;
+        }
         updateOrder({
           orderId: this.orderId,
           unpaidAmount: this.unreceivedAmount,
diff --git a/klp-ui/src/views/crm/customer/index.vue b/klp-ui/src/views/crm/customer/index.vue
index 1f00e3fc..bccf8c7b 100644
--- a/klp-ui/src/views/crm/customer/index.vue
+++ b/klp-ui/src/views/crm/customer/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!-- 客户列表区域 -->
-      <el-col :span="5" style="border-right: 1px solid #e4e7ed;">
+      <el-col :span="6" style="border-right: 1px solid #e4e7ed;">
         <div style="font-weight: 900;">客户列表</div>
         <!-- 搜索区域 -->
         <div style="display: flex; align-items: center; gap: 5px; margin-top: 10px;">
@@ -55,7 +55,9 @@
             listKey="customerId" 
             :loading="customerLoading" 
             field1="customerCode"
-            field4="companyName" 
+            field2="companyName" 
+            field4="contactPerson"
+            field5="contactWay"
             @item-click="handleItemClick"
           >
             <template slot="actions" slot-scope="{ item }">
@@ -66,7 +68,7 @@
       </el-col>
 
       <!-- 右侧内容区域 -->
-      <el-col :span="19">
+      <el-col :span="18">
         <el-tabs v-model="activeTab" type="border-card" v-if="currentCustomer && currentCustomer.customerId">
           <!-- 客户详情标签页 -->
           <el-tab-pane label="客户详情" name="detail">
diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue
index 14641861..71b71791 100644
--- a/klp-ui/src/views/crm/order/index.vue
+++ b/klp-ui/src/views/crm/order/index.vue
@@ -8,7 +8,8 @@
           <el-input style="flex: 1;" prefix-icon="el-icon-search" placeholder="输入订单编号搜索"
             v-model="queryParams.orderCode"></el-input>
           <el-button icon="el-icon-search" @click="toggleQuery"></el-button>
-          <el-button type="primary" icon="el-icon-plus" style="margin-left: 0;" @click="handleAdd" v-hasPermi="['crm:order:add']"></el-button>
+          <el-button type="primary" icon="el-icon-plus" style="margin-left: 0;" @click="handleAdd"
+            v-hasPermi="['crm:order:add']"></el-button>
         </div>
         <div v-show="showQuery"
           style="display: flex; align-items: center; gap: 5px; margin-top: 10px; flex-wrap: wrap;">
@@ -29,10 +30,11 @@
         </div>
         <div>
           <!-- 列表区域 -->
-          <KLPList :listData="orderList" listKey="orderId" :loading="orderLoading" field1="orderCode" field4="salesman"
-            @item-click="handleOrderClick">
+          <KLPList :listData="orderList" listKey="orderId" :loading="orderLoading" field1="orderCode" field2="salesman"
+            field4="companyName" field5="contactPerson"  @item-click="handleOrderClick">
             <template slot="actions" slot-scope="{ item }">
-              <el-button type="danger" size="mini" @click="handleDelete(item)" icon="el-icon-delete" v-hasPermi="['crm:order:add']"></el-button>
+              <el-button type="danger" size="mini" @click="handleDelete(item)" icon="el-icon-delete"
+                v-hasPermi="['crm:order:add']"></el-button>
             </template>
           </KLPList>
         </div>
@@ -46,8 +48,10 @@
               <!-- 订单详情内容 -->
               <el-descriptions :column="2" :border="true" title="订单基本信息" style="margin-bottom: 20px;">
                 <el-descriptions-item label="订单编号">{{ form.orderCode }}</el-descriptions-item>
-                <el-descriptions-item label="客户">{{ form.customerId }}</el-descriptions-item>
                 <el-descriptions-item label="销售员">{{ form.salesman }}</el-descriptions-item>
+                <el-descriptions-item label="客户公司">{{ form.companyName }}</el-descriptions-item>
+                <el-descriptions-item label="联系人">{{ form.contactPerson }}</el-descriptions-item>
+                <el-descriptions-item label="联系电话">{{ form.contactWay }}</el-descriptions-item>
                 <el-descriptions-item label="备注" :span="2">{{ form.remark }}</el-descriptions-item>
               </el-descriptions>
 

From d8ddb12228cc0cf36949b045b23048b8ff612e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 11:41:11 +0800
Subject: [PATCH 03/29] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E6=9F=A5=E8=AF=A2=E3=80=81=E7=BB=9F=E8=AE=A1=E5=92=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加钢卷报表页面，支持按时间、钢卷号、库位等条件查询，展示统计信息和明细数据，并提供导出功能
---
 klp-ui/src/views/wms/report/zha_.vue | 229 +++++++++++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 klp-ui/src/views/wms/report/zha_.vue

diff --git a/klp-ui/src/views/wms/report/zha_.vue b/klp-ui/src/views/wms/report/zha_.vue
new file mode 100644
index 00000000..e4554d6e
--- /dev/null
+++ b/klp-ui/src/views/wms/report/zha_.vue
@@ -0,0 +1,229 @@
+<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.byCreateTimeStart" 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.byCreateTimeEnd" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <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="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <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="endTime">
+          <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="endTime">
+          <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 label="收货计划" prop="planId">
+          <el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
+            :remote-method="remoteMethod">
+            <el-option v-for="item in planList" :key="item.planId" :label="item.planName" :value="item.planId" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" 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">
+        <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>
+  </div>
+</template>
+
+<script>
+import { listCoilWithIds } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+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 WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
+  },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  data() {
+    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
+    const addZero = (num) => num.toString().padStart(2, '0')
+
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)
+
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00`
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        // status: 1,
+        byCreateTimeStart: startTime,
+        byCreateTimeEnd: endTime,
+        selectType: 'raw_material',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
+        planId: '',
+      },
+      planList: [],
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight: totalWeight.toFixed(2),
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    remoteMethod(query) {
+      listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
+        this.planList = res.rows
+      })
+    },
+    getList() {
+      this.loading = true
+      listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 11, // 酸轧工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+      }).then(res => {
+        const actions = res.rows
+        const coilIds = actions.map(item => item.coilId).join(',')
+        console.log(coilIds)
+        if (!coilIds) {
+          this.$message({
+            message: '暂无数据',
+            type: 'warning',
+          })
+          this.list = []
+          this.loading = false
+          return
+        }
+        listCoilWithIds({
+          ...this.queryParams,
+          coilIds: coilIds,
+        }).then(res => {
+          this.list = res.rows
+          this.loading = false
+        })
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+    this.remoteMethod('')
+  }
+}
+</script>
+
+<style scoped></style>

From 31e2e57b5ade538901a0b859301eeaeddbeae7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 13:40:02 +0800
Subject: [PATCH 04/29] =?UTF-8?q?style(wayBill):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除数量和单价列
- 统一调整字体大小为16px
- 优化表格列宽和输入框样式
- 调整标签和输入框的对齐方式
---
 .../views/wms/delivery/components/wayBill.vue | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 5a03faf0..b4f8809f 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -51,9 +51,9 @@
             <th>卷号</th>
             <th>规格</th>
             <th>材质</th>
-            <th>数量（件）</th>
+            <!-- <th>数量（件）</th> -->
             <th>重量（T）</th>
-            <th>单价</th>
+            <!-- <th>单价</th> -->
 
           </tr>
         </thead>
@@ -68,7 +68,7 @@
           </tr>
           <!-- 明细数据 -->
           <tr v-for="(item, index) in displayWaybillDetails" :key="index">
-            <td><input type="text" class="transparent-input" v-model="item.productName" /></td>
+            <td><input type="text" class="table-input transparent-input" v-model="item.productName" /></td>
             <td><input type="text" class="table-input transparent-input" v-model="item.edgeType" />
             </td>
             <td><input type="text" class="table-input transparent-input" v-model="item.packageType" />
@@ -83,11 +83,11 @@
             <td><input type="text" class="table-input transparent-input" v-model="item.specification" /></td>
             <td><input type="text" class="table-input transparent-input" v-model="item.material" />
             </td>
-            <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
-                placeholder="0" /></td>
+            <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
+                placeholder="0" /></td> -->
             <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
                 placeholder="0.00" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></td>
+            <!-- <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></td> -->
 
           </tr>
         </tbody>
@@ -104,7 +104,7 @@
 
       <div class="waybill-pickup-location">
         <!-- <div class="pickup-location-item inline"> -->
-        <span class="label">取货地点：</span>
+        <span style="font-size: 16px; font-weight: bold;">取货地点：</span>
         <input type="text" class="editable-input full-input transparent-input" v-model="localWaybill.pickupLocation" />
         <!-- </div> -->
       </div>
@@ -466,7 +466,8 @@ export default {
 .label {
   font-weight: bold;
   display: inline-block;
-  width: 80px;
+  width: 100px;
+  font-size: 16px;
   text-align: right;
   white-space: nowrap;
 }
@@ -480,7 +481,7 @@ export default {
   padding: 4px 8px;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  font-size: 14px;
+  font-size: 16px;
   font-family: SimSun, serif;
   outline: none;
   transition: all 0.2s;
@@ -492,7 +493,7 @@ export default {
 }
 
 .date-input {
-  width: 30px;
+  width: 40px;
   text-align: center;
   margin-right: 5px;
 }
@@ -525,6 +526,7 @@ export default {
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
+  font-size: 16px;
   padding: 0;
   overflow: hidden;
   white-space: nowrap;
@@ -533,7 +535,7 @@ export default {
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
-  width: 80px;
+  width: 60px;
   /* 品名 */
 }
 
@@ -581,27 +583,29 @@ export default {
 
 .waybill-table th:nth-child(9),
 .waybill-table td:nth-child(9) {
-  width: 40px;
+  width: 80px;
   /* 材质 */
 }
 
-.waybill-table th:nth-child(10),
+/* 数量（件） */
+/* .waybill-table th:nth-child(10),
 .waybill-table td:nth-child(10) {
   width: 60px;
-  /* 数量（件） */
-}
 
-.waybill-table th:nth-child(11),
-.waybill-table td:nth-child(11) {
+} */
+
+.waybill-table th:nth-child(10),
+.waybill-table td:nth-child(10) {
   width: 80px;
   /* 重量（kg） */
 }
 
-.waybill-table th:nth-child(12),
+  /* 单价 */
+/* .waybill-table th:nth-child(12),
 .waybill-table td:nth-child(12) {
   width: 40px;
-  /* 单价 */
-}
+
+} */
 
 
 .waybill-table th {
@@ -623,10 +627,10 @@ export default {
   border: none;
   outline: none;
   background: transparent;
-  font-family: inherit;
-  font-size: inherit;
+  /* font-family: inherit; */
+  font-size: 16px;
   line-height: 6mm;
-  text-align: inherit;
+  text-align: center;
   vertical-align: middle;
 }
 
@@ -695,7 +699,7 @@ export default {
 /* 备注样式 */
 .waybill-remarks {
   margin-bottom: 30px;
-  font-size: 14px;
+  font-size: 16px;
   line-height: 1.5;
   text-align: justify;
 }
@@ -721,9 +725,12 @@ export default {
   font-size: 16px;
 }
 
+
+
 .waybill-pickup-location label {
-  font-size: 14px;
-  margin-right: 10px;
+  font-size: 16px;
+  /* margin-right: 10px; */
+  text-align: left !important;
   width: 40px;
 }
 
@@ -742,7 +749,7 @@ export default {
 }
 
 .footer-item .label {
-  font-size: 14px;
+  font-size: 16px;
   margin-right: 10px;
   width: 40px;
 }

From 76466ad2e61522c28580f126138e9c929d9541a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 14:26:06 +0800
Subject: [PATCH 05/29] =?UTF-8?q?feat(warehousing):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8E=82=E5=AE=B6=E5=8D=B7=E5=8F=B7=E5=88=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/coil/do/warehousing.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 8034f03e..4f40c36a 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -180,6 +180,7 @@
                 <!-- <el-tag type="info" size="small">{{ scope.row.currentCoilNo }}</el-tag> -->
               </template>
             </el-table-column>
+            <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" />
 
             <el-table-column label="新增时间" align="center" prop="createTime" width="150" :show-overflow-tooltip="true">
               <template slot-scope="scope">

From 04326e9c127fe46461b4d9940d34b102ae2b9393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 15:02:22 +0800
Subject: [PATCH 06/29] =?UTF-8?q?style(wms):=20=E8=B0=83=E6=95=B4=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8=E7=9A=84=E5=AD=97=E4=BD=93=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E5=92=8C=E5=8A=A0=E7=B2=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/delivery/components/wayBill.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index b4f8809f..1fd725db 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -699,8 +699,10 @@ export default {
 /* 备注样式 */
 .waybill-remarks {
   margin-bottom: 30px;
-  font-size: 16px;
+  font-size: 15px;
   line-height: 1.5;
+  /* font-weight: 600; */
+  font-weight: bold;
   text-align: justify;
 }
 

From 1cf3e47fa2282721b49c0ddb287b728585f73005 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 2 Feb 2026 15:28:07 +0800
Subject: [PATCH 07/29] =?UTF-8?q?fix(wms):=20=E9=80=BB=E8=BE=91=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8F=90=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在物料卷查询条件中添加逻辑删除标志过滤
- 移除重复的逻辑删除条件以避免查询错误
- 确保只有未删除的记录被包含在查询结果中
---
 .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index cac5bbec..a6d487de 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -401,6 +401,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
         qw.eq(StringUtils.isNotBlank(bo.getCreateBy()), "mc.create_by", bo.getCreateBy());
         qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "mc.update_by", bo.getUpdateBy());
+        //逻辑删除
+        qw.eq("mc.del_flag", 0);
         // 切边要求
         qw.eq(StringUtils.isNotBlank(bo.getTrimmingRequirement()), "mc.trimming_requirement", bo.getTrimmingRequirement());
         // 打包状态
@@ -582,8 +584,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 //                "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " +
 //                "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
 //        }
-        //逻辑删除
-        qw.eq("mc.del_flag", 0);
         //把team字段作为筛选条件
         qw.eq(StringUtils.isNotBlank(bo.getTeam()), "mc.team", bo.getTeam());
         //根据开始时间和结束时间筛选修改时间

From cf6e6d39438d0f2e1ec916af00583beaf2fb1a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 15:59:03 +0800
Subject: [PATCH 08/29] =?UTF-8?q?feat(wayBill):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=92=8C=E5=8F=B8=E6=9C=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加"科伦普发货单"标题
- 在页脚添加司机输入字段
- 调整分页每页显示数量为8
- 优化字体粗细和颜色样式
---
 .../views/wms/delivery/components/wayBill.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 1fd725db..e18176d6 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -4,6 +4,8 @@
     <div class="waybill-container" ref="waybillRef">
       <div class="waybill-content">
       <!-- 头部信息 -->
+      <!-- 标题信息 -->
+      <div class="title">科伦普发货单</div>
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">收货单位：</span>
@@ -119,6 +121,10 @@
           <span class="label">发货：</span>
           <input type="text" class="editable-input signature-input transparent-input" />
         </div>
+        <div class="footer-item inline">
+          <span class="label">司机：</span>
+          <input type="text" class="editable-input signature-input transparent-input" />
+        </div>
         <div class="footer-item inline">
           <span class="label">磅房：</span>
           <input type="text" class="editable-input signature-input transparent-input" />
@@ -159,7 +165,7 @@ export default {
   data() {
     return {
       currentPage: 1,
-      perPage: 10,
+      perPage: 8,
       totalPages: 1,
       // 本地可编辑的发货单数据
       localWaybill: {
@@ -423,9 +429,18 @@ export default {
   box-shadow: none;
   font-family: SimSun, "Courier New", monospace;
   overflow: hidden;
+  color: #000 !important;
+  font-weight: 900 !important;
   box-sizing: border-box;
 }
 
+.title {
+  text-align: center;
+  font-size: 24px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
 .waybill-content {
   --paper-width-mm: 241;
   --content-width-mm: 241;
@@ -482,6 +497,7 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   font-size: 16px;
+  font-weight: bold;
   font-family: SimSun, serif;
   outline: none;
   transition: all 0.2s;
@@ -527,6 +543,7 @@ export default {
   text-align: center;
   vertical-align: middle;
   font-size: 16px;
+  font-weight: 900;
   padding: 0;
   overflow: hidden;
   white-space: nowrap;

From 81ff9b5944cbdca1b1ff8d063ee50ca31afe97f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 15:59:27 +0800
Subject: [PATCH 09/29] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E9=95=80?=
 =?UTF-8?q?=E9=94=8C=E9=92=A2=E5=8D=B7=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

实现镀锌钢卷报表功能，包括查询条件表单、统计信息展示和钢卷明细表格
支持按时间范围、钢卷号、库位、产品信息等多条件查询
提供数据导出功能
---
 klp-ui/src/views/wms/report/zinc_.vue | 229 ++++++++++++++++++++++++++
 1 file changed, 229 insertions(+)
 create mode 100644 klp-ui/src/views/wms/report/zinc_.vue

diff --git a/klp-ui/src/views/wms/report/zinc_.vue b/klp-ui/src/views/wms/report/zinc_.vue
new file mode 100644
index 00000000..6af79f67
--- /dev/null
+++ b/klp-ui/src/views/wms/report/zinc_.vue
@@ -0,0 +1,229 @@
+<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.byCreateTimeStart" 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.byCreateTimeEnd" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <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="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <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="endTime">
+          <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="endTime">
+          <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 label="收货计划" prop="planId">
+          <el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
+            :remote-method="remoteMethod">
+            <el-option v-for="item in planList" :key="item.planId" :label="item.planName" :value="item.planId" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" 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">
+        <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>
+  </div>
+</template>
+
+<script>
+import { listCoilWithIds } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+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 WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
+  },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  data() {
+    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
+    const addZero = (num) => num.toString().padStart(2, '0')
+
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)
+
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00`
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        // status: 1,
+        byCreateTimeStart: startTime,
+        byCreateTimeEnd: endTime,
+        selectType: 'raw_material',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
+        planId: '',
+      },
+      planList: [],
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight: totalWeight.toFixed(2),
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    remoteMethod(query) {
+      listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
+        this.planList = res.rows
+      })
+    },
+    getList() {
+      this.loading = true
+      listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 501, // 镀锌工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+      }).then(res => {
+        const actions = res.rows
+        const coilIds = actions.map(item => item.coilId).join(',')
+        console.log(coilIds)
+        if (!coilIds) {
+          this.$message({
+            message: '暂无数据',
+            type: 'warning',
+          })
+          this.list = []
+          this.loading = false
+          return
+        }
+        listCoilWithIds({
+          ...this.queryParams,
+          coilIds: coilIds,
+        }).then(res => {
+          this.list = res.rows
+          this.loading = false
+        })
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+    this.remoteMethod('')
+  }
+}
+</script>
+
+<style scoped></style>

From a6002710f2a0faff45376f05b8e6fc1f7c731a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 17:04:38 +0800
Subject: [PATCH 10/29] =?UTF-8?q?fix(crm):=20=E4=BF=AE=E6=94=B9=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=88=97=E6=A0=87=E7=AD=BE=E4=BB=8E"=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E6=97=A5"=E5=92=8C"=E5=BA=94=E6=94=B6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D"=E4=B8=BA"=E6=94=B6=E6=AC=BE=E6=97=A5=E6=9C=9F"?=
 =?UTF-8?q?=E5=92=8C"=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除日期标签显示逻辑，仅保留日期格式化显示
---
 klp-ui/src/views/crm/components/ReceiveTable.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/klp-ui/src/views/crm/components/ReceiveTable.vue b/klp-ui/src/views/crm/components/ReceiveTable.vue
index 77eb27a1..9a60ec38 100644
--- a/klp-ui/src/views/crm/components/ReceiveTable.vue
+++ b/klp-ui/src/views/crm/components/ReceiveTable.vue
@@ -70,14 +70,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="应收ID" align="center" prop="receivableId" v-if="false"/>
       <!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
-      <el-table-column label="到期日" align="center" prop="dueDate" width="180">
+      <el-table-column label="收款日期" align="center" prop="dueDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
-          <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
-          <el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag>
+          <!-- <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
+          <el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag> -->
         </template>
       </el-table-column>
-      <el-table-column label="应收金额" align="center" prop="amount" />
+      <el-table-column label="收款金额" align="center" prop="amount" />
       <!-- <el-table-column label="已收金额" align="center" prop="paidAmount" /> -->
       <!-- <el-table-column label="未收金额" align="center" prop="balanceAmount" /> -->
       <!-- <el-table-column label="状态" align="center" prop="status" /> -->
@@ -122,7 +122,7 @@
             v-model="form.dueDate"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择到期日">
+            placeholder="请选择收款日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="收款金额" prop="amount">

From ab78df57a9b8a9194053a6131b8b50427c462cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 17:23:21 +0800
Subject: [PATCH 11/29] =?UTF-8?q?refactor(wms):=20=E5=B0=86=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=8F=AF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91div=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将所有input元素替换为contenteditable的div元素
- 统一调整字体大小从16px到18px
- 调整表格行边框样式
- 修改每页显示数量从8改为7
---
 .../views/wms/delivery/components/wayBill.vue | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index e18176d6..a28a82a5 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -9,34 +9,34 @@
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">收货单位：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.consigneeUnit" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.consigneeUnit }}</div>
         </div>
         <div class="header-center">
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryYear" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryYear }}</div>
           <span class="label date-label">年</span>
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryMonth" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryMonth }}</div>
           <span class="label date-label">月</span>
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryDay" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryDay }}</div>
           <span class="label date-label">日</span>
         </div>
         <div class="header-right">
           <span class="label">发货单位：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.senderUnit" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.senderUnit }}</div>
         </div>
       </div>
 
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">负责人：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.principal" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principal }}</div>
         </div>
         <div class="header-right">
           <span class="label">电话：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.principalPhone" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principalPhone }}</div>
         </div>
         <div class="header-center">
           <span class="label">车牌：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.licensePlate" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.licensePlate }}</div>
         </div>
       </div>
 
@@ -70,21 +70,15 @@
           </tr>
           <!-- 明细数据 -->
           <tr v-for="(item, index) in displayWaybillDetails" :key="index">
-            <td><input type="text" class="table-input transparent-input" v-model="item.productName" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.edgeType" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.packageType" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.actualWarehouseName" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.settlementType" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.rawMaterialFactory" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.coilNumber" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.specification" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.material" />
-            </td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.productName }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.edgeType }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.packageType }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.actualWarehouseName }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.settlementType }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.rawMaterialFactory }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.coilNumber }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.specification }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.material }}</div></td>
             <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
                 placeholder="0" /></td> -->
             <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
@@ -106,7 +100,7 @@
 
       <div class="waybill-pickup-location">
         <!-- <div class="pickup-location-item inline"> -->
-        <span style="font-size: 16px; font-weight: bold;">取货地点：</span>
+        <span style="font-size: 18px; font-weight: bold;">取货地点：</span>
         <input type="text" class="editable-input full-input transparent-input" v-model="localWaybill.pickupLocation" />
         <!-- </div> -->
       </div>
@@ -115,19 +109,19 @@
       <div class="waybill-footer">
         <div class="footer-item inline">
           <span class="label">销售：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.salesman }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">发货：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.deliveryman }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">司机：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.driver }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">磅房：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.weightRoom }}</div>
         </div>
       </div>
       </div>
@@ -165,7 +159,7 @@ export default {
   data() {
     return {
       currentPage: 1,
-      perPage: 8,
+      perPage: 7,
       totalPages: 1,
       // 本地可编辑的发货单数据
       localWaybill: {
@@ -482,7 +476,7 @@ export default {
   font-weight: bold;
   display: inline-block;
   width: 100px;
-  font-size: 16px;
+  font-size: 18px;
   text-align: right;
   white-space: nowrap;
 }
@@ -496,11 +490,12 @@ export default {
   padding: 4px 8px;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: bold;
   font-family: SimSun, serif;
   outline: none;
   transition: all 0.2s;
+  line-height: 18px;
   border-bottom: 1px dashed #dcdfe6;
 }
 
@@ -542,13 +537,17 @@ export default {
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: 900;
   padding: 0;
   overflow: hidden;
   white-space: nowrap;
 }
 
+.waybill-table tr {
+  border: 1px solid #000;
+}
+
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
@@ -645,7 +644,7 @@ export default {
   outline: none;
   background: transparent;
   /* font-family: inherit; */
-  font-size: 16px;
+  font-size: 18px;
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
@@ -716,7 +715,7 @@ export default {
 /* 备注样式 */
 .waybill-remarks {
   margin-bottom: 30px;
-  font-size: 15px;
+  font-size: 18px;
   line-height: 1.5;
   /* font-weight: 600; */
   font-weight: bold;
@@ -733,21 +732,21 @@ export default {
   justify-content: space-between;
   align-items: center;
   margin-bottom: 20px;
-  font-size: 16px;
+  font-size: 18px;
 }
 
 .waybill-pickup-location {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 20px;
-  font-size: 16px;
+  margin-bottom: 10px;
+  font-size: 18px;
 }
 
 
 
 .waybill-pickup-location label {
-  font-size: 16px;
+  font-size: 18px;
   /* margin-right: 10px; */
   text-align: left !important;
   width: 40px;
@@ -768,7 +767,7 @@ export default {
 }
 
 .footer-item .label {
-  font-size: 16px;
+  font-size: 18px;
   margin-right: 10px;
   width: 40px;
 }

From ca76147ee6c256ba8796f25a477c6b84ccad1be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 2 Feb 2026 17:33:34 +0800
Subject: [PATCH 12/29] =?UTF-8?q?style(wms):=20=E8=B0=83=E6=95=B4=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=EF=BC=8C=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E8=BE=B9=E6=A1=86=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A1=8C=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除表格行的边框样式，并在表格底部添加空行以加粗最后一行线
优化表格行高设置，移除冗余的 !important 标记
---
 .../views/wms/delivery/components/wayBill.vue | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index a28a82a5..6afad7fc 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -84,7 +84,21 @@
             <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
                 placeholder="0.00" /></td>
             <!-- <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></td> -->
-
+          </tr>
+          <!-- 加粗最后一行的线 -->
+          <tr style="height: 0;">
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
+                placeholder="0" /></td> -->
+            <td style="height: 0;"></td>
           </tr>
         </tbody>
       </table>
@@ -544,10 +558,6 @@ export default {
   white-space: nowrap;
 }
 
-.waybill-table tr {
-  border: 1px solid #000;
-}
-
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
@@ -665,7 +675,7 @@ export default {
   padding: 0 !important;
   margin: 0 !important;
   line-height: 6mm !important;
-  height: 6mm !important;
+  height: 6mm;
   vertical-align: middle !important;
 }
 

From e90434674ea5f503c1cf3796a51285a1714bd0fd Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 09:19:53 +0800
Subject: [PATCH 13/29] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BB=BB=E5=8A=A1=E4=B8=8E=E9=92=A2=E5=8D=B7=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 创建了 WmsCheckTaskCoilRelation 实体类定义数据库映射关系
- 实现了 IWmsCheckTaskCoilRelationService 接口及其实现类
- 开发了 WmsCheckTaskCoilRelationController 控制器提供 REST API
- 设计了 WmsCheckTaskCoilRelationBo 业务对象和 Vo 视图对象
- 配置了 MyBatis Plus 映射文件和数据访问层
- 实现了增删改查分页导出等完整的 CRUD 功能
- 添加了数据验证和业务逻辑处理机制
---
 .../WmsCheckTaskCoilRelationController.java   |  99 ++++++++++++++++
 .../klp/domain/WmsCheckTaskCoilRelation.java  |  41 +++++++
 .../domain/bo/WmsCheckTaskCoilRelationBo.java |  36 ++++++
 .../domain/vo/WmsCheckTaskCoilRelationVo.java |  41 +++++++
 .../WmsCheckTaskCoilRelationMapper.java       |  15 +++
 .../IWmsCheckTaskCoilRelationService.java     |  49 ++++++++
 .../WmsCheckTaskCoilRelationServiceImpl.java  | 110 ++++++++++++++++++
 .../klp/WmsCheckTaskCoilRelationMapper.xml    |  19 +++
 8 files changed, 410 insertions(+)
 create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java
 create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java
 create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java
 create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java
 create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java
 create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java
 create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
 create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java b/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java
new file mode 100644
index 00000000..d0dd35f0
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java
@@ -0,0 +1,99 @@
+package com.klp.controller;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.klp.common.annotation.RepeatSubmit;
+import com.klp.common.annotation.Log;
+import com.klp.common.core.controller.BaseController;
+import com.klp.common.core.domain.PageQuery;
+import com.klp.common.core.domain.R;
+import com.klp.common.core.validate.AddGroup;
+import com.klp.common.core.validate.EditGroup;
+import com.klp.common.enums.BusinessType;
+import com.klp.common.utils.poi.ExcelUtil;
+import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
+import com.klp.service.IWmsCheckTaskCoilRelationService;
+import com.klp.common.core.page.TableDataInfo;
+
+/**
+ * 检查任务与钢卷关联
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wms/checkTaskCoilRelation")
+public class WmsCheckTaskCoilRelationController extends BaseController {
+
+    private final IWmsCheckTaskCoilRelationService iWmsCheckTaskCoilRelationService;
+
+    /**
+     * 查询检查任务与钢卷关联列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<WmsCheckTaskCoilRelationVo> list(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery) {
+        return iWmsCheckTaskCoilRelationService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出检查任务与钢卷关联列表
+     */
+    @Log(title = "检查任务与钢卷关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(WmsCheckTaskCoilRelationBo bo, HttpServletResponse response) {
+        List<WmsCheckTaskCoilRelationVo> list = iWmsCheckTaskCoilRelationService.queryList(bo);
+        ExcelUtil.exportExcel(list, "检查任务与钢卷关联", WmsCheckTaskCoilRelationVo.class, response);
+    }
+
+    /**
+     * 获取检查任务与钢卷关联详细信息
+     *
+     * @param relationId 主键
+     */
+    @GetMapping("/{relationId}")
+    public R<WmsCheckTaskCoilRelationVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long relationId) {
+        return R.ok(iWmsCheckTaskCoilRelationService.queryById(relationId));
+    }
+
+    /**
+     * 新增检查任务与钢卷关联
+     */
+    @Log(title = "检查任务与钢卷关联", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCheckTaskCoilRelationBo bo) {
+        return toAjax(iWmsCheckTaskCoilRelationService.insertByBo(bo));
+    }
+
+    /**
+     * 修改检查任务与钢卷关联
+     */
+    @Log(title = "检查任务与钢卷关联", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCheckTaskCoilRelationBo bo) {
+        return toAjax(iWmsCheckTaskCoilRelationService.updateByBo(bo));
+    }
+
+    /**
+     * 删除检查任务与钢卷关联
+     *
+     * @param relationIds 主键串
+     */
+    @Log(title = "检查任务与钢卷关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{relationIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] relationIds) {
+        return toAjax(iWmsCheckTaskCoilRelationService.deleteWithValidByIds(Arrays.asList(relationIds), true));
+    }
+}
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java b/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java
new file mode 100644
index 00000000..cc93731e
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java
@@ -0,0 +1,41 @@
+package com.klp.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.klp.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 检查任务与钢卷关联对象 wms_check_task_coil_relation
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("wms_check_task_coil_relation")
+public class WmsCheckTaskCoilRelation extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 关联表主键
+     */
+    @TableId(value = "relation_id")
+    private Long relationId;
+    /**
+     * 检查任务ID，关联wms_check_task.task_id
+     */
+    private Long taskId;
+    /**
+     * 钢卷ID
+     */
+    private String coilId;
+    /**
+     * 逻辑删除标识：0=正常，1=已删
+     */
+    @TableLogic
+    private Integer delFlag;
+
+}
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java
new file mode 100644
index 00000000..b3c9cc00
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java
@@ -0,0 +1,36 @@
+package com.klp.domain.bo;
+
+import com.klp.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+
+/**
+ * 检查任务与钢卷关联业务对象 wms_check_task_coil_relation
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WmsCheckTaskCoilRelationBo extends BaseEntity {
+
+    /**
+     * 关联表主键
+     */
+    private Long relationId;
+
+    /**
+     * 检查任务ID，关联wms_check_task.task_id
+     */
+    private Long taskId;
+
+    /**
+     * 钢卷ID
+     */
+    private String coilId;
+
+
+}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java
new file mode 100644
index 00000000..fb29df8d
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java
@@ -0,0 +1,41 @@
+package com.klp.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.klp.common.annotation.ExcelDictFormat;
+import com.klp.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 检查任务与钢卷关联视图对象 wms_check_task_coil_relation
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class WmsCheckTaskCoilRelationVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 关联表主键
+     */
+    @ExcelProperty(value = "关联表主键")
+    private Long relationId;
+
+    /**
+     * 检查任务ID，关联wms_check_task.task_id
+     */
+    @ExcelProperty(value = "检查任务ID，关联wms_check_task.task_id")
+    private Long taskId;
+
+    /**
+     * 钢卷ID
+     */
+    @ExcelProperty(value = "钢卷ID")
+    private String coilId;
+
+
+}
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java
new file mode 100644
index 00000000..1af8f5d6
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java
@@ -0,0 +1,15 @@
+package com.klp.mapper;
+
+import com.klp.domain.WmsCheckTaskCoilRelation;
+import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 检查任务与钢卷关联Mapper接口
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+public interface WmsCheckTaskCoilRelationMapper extends BaseMapperPlus<WmsCheckTaskCoilRelationMapper, WmsCheckTaskCoilRelation, WmsCheckTaskCoilRelationVo> {
+
+}
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java b/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java
new file mode 100644
index 00000000..f1c42dae
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java
@@ -0,0 +1,49 @@
+package com.klp.service;
+
+import com.klp.domain.WmsCheckTaskCoilRelation;
+import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
+import com.klp.common.core.page.TableDataInfo;
+import com.klp.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 检查任务与钢卷关联Service接口
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+public interface IWmsCheckTaskCoilRelationService {
+
+    /**
+     * 查询检查任务与钢卷关联
+     */
+    WmsCheckTaskCoilRelationVo queryById(Long relationId);
+
+    /**
+     * 查询检查任务与钢卷关联列表
+     */
+    TableDataInfo<WmsCheckTaskCoilRelationVo> queryPageList(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询检查任务与钢卷关联列表
+     */
+    List<WmsCheckTaskCoilRelationVo> queryList(WmsCheckTaskCoilRelationBo bo);
+
+    /**
+     * 新增检查任务与钢卷关联
+     */
+    Boolean insertByBo(WmsCheckTaskCoilRelationBo bo);
+
+    /**
+     * 修改检查任务与钢卷关联
+     */
+    Boolean updateByBo(WmsCheckTaskCoilRelationBo bo);
+
+    /**
+     * 校验并批量删除检查任务与钢卷关联信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
new file mode 100644
index 00000000..2ffe8e24
--- /dev/null
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
@@ -0,0 +1,110 @@
+package com.klp.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.klp.common.core.page.TableDataInfo;
+import com.klp.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.klp.common.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
+import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.domain.WmsCheckTaskCoilRelation;
+import com.klp.mapper.WmsCheckTaskCoilRelationMapper;
+import com.klp.service.IWmsCheckTaskCoilRelationService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 检查任务与钢卷关联Service业务层处理
+ *
+ * @author klp
+ * @date 2026-02-03
+ */
+@RequiredArgsConstructor
+@Service
+public class WmsCheckTaskCoilRelationServiceImpl implements IWmsCheckTaskCoilRelationService {
+
+    private final WmsCheckTaskCoilRelationMapper baseMapper;
+
+    /**
+     * 查询检查任务与钢卷关联
+     */
+    @Override
+    public WmsCheckTaskCoilRelationVo queryById(Long relationId){
+        return baseMapper.selectVoById(relationId);
+    }
+
+    /**
+     * 查询检查任务与钢卷关联列表
+     */
+    @Override
+    public TableDataInfo<WmsCheckTaskCoilRelationVo> queryPageList(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WmsCheckTaskCoilRelation> lqw = buildQueryWrapper(bo);
+        Page<WmsCheckTaskCoilRelationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询检查任务与钢卷关联列表
+     */
+    @Override
+    public List<WmsCheckTaskCoilRelationVo> queryList(WmsCheckTaskCoilRelationBo bo) {
+        LambdaQueryWrapper<WmsCheckTaskCoilRelation> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<WmsCheckTaskCoilRelation> buildQueryWrapper(WmsCheckTaskCoilRelationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<WmsCheckTaskCoilRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTaskId() != null, WmsCheckTaskCoilRelation::getTaskId, bo.getTaskId());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoilId()), WmsCheckTaskCoilRelation::getCoilId, bo.getCoilId());
+        return lqw;
+    }
+
+    /**
+     * 新增检查任务与钢卷关联
+     */
+    @Override
+    public Boolean insertByBo(WmsCheckTaskCoilRelationBo bo) {
+        WmsCheckTaskCoilRelation add = BeanUtil.toBean(bo, WmsCheckTaskCoilRelation.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setRelationId(add.getRelationId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改检查任务与钢卷关联
+     */
+    @Override
+    public Boolean updateByBo(WmsCheckTaskCoilRelationBo bo) {
+        WmsCheckTaskCoilRelation update = BeanUtil.toBean(bo, WmsCheckTaskCoilRelation.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(WmsCheckTaskCoilRelation entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除检查任务与钢卷关联
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml
new file mode 100644
index 00000000..64d62db3
--- /dev/null
+++ b/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.klp.mapper.WmsCheckTaskCoilRelationMapper">
+
+    <resultMap type="com.klp.domain.WmsCheckTaskCoilRelation" id="WmsCheckTaskCoilRelationResult">
+        <result property="relationId" column="relation_id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="coilId" column="coil_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>

From 7943318f26ad16d3c635c7be6e836d93a53b7381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 3 Feb 2026 09:50:07 +0800
Subject: [PATCH 14/29] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增订单打印功能，支持生成PDF格式的结算单
- 重构订单明细表格，增加原料规格、成品规格等字段
- 优化订单基本信息展示，添加交货日期字段
- 修改客户信息展示，使用公司名称替代客户ID
---
 .../src/views/crm/components/OrderDetail.vue  | 154 ++++++--
 .../src/views/crm/components/OrderPrinter.vue | 365 ++++++++++++++++++
 klp-ui/src/views/crm/order/index.vue          |   2 +
 klp-ui/src/views/crm/preOrder/index.vue       |   2 +-
 4 files changed, 492 insertions(+), 31 deletions(-)
 create mode 100644 klp-ui/src/views/crm/components/OrderPrinter.vue

diff --git a/klp-ui/src/views/crm/components/OrderDetail.vue b/klp-ui/src/views/crm/components/OrderDetail.vue
index de8d674a..47e0a398 100644
--- a/klp-ui/src/views/crm/components/OrderDetail.vue
+++ b/klp-ui/src/views/crm/components/OrderDetail.vue
@@ -2,22 +2,35 @@
   <div>
     <el-empty v-if="!orderId || orderId == ''" description="未选中订单" />
 
-    <!-- <el-empty v-else-if="!orderItemList.length" description="暂无订单明细" /> -->
-
     <div v-else>
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-if="editable">新增</el-button>
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+            v-if="editable">新增</el-button>
+          <el-button type="primary" plain icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button>
           <el-button type="primary" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
         </el-col>
       </el-row>
 
       <el-table v-loading="loading" :data="orderItemList">
         <el-table-column label="产品类型" align="center" prop="productType" />
-        <el-table-column label="规格要求" align="center" prop="specRequire" />
-        <el-table-column label="产品数量" align="center" prop="productNum" />
-        <el-table-column label="特殊要求" align="center" prop="specialRequire" />
-        <el-table-column label="明细金额" align="center" prop="itemAmount" />
+        <el-table-column label="原料规格" align="center" prop="rawMaterialSpec" />
+        <el-table-column label="成品规格" align="center" prop="finishedProductSpec" />
+        <el-table-column label="材质" align="center" prop="material" />
+        <el-table-column label="等级" align="center" prop="grade" />
+        <el-table-column label="重量" align="center" prop="weight" />
+        <el-table-column label="合同定价" align="center" prop="contractPrice" />
+        <el-table-column label="金额（元）" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.weight * scope.row.contractPrice }}
+          </template>
+        </el-table-column>
+        <el-table-column label="定制人" align="center" prop="customizer" />
+        <el-table-column label="发货人" align="center" prop="shipper" />
+        <el-table-column label="排产批次" align="center" prop="productionBatch" />
+        <!-- <el-table-column label="产品数量" align="center" prop="productNum" /> -->
+        <!-- <el-table-column label="特殊要求" align="center" prop="specialRequire" /> -->
+        <!-- <el-table-column label="明细金额" align="center" prop="itemAmount" /> -->
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="editable">
           <template slot-scope="scope">
@@ -37,19 +50,40 @@
         <el-form-item label="产品类型" prop="productType">
           <el-input v-model="form.productType" placeholder="请输入产品类型" />
         </el-form-item>
-        <el-form-item label="产品数量" prop="productNum">
+        <!-- <el-form-item label="产品数量" prop="productNum">
           <el-input v-model="form.productNum" placeholder="请输入产品数量" />
-        </el-form-item>
-         <el-form-item label="明细金额" prop="itemAmount">
+        </el-form-item> -->
+        <!-- <el-form-item label="明细金额" prop="itemAmount">
           <el-input size="mini" v-model="form.itemAmount" placeholder="请输入明细金额" />
+        </el-form-item> -->
+        <el-form-item label="原料规格" prop="rawMaterialSpec">
+          <el-input v-model="form.rawMaterialSpec" placeholder="请输入原料规格" />
         </el-form-item>
-         <el-form-item label="规格要求" prop="specRequire">
-          <el-input v-model="form.specRequire" placeholder="请输入规格要求" />
+        <el-form-item label="成品规格" prop="finishedProductSpec">
+          <el-input v-model="form.finishedProductSpec" placeholder="请输入成品规格" />
         </el-form-item>
-        <el-form-item label="特殊要求" prop="specialRequire">
-          <el-input v-model="form.specialRequire" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="材质" prop="material">
+          <el-input v-model="form.material" placeholder="请输入材质" />
         </el-form-item>
-       
+        <el-form-item label="等级" prop="grade">
+          <el-input v-model="form.grade" placeholder="请输入等级" />
+        </el-form-item>
+        <el-form-item label="重量" prop="weight">
+          <el-input v-model="form.weight" placeholder="请输入重量" />
+        </el-form-item>
+        <el-form-item label="合同定价" prop="contractPrice">
+          <el-input v-model="form.contractPrice" placeholder="请输入合同定价" />
+        </el-form-item>
+        <el-form-item label="定制人" prop="customizer">
+          <el-input v-model="form.customizer" placeholder="请输入定制人" />
+        </el-form-item>
+        <el-form-item label="发货人" prop="shipper">
+          <el-input v-model="form.shipper" placeholder="请输入发货人" />
+        </el-form-item>
+        <el-form-item label="排产批次" prop="productionBatch">
+          <el-input v-model="form.productionBatch" placeholder="请输入排产批次" />
+        </el-form-item>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -59,12 +93,22 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="打印结算单" :loading="orderLoading" :visible.sync="orderOpen" width="1000px" append-to-body>
+      <OrderPrinter ref="printer" :orderContent="orderContent" :orderList="orderItemList" />
+
+      <el-button slot="footer">
+        <el-button :loading="buttonLoading" @click="printOrder">打印</el-button>
+      </el-button>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listOrderItem, getOrderItem, delOrderItem, addOrderItem, updateOrderItem } from "@/api/crm/orderItem";
 import { actions, ORDER_ACTIONS } from "../js/actions";
+import { getOrder } from "@/api/crm/order";
+import OrderPrinter from "./OrderPrinter.vue";
 
 export default {
   name: "OrderItem",
@@ -77,6 +121,9 @@ export default {
       default: true
     },
   },
+  components: {
+    OrderPrinter
+  },
   data() {
     return {
       // 按钮loading
@@ -120,26 +167,51 @@ export default {
         productNum: [
           { required: true, message: "请输入产品数量", trigger: "blur" }
         ],
-        itemAmount: [
-          { required: true, message: "请输入明细金额", trigger: "blur" },
-          // 必须是数字，最多两位小数，使用自定义的校验规则
-          { validator: (rule, value, callback) => {
-            if (!/^\d+(\.\d{1,2})?$/.test(value)) {
-              callback(new Error("请输入最多两位小数的数字"));
-            } else {
-              callback();
-            }
-          }, trigger: "input" }
+        rawMaterialSpec: [
+          { required: true, message: "请输入原料规格", trigger: "blur" }
         ],
-      }
+        finishedProductSpec: [
+          { required: true, message: "请输入成品规格", trigger: "blur" }
+        ],
+        // 重量和合同定价不能为空，且必须是数字，最多两位小数
+        weight: [
+          { required: true, message: "请输入重量", trigger: "blur" },
+          // 必须是数字，最多两位小数，使用自定义的校验规则
+          {
+            validator: (rule, value, callback) => {
+              if (!/^\d+(\.\d{1,2,3})?$/.test(value)) {
+                callback(new Error("请输入最多三位小数的数字"));
+              } else {
+                callback();
+              }
+            }, trigger: "change"
+          }
+        ],
+        contractPrice: [
+          { required: true, message: "请输入合同定价", trigger: "blur" },
+          // 必须是数字，最多两位小数，使用自定义的校验规则
+          {
+            validator: (rule, value, callback) => {
+              if (!/^\d+(\.\d{1,2,3})?$/.test(value)) {
+                callback(new Error("请输入最多三位小数的数字"));
+              } else {
+                callback();
+              }
+            }, trigger: "change"
+          }
+        ],
+      },
+      orderContent: {},
+      orderLoading: false,
+      orderOpen: false,
     };
   },
   watch: {
     orderId: {
       handler(newVal, oldVal) {
         // if (newVal !== oldVal) {
-          this.queryParams.orderId = newVal;
-          this.getList();
+        this.queryParams.orderId = newVal;
+        this.getList();
         // }
       },
       immediate: true
@@ -147,7 +219,7 @@ export default {
   },
   methods: {
     /** 查询正式订单明细列表 */
-    getList() {  
+    getList() {
       if (!this.queryParams.orderId) {
         this.orderItemList = [];
         this.total = 0;
@@ -171,7 +243,15 @@ export default {
         itemId: undefined,
         orderId: this.orderId,
         productType: undefined,
-        specRequire: undefined,
+        rawMaterialSpec: undefined,
+        finishedProductSpec: undefined,
+        material: undefined,
+        grade: undefined,
+        weight: undefined,
+        contractPrice: undefined,
+        customizer: undefined,
+        shipper: undefined,
+        productionBatch: undefined,
         productNum: undefined,
         specialRequire: undefined,
         itemAmount: undefined,
@@ -189,6 +269,20 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    /** 打印按钮操作 */
+    handlePrint() {
+      // 正在准备打印内容
+      this.orderLoading = true;
+      this.orderOpen = true;
+      getOrder(this.orderId).then(response => {
+        this.orderContent = response.data;
+        this.orderLoading = false;
+      });
+    },
+    printOrder() {
+      this.$refs["printer"].print();
+      this.orderOpen = false;
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
diff --git a/klp-ui/src/views/crm/components/OrderPrinter.vue b/klp-ui/src/views/crm/components/OrderPrinter.vue
new file mode 100644
index 00000000..8b19015a
--- /dev/null
+++ b/klp-ui/src/views/crm/components/OrderPrinter.vue
@@ -0,0 +1,365 @@
+<template>
+  <div ref="printContainer" class="printContainer">
+    <div class="waybill-content">
+      <!-- 单据标题 -->
+      <div class="title">销售合同 - 业务结算单</div>
+
+      <!-- 订单主信息头部 -->
+      <div class="waybill-header">
+        <div class="header-left">
+          <div class="header-item"><span class="label-sm">订单编号：</span>{{ orderContent.orderCode || '' }}</div>
+          <div class="header-item"><span class="label-sm">业务员：</span>{{ orderContent.salesman || '' }}</div>
+          <div class="header-item"><span class="label-sm">制单人：</span>{{ orderContent.createBy || '' }}</div>
+        </div>
+        <div class="header-right">
+          <!-- <div class="header-item"><span class="label-sm">客户公司：</span>{{ orderContent.companyName || '' }}</div> -->
+          <!-- <div class="header-item"><span class="label-sm">联系人：</span>{{ orderContent.contactName || '' }}</div> -->
+          <div class="header-item"><span class="label-sm">交货日期：</span>{{ orderContent.deliveryDate ? orderContent.deliveryDate.split(' ')[0] : '' }}</div>
+          <div class="header-item"><span class="label-sm">订单金额：</span>¥{{ orderContent.orderAmount || '0.00' }}</div>
+          <div class="header-item"><span class="label-sm">制单时间：</span>{{ orderContent.createTime || '' }}</div>
+        </div>
+      </div>
+
+      <!-- 订单明细表格 -->
+      <table class="waybill-table">
+        <thead>
+          <tr>
+            <th>产品类型</th>
+            <th>原料规格</th>
+            <th>成品规格</th>
+            <th>材质</th>
+            <th>等级</th>
+            <th>重量(吨)</th>
+            <th>合同单价(元)</th>
+            <th>金额(元)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, index) in orderList" :key="item.itemId || index">
+            <td>{{ item.productType || '' }}</td>
+            <td>{{ item.rawMaterialSpec || '' }}</td>
+            <td>{{ item.finishedProductSpec || '' }}</td>
+            <td>{{ item.material || '' }}</td>
+            <td>{{ item.level || '' || '' }}</td>
+            <td>{{ item.weight || '0.000' }}</td>
+            <td>¥{{ item.contractPrice || '0.00' }}</td>
+            <td>¥{{ item.amount || '0.00' }}</td>
+          </tr>
+          <!-- 无明细数据占位 -->
+          <tr v-if="orderList.length === 0">
+            <td colspan="6" class="no-data">暂无订单明细</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <!-- 合计区域 -->
+      <div class="total-area">
+        <div class="total-item">
+          <span class="total-label">明细总重量：</span>
+          <span>{{ calcTotalWeight() }} kg</span>
+        </div>
+        <div class="total-item">
+          <span class="total-label">明细总金额：</span>
+          <span>¥{{ calcTotalAmount() }}</span>
+        </div>
+        <div class="total-item">
+          <span class="total-label">订单未付金额：</span>
+          <span>¥{{ orderContent.unpaidAmount || '0.00' }}</span>
+        </div>
+      </div>
+
+      <!-- 底部备注/状态信息 -->
+      <div class="footer-info">
+        <div class="info-item"><span class="label-sm">更新人：</span>{{ orderContent.updateBy || '' }}</div>
+        <div class="info-item"><span class="label-sm">更新时间：</span>{{ orderContent.updateTime || '' }}</div>
+        <div class="info-item"><span class="label-sm">订单状态：</span>{{ getOrderStatusText(orderContent.orderStatus) }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import html2canvas from 'html2canvas'
+import { PDFDocument } from 'pdf-lib';
+
+export default {
+  name: "OrderPrinter",
+  props: {
+    // 订单主数据
+    orderContent: {
+      type: Object,
+      default: () => ({})
+    },
+    // 订单明细列表
+    orderList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    // 计算明细总重量（保留3位小数）
+    calcTotalWeight() {
+      if (!this.orderList.length) return '0.000';
+      const total = this.orderList.reduce((sum, item) => {
+        const weight = Number(item.weight) || 0;
+        return sum + weight;
+      }, 0);
+      return total.toFixed(3);
+    },
+    // 计算明细总金额（重量×单价，保留2位小数）
+    calcTotalAmount() {
+      if (!this.orderList.length) return '0.00';
+      const total = this.orderList.reduce((sum, item) => {
+        const weight = Number(item.weight) || 0;
+        const price = Number(item.contractPrice) || 0;
+        return sum + (weight * price);
+      }, 0);
+      return total.toFixed(2);
+    },
+    // 订单状态转文本（0-未处理/1-已审核/2-已发货/3-已完成，可根据业务扩展）
+    getOrderStatusText(status) {
+      const statusMap = {
+        0: '未处理',
+        1: '已审核',
+        2: '已发货',
+        3: '已完成'
+      };
+      return statusMap[status] || '未知状态';
+    },
+    // 打印订单（生成PDF后打印/下载）
+    async print() {
+      const node = this.$refs.printContainer;
+      // 241mm热敏纸规格（宽×高）
+      const paperWidthMm = 241;
+      const paperHeightMm = 140;
+      // 打印机安全边距（避免内容被裁剪）
+      const safeRightMarginMm = 45;
+      const safeLeftPaddingMm = 6;
+      const safeTopShiftMm = 15;
+      const safeContentWidthMm = paperWidthMm - safeRightMarginMm - safeLeftPaddingMm;
+
+      // 单位转换：mm → px/pt（96DPI/72DPI）
+      const mmToPx = (mm) => (mm * 96) / 25.4;
+      const mmToPt = 72 / 25.4;
+      const pageWidthPt = paperWidthMm * mmToPt;
+      const pageHeightPt = paperHeightMm * mmToPt;
+      const pageWidthPx = Math.round(mmToPx(paperWidthMm));
+      const pageHeightPx = Math.round(mmToPx(paperHeightMm));
+
+      // 创建PDF文档
+      const pdfDoc = await PDFDocument.create();
+      // 保存原样式，避免修改影响页面展示
+      const originalStyle = { width: node.style.width, overflow: node.style.overflow };
+      const contentEl = node.querySelector('.waybill-content');
+      const originalContentCssText = contentEl ? contentEl.style.cssText : '';
+
+      // 强制容器完整展示内容，方便html2canvas截图
+      node.style.width = 'auto';
+      node.style.overflow = 'visible';
+      // 设置内容缩放和边距，适配打印机不可打印区
+      if (contentEl) {
+        contentEl.style.setProperty('--content-width-mm', String(safeContentWidthMm));
+        contentEl.style.setProperty('--offset-x-mm', String(safeLeftPaddingMm));
+        contentEl.style.setProperty('--offset-y-mm', String(safeTopShiftMm));
+      }
+
+      try {
+        await this.$nextTick(); // 等待DOM更新
+        // 生成截图（3倍缩放保证打印清晰度）
+        const canvas = await html2canvas(node, {
+          backgroundColor: '#ffffff',
+          scale: 3,
+          useCORS: true,
+          willReadFrequently: true,
+          width: pageWidthPx,
+          height: pageHeightPx,
+          windowWidth: pageWidthPx,
+          windowHeight: pageHeightPx,
+          scrollX: 0,
+          scrollY: 0
+        });
+        // 将截图嵌入PDF
+        const png = canvas.toDataURL('image/png');
+        const imgPng = await pdfDoc.embedPng(png);
+        const pdfPage = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
+        pdfPage.drawImage(imgPng, {
+          x: 0,
+          y: 0,
+          width: pageWidthPt,
+          height: pageHeightPt
+        });
+      } finally {
+        // 恢复原样式
+        node.style.width = originalStyle.width;
+        node.style.overflow = originalStyle.overflow;
+        if (contentEl) contentEl.style.cssText = originalContentCssText;
+      }
+
+      // 生成PDF并处理打印/下载
+      const pdfBytes = await pdfDoc.save();
+      const blob = new Blob([pdfBytes], { type: 'application/pdf' });
+      const url = URL.createObjectURL(blob);
+      // 优先新窗口打开打印
+      const win = window.open(url, '_blank');
+      if (!win) {
+        // 新窗口被拦截则触发下载
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = `订单打印单_${this.orderContent.orderCode || this.orderContent.orderId || new Date().getTime()}.pdf`;
+        document.body.appendChild(a);
+        a.click();
+        document.body.removeChild(a);
+      }
+      // 释放URL对象
+      setTimeout(() => URL.revokeObjectURL(url), 1000);
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 主容器：适配241mm热敏纸 */
+.printContainer {
+  width: 241mm;
+  height: 140mm;
+  margin: 0 auto;
+  background: #fff;
+  font-family: SimSun, "宋体", monospace;
+  color: #000;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+/* 单据标题 */
+.title {
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 3mm;
+  padding-bottom: 1mm;
+  border-bottom: 1px solid #000;
+}
+
+/* 内容容器：适配打印机边距，自动缩放 */
+.waybill-content {
+  --paper-width-mm: 241;
+  --content-width-mm: 241;
+  --offset-x-mm: 0;
+  --offset-y-mm: 0;
+  --scale: calc(var(--content-width-mm) / var(--paper-width-mm));
+  width: calc(var(--paper-width-mm) * 1mm);
+  transform-origin: top left;
+  transform: translate(calc(var(--offset-x-mm) * 1mm), calc(var(--offset-y-mm) * 1mm)) scale(var(--scale));
+}
+
+/* 订单头部信息 */
+.waybill-header {
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+  margin-bottom: 3mm;
+  line-height: 4mm;
+}
+.header-left, .header-right {
+  display: flex;
+  flex-direction: column;
+}
+.header-item {
+  display: flex;
+  white-space: nowrap;
+}
+.label-sm {
+  font-weight: bold;
+  margin-right: 2mm;
+  min-width: 60px;
+}
+
+/* 明细表格：边框合并，固定布局 */
+.waybill-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 3mm;
+  font-size: 11px;
+  table-layout: fixed;
+}
+.waybill-table th, .waybill-table td {
+  border: 0.5px solid #000;
+  padding: 0.5mm;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 3.5mm;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.waybill-table th {
+  background-color: #f5f5f5;
+  font-weight: bold;
+}
+.no-data {
+  height: 20mm;
+  line-height: 20mm;
+  color: #999;
+}
+
+/* 合计区域 */
+.total-area {
+  display: flex;
+  justify-content: flex-end;
+  gap: 5mm;
+  font-size: 12px;
+  font-weight: bold;
+  margin-bottom: 3mm;
+  padding-right: 2mm;
+  line-height: 4mm;
+}
+.total-label {
+  margin-right: 1mm;
+}
+
+/* 底部信息 */
+.footer-info {
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+  line-height: 4mm;
+  padding-top: 1mm;
+  border-top: 1px dashed #ccc;
+}
+.info-item {
+  display: flex;
+  white-space: nowrap;
+}
+
+/* 打印样式适配：打印机不可打印区处理 */
+@page {
+  size: 241mm 140mm;
+  margin: 0;
+}
+@media print {
+  html, body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+  }
+  .printContainer {
+    width: 241mm;
+    height: 140mm;
+    margin: 0;
+    padding: 0;
+    box-shadow: none;
+  }
+  .waybill-content {
+    --content-width-mm: 196; /* 右侧预留45mm不可打印区 */
+    --offset-x-mm: 6; /* 左侧内边距6mm */
+    --offset-y-mm: 15; /* 顶部偏移15mm */
+  }
+  /* 打印时允许表格内容换行，避免裁剪 */
+  .waybill-table th, .waybill-table td {
+    white-space: normal !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+    height: auto !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue
index 71b71791..46a66d73 100644
--- a/klp-ui/src/views/crm/order/index.vue
+++ b/klp-ui/src/views/crm/order/index.vue
@@ -49,6 +49,8 @@
               <el-descriptions :column="2" :border="true" title="订单基本信息" style="margin-bottom: 20px;">
                 <el-descriptions-item label="订单编号">{{ form.orderCode }}</el-descriptions-item>
                 <el-descriptions-item label="销售员">{{ form.salesman }}</el-descriptions-item>
+                <el-descriptions-item label="交货日期">{{ form.deliveryDate }}</el-descriptions-item>
+
                 <el-descriptions-item label="客户公司">{{ form.companyName }}</el-descriptions-item>
                 <el-descriptions-item label="联系人">{{ form.contactPerson }}</el-descriptions-item>
                 <el-descriptions-item label="联系电话">{{ form.contactWay }}</el-descriptions-item>
diff --git a/klp-ui/src/views/crm/preOrder/index.vue b/klp-ui/src/views/crm/preOrder/index.vue
index e2859ba1..dcbc00a0 100644
--- a/klp-ui/src/views/crm/preOrder/index.vue
+++ b/klp-ui/src/views/crm/preOrder/index.vue
@@ -68,7 +68,7 @@
     <el-table v-loading="loading" :data="orderList" height="400px" highlight-current-row @row-click="handleRowClick">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单编号" align="center" prop="orderCode" />
-      <el-table-column label="客户" align="center" prop="customerId" />
+      <el-table-column label="客户" align="center" prop="companyName" />
       <el-table-column label="总金额" align="center" prop="orderAmount" />
       <el-table-column label="销售员" align="center" prop="salesman" />
       <el-table-column label="交货日期" align="center" prop="deliveryDate" width="180">

From 8d8ecfde550e7e75bbba6add55a0a1b98292c30f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 10:04:47 +0800
Subject: [PATCH 15/29] =?UTF-8?q?feat(mes):=20=E5=AE=9E=E7=8E=B0=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=97=B6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E9=92=A2=E5=8D=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将WmsCheckTaskCoilRelation相关实体、服务、控制器从WMS模块迁移到MES模块
- 更新包路径从com.klp到com.klp.mes.qc下对应层级
- 在WmsCheckTaskBo中添加coilIds字段用于绑定钢卷ID
- 在WmsCheckTaskVo中添加coilList字段显示关联钢卷信息
- 实现检查任务查询时关联钢卷信息的加载功能
- 添加批量删除检查任务时同步删除钢卷关联记录的逻辑
- 在pom.xml中添加klp-wms模块依赖以便MES模块访问WMS数据
- 新增deleteByTaskIds方法支持按任务ID批量删除钢卷关联记录
---
 klp-mes/pom.xml                               |   4 +
 .../WmsCheckTaskCoilRelationController.java   |   8 +-
 .../qc}/domain/WmsCheckTaskCoilRelation.java  |   2 +-
 .../klp/mes/qc/domain/bo/WmsCheckTaskBo.java  |   2 +
 .../domain/bo/WmsCheckTaskCoilRelationBo.java |   3 +-
 .../domain/vo/WmsCheckTaskCoilRelationVo.java |   4 +-
 .../klp/mes/qc/domain/vo/WmsCheckTaskVo.java  |   6 +-
 .../WmsCheckTaskCoilRelationMapper.java       |   8 +-
 .../IWmsCheckTaskCoilRelationService.java     |   7 +-
 .../WmsCheckTaskCoilRelationServiceImpl.java  |  13 +-
 .../service/impl/WmsCheckTaskServiceImpl.java | 112 +++++++++++++++++-
 .../qc}/WmsCheckTaskCoilRelationMapper.xml    |  11 +-
 12 files changed, 152 insertions(+), 28 deletions(-)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/controller/WmsCheckTaskCoilRelationController.java (93%)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/domain/WmsCheckTaskCoilRelation.java (96%)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/domain/bo/WmsCheckTaskCoilRelationBo.java (89%)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/domain/vo/WmsCheckTaskCoilRelationVo.java (85%)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/mapper/WmsCheckTaskCoilRelationMapper.java (57%)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/service/IWmsCheckTaskCoilRelationService.java (86%)
 rename {klp-wms/src/main/java/com/klp => klp-mes/src/main/java/com/klp/mes/qc}/service/impl/WmsCheckTaskCoilRelationServiceImpl.java (89%)
 rename {klp-wms/src/main/resources/mapper/klp => klp-mes/src/main/resources/mapper/qc}/WmsCheckTaskCoilRelationMapper.xml (57%)

diff --git a/klp-mes/pom.xml b/klp-mes/pom.xml
index dd8f28ac..490fa5b0 100644
--- a/klp-mes/pom.xml
+++ b/klp-mes/pom.xml
@@ -24,5 +24,9 @@
             <artifactId>klp-system</artifactId>
             <version>0.8.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.klp</groupId>
+            <artifactId>klp-wms</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskCoilRelationController.java
similarity index 93%
rename from klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java
rename to klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskCoilRelationController.java
index d0dd35f0..1b5e6641 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskCoilRelationController.java
@@ -1,4 +1,4 @@
-package com.klp.controller;
+package com.klp.mes.qc.controller;
 
 import java.util.List;
 import java.util.Arrays;
@@ -17,9 +17,9 @@ import com.klp.common.core.validate.AddGroup;
 import com.klp.common.core.validate.EditGroup;
 import com.klp.common.enums.BusinessType;
 import com.klp.common.utils.poi.ExcelUtil;
-import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
-import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
-import com.klp.service.IWmsCheckTaskCoilRelationService;
+import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.mes.qc.domain.bo.WmsCheckTaskCoilRelationBo;
+import com.klp.mes.qc.service.IWmsCheckTaskCoilRelationService;
 import com.klp.common.core.page.TableDataInfo;
 
 /**
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskCoilRelation.java
similarity index 96%
rename from klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java
rename to klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskCoilRelation.java
index cc93731e..8db594a8 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskCoilRelation.java
@@ -1,4 +1,4 @@
-package com.klp.domain;
+package com.klp.mes.qc.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.klp.common.core.domain.BaseEntity;
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java
index dc0acd3b..e27bf617 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskBo.java
@@ -52,5 +52,7 @@ public class WmsCheckTaskBo extends BaseEntity {
     // 检验类型
     private String inspectionType;
 
+    // 绑定的钢卷ID（逗号分隔）
+    private String coilIds;
 
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskCoilRelationBo.java
similarity index 89%
rename from klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java
rename to klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskCoilRelationBo.java
index b3c9cc00..5e6fd41c 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskCoilRelationBo.java
@@ -1,9 +1,8 @@
-package com.klp.domain.bo;
+package com.klp.mes.qc.domain.bo;
 
 import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
 
 
 /**
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskCoilRelationVo.java
similarity index 85%
rename from klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java
rename to klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskCoilRelationVo.java
index fb29df8d..fb6557bc 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskCoilRelationVo.java
@@ -1,9 +1,7 @@
-package com.klp.domain.vo;
+package com.klp.mes.qc.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.klp.common.annotation.ExcelDictFormat;
-import com.klp.common.convert.ExcelDictConvert;
 import lombok.Data;
 
 
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java
index e2e85d09..a53a1519 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java
@@ -2,8 +2,7 @@ package com.klp.mes.qc.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.klp.common.annotation.ExcelDictFormat;
-import com.klp.common.convert.ExcelDictConvert;
+import com.klp.domain.vo.WmsMaterialCoilVo;
 import lombok.Data;
 
 import java.util.List;
@@ -90,4 +89,7 @@ public class WmsCheckTaskVo {
     private String actualMeasures;
 
     private String checkTaskItemIds;
+
+    // 绑定的钢卷ID列表
+    private List<WmsMaterialCoilVo> coilList;
 }
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskCoilRelationMapper.java
similarity index 57%
rename from klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java
rename to klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskCoilRelationMapper.java
index 1af8f5d6..35dfb879 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskCoilRelationMapper.java
@@ -1,8 +1,9 @@
-package com.klp.mapper;
+package com.klp.mes.qc.mapper;
 
-import com.klp.domain.WmsCheckTaskCoilRelation;
-import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.mes.qc.domain.WmsCheckTaskCoilRelation;
+import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import java.util.Collection;
 
 /**
  * 检查任务与钢卷关联Mapper接口
@@ -12,4 +13,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsCheckTaskCoilRelationMapper extends BaseMapperPlus<WmsCheckTaskCoilRelationMapper, WmsCheckTaskCoilRelation, WmsCheckTaskCoilRelationVo> {
 
+    void deleteByTaskIds(Collection<Long> taskIds);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskCoilRelationService.java
similarity index 86%
rename from klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java
rename to klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskCoilRelationService.java
index f1c42dae..5395171e 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskCoilRelationService.java
@@ -1,8 +1,7 @@
-package com.klp.service;
+package com.klp.mes.qc.service;
 
-import com.klp.domain.WmsCheckTaskCoilRelation;
-import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
-import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
+import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.mes.qc.domain.bo.WmsCheckTaskCoilRelationBo;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
similarity index 89%
rename from klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
rename to klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
index 2ffe8e24..ac794e92 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskCoilRelationServiceImpl.java
@@ -1,4 +1,4 @@
-package com.klp.service.impl;
+package com.klp.mes.qc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.klp.common.core.page.TableDataInfo;
@@ -7,13 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
+import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.klp.domain.bo.WmsCheckTaskCoilRelationBo;
-import com.klp.domain.vo.WmsCheckTaskCoilRelationVo;
-import com.klp.domain.WmsCheckTaskCoilRelation;
-import com.klp.mapper.WmsCheckTaskCoilRelationMapper;
-import com.klp.service.IWmsCheckTaskCoilRelationService;
+import com.klp.mes.qc.domain.bo.WmsCheckTaskCoilRelationBo;
+import com.klp.mes.qc.domain.vo.WmsCheckTaskCoilRelationVo;
+import com.klp.mes.qc.domain.WmsCheckTaskCoilRelation;
+import com.klp.mes.qc.mapper.WmsCheckTaskCoilRelationMapper;
+import com.klp.mes.qc.service.IWmsCheckTaskCoilRelationService;
 
 import java.util.List;
 import java.util.Map;
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index 779842c2..b3613e59 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -8,11 +8,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
+import com.klp.domain.WmsMaterialCoil;
+import com.klp.domain.vo.WmsMaterialCoilVo;
+import com.klp.mapper.WmsMaterialCoilMapper;
 import com.klp.mes.qc.domain.WmsCheckItem;
 import com.klp.mes.qc.domain.WmsCheckTaskItem;
+import com.klp.mes.qc.domain.WmsCheckTaskCoilRelation;
 import com.klp.mes.qc.domain.vo.WmsCheckItemVo;
 import com.klp.mes.qc.mapper.WmsCheckItemMapper;
 import com.klp.mes.qc.mapper.WmsCheckTaskItemMapper;
+import com.klp.mes.qc.mapper.WmsCheckTaskCoilRelationMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.mes.qc.domain.bo.WmsCheckTaskBo;
@@ -38,6 +43,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
     private final WmsCheckTaskMapper baseMapper;
     private final WmsCheckItemMapper wmsCheckItemMapper;
     private final WmsCheckTaskItemMapper wmsCheckTaskItemMapper;
+    private final WmsCheckTaskCoilRelationMapper wmsCheckTaskCoilRelationMapper;
+    private final WmsMaterialCoilMapper wmsMaterialCoilMapper;
 
     /**
      * 查询检查任务
@@ -91,9 +98,45 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
             }
             vo.setItemList(itemList);
         }
+
+        // 查询关联的钢卷信息
+        List<WmsCheckTaskCoilRelation> coilRelations = null;
+        if (vo != null) {
+            coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
+                Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
+                    .eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
+                    .eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
+            );
+        }
+
+        if (coilRelations != null && !coilRelations.isEmpty()) {
+            Set<String> coilIdSet = new HashSet<>();
+            for (WmsCheckTaskCoilRelation relation : coilRelations) {
+                coilIdSet.add(relation.getCoilId());
+            }
+
+            // 查询钢卷基础信息
+            List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
+            vo.setCoilList(coilList);
+        }
+
         return vo;
     }
 
+    private List<WmsMaterialCoilVo> queryCoilsByIds(Set<String> coilIds) {
+        if (coilIds == null || coilIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        QueryWrapper<WmsMaterialCoil> qw = new QueryWrapper<>();
+        qw.in("coil_id", coilIds);
+        qw.eq("del_flag", 0);
+        // 根据创建时间倒序
+        qw.orderByDesc("create_time");
+
+        return wmsMaterialCoilMapper.selectVoList(qw);
+    }
+
 
     /**
      * 查询检查任务列表
@@ -102,6 +145,29 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
     public TableDataInfo<WmsCheckTaskVo> queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) {
         QueryWrapper<WmsCheckTask> qw = buildQueryWrapperPlus(bo);
         Page<WmsCheckTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
+
+        // 处理结果中的钢卷信息
+        List<WmsCheckTaskVo> records = result.getRecords();
+        for (WmsCheckTaskVo vo : records) {
+            // 查询关联的钢卷信息
+            List<WmsCheckTaskCoilRelation> coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
+                Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
+                    .eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
+                    .eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
+            );
+
+            if (!coilRelations.isEmpty()) {
+                Set<String> coilIdSet = new HashSet<>();
+                for (WmsCheckTaskCoilRelation relation : coilRelations) {
+                    coilIdSet.add(relation.getCoilId());
+                }
+
+                // 查询钢卷基础信息
+                List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
+                vo.setCoilList(coilList);
+            }
+        }
+
         return TableDataInfo.build(result);
     }
     private QueryWrapper<WmsCheckTask> buildQueryWrapperPlus(WmsCheckTaskBo bo) {
@@ -137,7 +203,30 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
     @Override
     public List<WmsCheckTaskVo> queryList(WmsCheckTaskBo bo) {
         LambdaQueryWrapper<WmsCheckTask> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<WmsCheckTaskVo> result = baseMapper.selectVoList(lqw);
+
+        // 处理结果中的钢卷信息
+        for (WmsCheckTaskVo vo : result) {
+            // 查询关联的钢卷信息
+            List<WmsCheckTaskCoilRelation> coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
+                Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
+                    .eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
+                    .eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
+            );
+
+            if (!coilRelations.isEmpty()) {
+                Set<String> coilIdSet = new HashSet<>();
+                for (WmsCheckTaskCoilRelation relation : coilRelations) {
+                    coilIdSet.add(relation.getCoilId());
+                }
+
+                // 查询钢卷基础信息
+                List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
+                vo.setCoilList(coilList);
+            }
+        }
+
+        return result;
     }
 
     private LambdaQueryWrapper<WmsCheckTask> buildQueryWrapper(WmsCheckTaskBo bo) {
@@ -201,6 +290,22 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
             }
         }
 
+        // 处理钢卷关联关系
+        if (StringUtils.isNotBlank(bo.getCoilIds())) {
+            String[] coilIds = bo.getCoilIds().split(",");
+            for (String coilId : coilIds) {
+                if (StringUtils.isNotBlank(coilId)) {
+                    WmsCheckTaskCoilRelation relation = new WmsCheckTaskCoilRelation();
+                    relation.setTaskId(add.getTaskId());
+                    relation.setCoilId(coilId.trim());
+                    int insertCount = wmsCheckTaskCoilRelationMapper.insert(relation);
+                    if (insertCount <= 0) {
+                        throw new RuntimeException("新增检查任务钢卷关联失败，钢卷ID：" + coilId);
+                    }
+                }
+            }
+        }
+
         if (mainFlag) {
             bo.setTaskId(add.getTaskId());
         }
@@ -228,10 +333,15 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
      * 批量删除检查任务
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+
+        // 删除检查任务前，先删除相关的钢卷关联记录
+        wmsCheckTaskCoilRelationMapper.deleteByTaskIds(ids);
+
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml
similarity index 57%
rename from klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml
rename to klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml
index 64d62db3..4ffb7e76 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.klp.mapper.WmsCheckTaskCoilRelationMapper">
+<mapper namespace="com.klp.mes.qc.mapper.WmsCheckTaskCoilRelationMapper">
 
-    <resultMap type="com.klp.domain.WmsCheckTaskCoilRelation" id="WmsCheckTaskCoilRelationResult">
+    <resultMap type="com.klp.mes.qc.domain.WmsCheckTaskCoilRelation" id="WmsCheckTaskCoilRelationResult">
         <result property="relationId" column="relation_id"/>
         <result property="taskId" column="task_id"/>
         <result property="coilId" column="coil_id"/>
@@ -15,5 +15,12 @@
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
+    <delete id="deleteByTaskIds" parameterType="java.util.Collection">
+        UPDATE wms_check_task_coil_relation SET del_flag = 1
+        WHERE task_id IN
+        <foreach collection="list" item="taskId" open="(" close=")" separator=",">
+            #{taskId}
+        </foreach>
+    </delete>
 
 </mapper>

From efefe6e88fc14bf9f623a4c09ba3d7e7ac67ff9f Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 10:07:17 +0800
Subject: [PATCH 16/29] =?UTF-8?q?fix(qc):=20=E4=BF=AE=E6=AD=A3=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E5=8D=B7=E6=9D=90=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将删除标识从 1 修改为 2 以符合业务逻辑要求
---
 .../main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml
index 4ffb7e76..11119f70 100644
--- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskCoilRelationMapper.xml
@@ -16,7 +16,7 @@
     </resultMap>
 
     <delete id="deleteByTaskIds" parameterType="java.util.Collection">
-        UPDATE wms_check_task_coil_relation SET del_flag = 1
+        UPDATE wms_check_task_coil_relation SET del_flag = 2
         WHERE task_id IN
         <foreach collection="list" item="taskId" open="(" close=")" separator=",">
             #{taskId}

From 3e55354f04e3c02f4c32c0068daba3f948b719a9 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 10:10:45 +0800
Subject: [PATCH 17/29] =?UTF-8?q?refactor(qc):=20=E6=9B=B4=E6=96=B0WMS?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1=E6=9C=8D=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99=E5=8D=B7=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将selectVoList替换为selectVoListWithDynamicJoin以支持动态连接查询
- 保持原有的按创建时间倒序排序逻辑不变
---
 .../com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index b3613e59..d1fd50e0 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -134,7 +134,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
         // 根据创建时间倒序
         qw.orderByDesc("create_time");
 
-        return wmsMaterialCoilMapper.selectVoList(qw);
+        return wmsMaterialCoilMapper.selectVoListWithDynamicJoin(qw);
     }
 
 

From 44933221feb335abec717f2e8da076c6d7e65772 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 10:18:03 +0800
Subject: [PATCH 18/29] =?UTF-8?q?refactor(qc):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将原有的聚合字段拆分方式改为关联表查询方式
- 新增检查任务与检查项关联关系的独立查询
- 使用批量查询替代字符串拆分提高性能
- 优化检查项数据组装逻辑
- 移除原有的字符串分割处理方法
- 改进钢卷信息查询条件判断逻辑
---
 .../service/impl/WmsCheckTaskServiceImpl.java | 100 +++++++++---------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index d1fd50e0..76108b56 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -51,71 +51,69 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
      */
     @Override
     public WmsCheckTaskVo queryById(Long taskId) {
-        WmsCheckTaskVo vo = baseMapper.selectVoByIdPlus(taskId);
-        if (vo != null && vo.getItemIds() != null) {
-            // 1. 拆分所有聚合字段（新增 checkTaskItemIds 的处理）
-            String[] ids = vo.getItemIds().split(","); // 检查项表的 item_id
-            String[] checkTaskItemIds = vo.getCheckTaskItemIds() != null ? vo.getCheckTaskItemIds().split(",") : new String[ids.length]; // 关联表的 item_id（新增）
-            String[] names = vo.getItemNames() != null ? vo.getItemNames().split(",") : new String[ids.length];
-            String[] statusArr = vo.getItemStatus() != null ? vo.getItemStatus().split(",") : new String[ids.length];
-            String[] targetUppers = vo.getTargetUppers() != null ? vo.getTargetUppers().split(",") : new String[ids.length];
-            String[] targetLowers = vo.getTargetLowers() != null ? vo.getTargetLowers().split(",") : new String[ids.length];
-            String[] standardTargets = vo.getStandardTargets() != null ? vo.getStandardTargets().split(",") : new String[ids.length];
-            String[] units = vo.getUnits() != null ? vo.getUnits().split(",") : new String[ids.length];
-            String[] qualitativeQuantitatives = vo.getQualitativeQuantitatives() != null ? vo.getQualitativeQuantitatives().split(",") : new String[ids.length];
-            String[] actualMeasures = vo.getActualMeasures() != null ? vo.getActualMeasures().split(",") : new String[ids.length];
+        WmsCheckTaskVo vo = baseMapper.selectVoById(taskId);
+        if (vo == null) {
+            return null;
+        }
 
+        // 查询检查任务与检查项关联关系
+        List<WmsCheckTaskItem> taskItems = wmsCheckTaskItemMapper.selectList(
+            Wrappers.<WmsCheckTaskItem>lambdaQuery()
+                .eq(WmsCheckTaskItem::getCheckTaskId, taskId)
+                .eq(WmsCheckTaskItem::getDelFlag, 0)
+        );
+
+        if (!taskItems.isEmpty()) {
+            Set<Long> itemIds = new HashSet<>();
+            for (WmsCheckTaskItem taskItem : taskItems) {
+                itemIds.add(taskItem.getCheckItemId());
+            }
+
+            // 查询检查项基础信息
+            List<WmsCheckItem> checkItems = wmsCheckItemMapper.selectBatchIds(itemIds);
+            Map<Long, WmsCheckItem> itemMap = new HashMap<>();
+            for (WmsCheckItem item : checkItems) {
+                itemMap.put(item.getItemId(), item);
+            }
+
+            // 组装检查项列表
             List<WmsCheckItemVo> itemList = new ArrayList<>();
-            for (int i = 0; i < ids.length; i++) {
-                if (!ids[i].isEmpty()) { // 跳过空字符串（避免拆分后出现空元素）
-                    WmsCheckItemVo item = new WmsCheckItemVo();
-                    // 2. 赋值检查项 ID（原逻辑保留）
-                    item.setItemId(Long.valueOf(ids[i]));
-                    // 3. 新增：赋值关联表的 item_id
-                    if (checkTaskItemIds.length > i && !checkTaskItemIds[i].isEmpty()) {
-                        item.setCheckTaskItemId(Long.valueOf(checkTaskItemIds[i])); // 假设 WmsCheckItemVo 有这个字段
-                    }
-                    // 4. 其他字段赋值（保持原逻辑，补充判空）
-                    if (names.length > i) item.setItemName(names[i]);
-                    if (statusArr.length > i) item.setStatus(statusArr[i]);
-                    // 处理数值类型时，先判空再转换，避免 NumberFormatException
-                    if (targetUppers.length > i && StringUtils.isNotBlank(targetUppers[i])) {
-                        item.setTargetUpper(new BigDecimal(targetUppers[i])); // 推荐用 new BigDecimal，避免 Double 精度问题
-                    }
-                    if (targetLowers.length > i && StringUtils.isNotBlank(targetLowers[i])) {
-                        item.setTargetLower(new BigDecimal(targetLowers[i]));
-                    }
-                    if (standardTargets.length > i && StringUtils.isNotBlank(standardTargets[i])) {
-                        item.setStandardTarget(new BigDecimal(standardTargets[i]));
-                    }
-                    if (units.length > i) item.setUnit(units[i]);
-                    if (qualitativeQuantitatives.length > i && StringUtils.isNotBlank(qualitativeQuantitatives[i])) {
-                        item.setQualitativeQuantitative(Integer.parseInt(qualitativeQuantitatives[i]));
-                    }
-                    if (actualMeasures.length > i) item.setActualMeasure(actualMeasures[i]);
-                    itemList.add(item);
+            for (WmsCheckTaskItem taskItem : taskItems) {
+                WmsCheckItemVo itemVo = new WmsCheckItemVo();
+                WmsCheckItem checkItem = itemMap.get(taskItem.getCheckItemId());
+
+                if (checkItem != null) {
+                    itemVo.setItemId(checkItem.getItemId());
+                    itemVo.setItemName(checkItem.getItemName());
                 }
+
+                itemVo.setCheckTaskItemId(taskItem.getItemId());
+                itemVo.setStatus(taskItem.getStatus().toString());
+                itemVo.setTargetUpper(taskItem.getTargetUpper());
+                itemVo.setTargetLower(taskItem.getTargetLower());
+                itemVo.setStandardTarget(taskItem.getStandardTarget());
+                itemVo.setUnit(taskItem.getUnit());
+                itemVo.setQualitativeQuantitative(taskItem.getQualitativeQuantitative());
+                itemVo.setActualMeasure(taskItem.getActualMeasure() != null ? taskItem.getActualMeasure().toString() : null);
+
+                itemList.add(itemVo);
             }
             vo.setItemList(itemList);
         }
 
         // 查询关联的钢卷信息
-        List<WmsCheckTaskCoilRelation> coilRelations = null;
-        if (vo != null) {
-            coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
-                Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
-                    .eq(WmsCheckTaskCoilRelation::getTaskId, vo.getTaskId())
-                    .eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
-            );
-        }
+        List<WmsCheckTaskCoilRelation> coilRelations = wmsCheckTaskCoilRelationMapper.selectList(
+            Wrappers.<WmsCheckTaskCoilRelation>lambdaQuery()
+                .eq(WmsCheckTaskCoilRelation::getTaskId, taskId)
+                .eq(WmsCheckTaskCoilRelation::getDelFlag, 0)
+        );
 
-        if (coilRelations != null && !coilRelations.isEmpty()) {
+        if (!coilRelations.isEmpty()) {
             Set<String> coilIdSet = new HashSet<>();
             for (WmsCheckTaskCoilRelation relation : coilRelations) {
                 coilIdSet.add(relation.getCoilId());
             }
 
-            // 查询钢卷基础信息
             List<WmsMaterialCoilVo> coilList = queryCoilsByIds(coilIdSet);
             vo.setCoilList(coilList);
         }

From af1f2e46261ed4a55bf53171d5f9ca20aa1b5dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 3 Feb 2026 10:33:23 +0800
Subject: [PATCH 19/29] =?UTF-8?q?feat(qc/task):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=B7=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用CoilSelector组件替换原有的钢卷号输入框
- 调整表单字段显示顺序和布局
- 优化钢卷相关数据的获取和显示方式
- 移除部分注释掉的表单字段
---
 klp-ui/src/views/mes/qc/task/pages/raw.vue    | 47 +++++++++++++------
 .../src/views/mes/qc/task/pages/section.vue   | 32 ++++++++-----
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/klp-ui/src/views/mes/qc/task/pages/raw.vue b/klp-ui/src/views/mes/qc/task/pages/raw.vue
index 90c4e59a..7f0bc99b 100644
--- a/klp-ui/src/views/mes/qc/task/pages/raw.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/raw.vue
@@ -39,16 +39,16 @@
       <KLPTable ref="checkTaskTable" height="300px" highlight-current-row v-loading="loading" :data="checkTaskList"
         @row-click="handleRowClick">
         <el-table-column label="任务名称" align="center" prop="taskName" />
-        <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" />
+        <el-table-column label="钢卷号" align="center" prop="currentCoilNo" />
         <el-table-column label="工段" align="center" prop="workshopSection" />
         <el-table-column label="工序" align="center" prop="process" />
         <el-table-column label="机组" align="center" prop="unitGroup" />
-        <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" />
-        <el-table-column label="原料卷号" align="center" prop="verifyTarget.rawCoilId" />
+        <!-- <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" /> -->
+        <el-table-column label="原料卷号" align="center" prop="entryCoilNo" />
         <el-table-column label="厂家" align="center" prop="verifyTarget.vendor" />
         <el-table-column label="宽度" align="center" prop="verifyTarget.width" />
         <el-table-column label="厚度" align="center" prop="verifyTarget.thickness" />
-        <el-table-column label="重量" align="center" prop="verifyTarget.weight" />
+        <el-table-column label="重量" align="center" prop="weight" />
         <el-table-column label="检验结果" align="center">
           <template slot-scope="scope">
             <span>
@@ -136,13 +136,11 @@
         <el-form-item label="检查项" prop="itemId" v-if="!form.taskId">
           <CheckItemSelect v-model="form.itemId" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
         <el-form-item label="钢卷号">
-          <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" />
+          <coil-selector v-model="form.coilIds" @select="handleCoilChange" :filters="{ selectType: 'raw_material', itemType: 'raw_material' }"></coil-selector>
+          <!-- <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" /> -->
         </el-form-item>
-        <el-form-item label="原料卷号">
+        <!-- <el-form-item label="原料卷号">
           <el-input v-model="form.verifyTarget.rawCoilId" placeholder="请输入原料卷号" />
         </el-form-item>
         <el-form-item label="厂家">
@@ -156,7 +154,7 @@
         </el-form-item>
         <el-form-item label="重量">
           <el-input v-model="form.verifyTarget.weight" placeholder="请输入重量" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="工段" prop="workshopSection">
           <el-input v-model="form.workshopSection" placeholder="请输入工段" />
         </el-form-item>
@@ -166,13 +164,16 @@
         <el-form-item label="机组" prop="unitGroup">
           <el-input v-model="form.unitGroup" placeholder="请输入机组" />
         </el-form-item>
-        <el-form-item label="检验结果" prop="inspectionResult">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <!-- <el-form-item label="检验结果" prop="inspectionResult">
           <el-select v-model="form.inspectionResult" placeholder="请选择检验结果">
             <el-option label="未检验" :value="0" />
             <el-option label="合格" :value="1" />
             <el-option label="不合格" :value="2" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -187,6 +188,7 @@
 import { listCheckTask, getCheckTask, delCheckTask, addCheckTask, updateCheckTask } from '@/api/mes/qc/checkTask'
 import { updateCheckTaskItemStatus, updateCheckTaskItem } from '@/api/mes/qc/checkTaskItem'
 import CheckItemSelect from '@/components/KLPService/CheckItemSelect/index'
+import CoilSelector from '@/components/CoilSelector/index.vue'
 
 export default {
   name: 'CheckTask',
@@ -245,7 +247,8 @@ export default {
     this.getList();
   },
   components: {
-    CheckItemSelect
+    CheckItemSelect,
+    CoilSelector
   },
   methods: {
     /** 查询检查任务列表 */
@@ -254,12 +257,27 @@ export default {
       listCheckTask(this.queryParams).then(response => {
         this.checkTaskList = response.rows.map(item => ({
           ...item,
-          verifyTarget: JSON.parse(item.verifyTarget)
+          verifyTarget: JSON.parse(item.verifyTarget),
+          entryCoilNo: item.coilList?.[0]?.entryCoilNo || '',
+          currentCoilNo: item.coilList?.[0]?.currentCoilNo || '',
+          weight: item.coilList?.[0]?.netWeight || 0,
         }));
         this.total = response.total;
         this.loading = false;
       });
     },
+    handleCoilChange(coil) {
+      const [thickness, width] = coil.specification.split('*')
+      console.log(thickness, width, coil.netWeight)
+      this.form.verifyTarget = {
+        coilId: coil.coilId,
+        rawCoilId: coil.rawCoilId,
+        factory: coil.manufacturer,
+        thickness: thickness,
+        width: width,
+        weight: coil.netWeight,
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -383,6 +401,7 @@ export default {
           // 对象转json
           const payload = {
             ...this.form,
+            itemId: this.form.itemId.split(','),
             verifyTarget: JSON.stringify(this.form.verifyTarget)
           }
           if (this.form.taskId != null) {
diff --git a/klp-ui/src/views/mes/qc/task/pages/section.vue b/klp-ui/src/views/mes/qc/task/pages/section.vue
index e67fdd07..513de3a9 100644
--- a/klp-ui/src/views/mes/qc/task/pages/section.vue
+++ b/klp-ui/src/views/mes/qc/task/pages/section.vue
@@ -39,7 +39,7 @@
       <KLPTable ref="checkTaskTable" height="300px" highlight-current-row v-loading="loading" :data="checkTaskList"
         @row-click="handleRowClick">
         <el-table-column label="任务名称" align="center" prop="taskName" />
-        <el-table-column label="钢卷号" align="center" prop="verifyTarget.coilId" />
+        <el-table-column label="钢卷号" align="center" prop="coilList[0].currentCoilNo" />
         <el-table-column label="工段" align="center" prop="workshopSection" />
         <el-table-column label="工序" align="center" prop="process" />
         <el-table-column label="机组" align="center" prop="unitGroup" />
@@ -127,15 +127,13 @@
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
+        <el-form-item label="钢卷号">
+          <!-- <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" /> -->
+          <coil-selector v-model="form.coilIds" @select="handleCoilChange"></coil-selector>
+        </el-form-item>
         <el-form-item label="检查项" prop="itemId" v-if="!form.taskId">
           <CheckItemSelect v-model="form.itemId" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="钢卷号">
-          <el-input v-model="form.verifyTarget.coilId" placeholder="请输入钢卷号" />
-        </el-form-item>
         <el-form-item label="工段" prop="workshopSection">
           <el-input v-model="form.workshopSection" placeholder="请输入工段" />
         </el-form-item>
@@ -145,13 +143,16 @@
         <el-form-item label="机组" prop="unitGroup">
           <el-input v-model="form.unitGroup" placeholder="请输入机组" />
         </el-form-item>
-        <el-form-item label="检验结果" prop="inspectionResult">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <!-- <el-form-item label="检验结果" prop="inspectionResult">
           <el-select v-model="form.inspectionResult" placeholder="请选择检验结果">
             <el-option label="未检验" :value="0" />
             <el-option label="合格" :value="1" />
             <el-option label="不合格" :value="2" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -166,6 +167,8 @@
 import { listCheckTask, getCheckTask, delCheckTask, addCheckTask, updateCheckTask } from '@/api/mes/qc/checkTask'
 import { updateCheckTaskItemStatus, updateCheckTaskItem } from '@/api/mes/qc/checkTaskItem'
 import CheckItemSelect from '@/components/KLPService/CheckItemSelect/index'
+import CoilSelector from '@/components/CoilSelector/index.vue'
+
 
 export default {
   name: 'CheckTask',
@@ -219,7 +222,8 @@ export default {
     this.getList();
   },
   components: {
-    CheckItemSelect
+    CheckItemSelect,
+    CoilSelector
   },
   methods: {
     /** 查询检查任务列表 */
@@ -234,13 +238,16 @@ export default {
         this.loading = false;
       });
     },
+    handleCoilChange(coil) {
+      this.form.verifyTarget.coilId = coil.coilId
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
-     handleBlur(row) {
-      updateCheckTaskItem({...row, itemId: row.checkTaskItemId}).then(response => {
+    handleBlur(row) {
+      updateCheckTaskItem({ ...row, itemId: row.checkTaskItemId }).then(response => {
         this.$message({
           message: '更新成功',
           type: 'success'
@@ -352,6 +359,7 @@ export default {
           // 对象转json
           const payload = {
             ...this.form,
+            itemId: this.form.itemId.split(','),
             verifyTarget: JSON.stringify(this.form.verifyTarget)
           }
           if (this.form.taskId != null) {

From 9cb9d044d285ecce7702da1af38d6251e90feebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 3 Feb 2026 10:42:45 +0800
Subject: [PATCH 20/29] =?UTF-8?q?feat(CoilSelector):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=88=97=E5=B9=B6=E7=A7=BB=E9=99=A4=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在CoilSelector组件的数据配置和基础面板中添加备注列，同时注释掉不再需要的二维码列
---
 klp-ui/src/components/CoilSelector/data.js | 6 ++++++
 klp-ui/src/views/wms/coil/panels/base.vue  | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/components/CoilSelector/data.js b/klp-ui/src/components/CoilSelector/data.js
index 85762b0e..4fa2cbcf 100644
--- a/klp-ui/src/components/CoilSelector/data.js
+++ b/klp-ui/src/components/CoilSelector/data.js
@@ -49,4 +49,10 @@ export const defaultColumns = [
     width: '120',
     showOverflowTooltip: true
   },
+  {
+    label: '备注',
+    align: 'center',
+    prop: 'remark',
+    showOverflowTooltip: true
+  }
 ]
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 231bdc29..be1d1fde 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -119,11 +119,11 @@
         </template>
       </el-table-column>
       <el-table-column label="更新人" v-if="!showExportTime" align="center" prop="updateByName" />
-      <el-table-column label="二维码" v-if="qrcode">
+      <!-- <el-table-column label="二维码">
         <template slot-scope="scope">
           <QRCode :content="scope.row.qrcodeRecordId" :size="50" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="关联信息" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.parentCoilNos && scope.row.hasMergeSplit === 1 && scope.row.dataType === 1">
@@ -146,6 +146,7 @@
           </el-select>
         </template>
       </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
       <!-- <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

From b811923ba5cea4f8676ecf87132dcfce17ef4b0a Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 10:48:23 +0800
Subject: [PATCH 21/29] =?UTF-8?q?refactor(qc):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BB=BB=E5=8A=A1=E6=9C=8D=E5=8A=A1=E4=BB=A5?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96=E9=99=84=E5=8A=A0=E4=BF=A1=E6=81=AF=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将附加信息处理逻辑提取到独立的 additionalInformation 方法中
- 在查询页面列表和历史查询中复用附加信息处理逻辑
- 提高代码可读性和维护性
- 消除重复代码以增强一致性
---
 .../klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index 76108b56..ee26152f 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -143,7 +143,11 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
     public TableDataInfo<WmsCheckTaskVo> queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery) {
         QueryWrapper<WmsCheckTask> qw = buildQueryWrapperPlus(bo);
         Page<WmsCheckTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
+        additionalInformation(result);
+        return TableDataInfo.build(result);
+    }
 
+    private void additionalInformation(Page<WmsCheckTaskVo> result) {
         // 处理结果中的钢卷信息
         List<WmsCheckTaskVo> records = result.getRecords();
         for (WmsCheckTaskVo vo : records) {
@@ -165,9 +169,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
                 vo.setCoilList(coilList);
             }
         }
-
-        return TableDataInfo.build(result);
     }
+
     private QueryWrapper<WmsCheckTask> buildQueryWrapperPlus(WmsCheckTaskBo bo) {
         Map<String, Object> params = bo.getParams();
         com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<WmsCheckTask> qw = Wrappers.query();
@@ -190,6 +193,7 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
     public TableDataInfo<WmsCheckTaskVo> queryPageListHistory(WmsCheckTaskBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsCheckTask> lqw = buildQueryWrapper(bo);
         Page<WmsCheckTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        additionalInformation(result);
         return TableDataInfo.build(result);
     }
 

From 733432adc862b9122e21cf8efbb40acb06cbc097 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 11:08:48 +0800
Subject: [PATCH 22/29] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8D=B7=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正了coil_id字段的表别名引用
- 修正了del_flag字段的表别名引用
- 修正了create_time字段的表别名引用
- 确保查询条件正确关联到物料卷表
---
 .../klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index ee26152f..2ffc9b96 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -127,10 +127,10 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
         }
 
         QueryWrapper<WmsMaterialCoil> qw = new QueryWrapper<>();
-        qw.in("coil_id", coilIds);
-        qw.eq("del_flag", 0);
+        qw.in("mc.coil_id", coilIds);
+        qw.eq("mc.del_flag", 0);
         // 根据创建时间倒序
-        qw.orderByDesc("create_time");
+        qw.orderByDesc("mc.create_time");
 
         return wmsMaterialCoilMapper.selectVoListWithDynamicJoin(qw);
     }

From e8373fe5604e5fe741d1195942c3cda130956d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 3 Feb 2026 11:12:14 +0800
Subject: [PATCH 23/29] =?UTF-8?q?feat(mes/qc/history):=20=E5=9C=A8?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7=E5=8F=B7=E5=88=97=E5=B9=B6?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加钢卷号列以显示当前钢卷信息，同时修改数据映射逻辑以解析verifyTarget字段并补充钢卷相关数据
---
 klp-ui/src/views/mes/qc/history/index.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/klp-ui/src/views/mes/qc/history/index.vue b/klp-ui/src/views/mes/qc/history/index.vue
index 63089d3f..de04f731 100644
--- a/klp-ui/src/views/mes/qc/history/index.vue
+++ b/klp-ui/src/views/mes/qc/history/index.vue
@@ -33,6 +33,7 @@
       <div class="table-title">检验历史列表</div>
       <KLPTable ref="historyTable" height="300px" highlight-current-row v-loading="loading" :data="checkTaskList" @row-click="handleRowClick" row-class-name="tableRowClassName">
       <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column label="钢卷号" align="center" prop="currentCoilNo" />
       <el-table-column label="工段" align="center" prop="workshopSection" />
       <el-table-column label="工序" align="center" prop="process" />
       <el-table-column label="机组" align="center" prop="unitGroup" />
@@ -144,7 +145,13 @@ export default {
     getList() {
       this.loading = true
       listHistoryCheckTask(this.queryParams).then(response => {
-        this.checkTaskList = response.rows
+        this.checkTaskList = response.rows.map(item => ({
+          ...item,
+          verifyTarget: JSON.parse(item.verifyTarget),
+          entryCoilNo: item.coilList?.[0]?.entryCoilNo || '',
+          currentCoilNo: item.coilList?.[0]?.currentCoilNo || '',
+          weight: item.coilList?.[0]?.netWeight || 0,
+        }))
         this.total = response.total
         this.loading = false
       })

From 7b75548da0f6b700496931b38af8f7caf7eac4b7 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 11:26:10 +0800
Subject: [PATCH 24/29] =?UTF-8?q?feat(crm):=20=E6=B7=BB=E5=8A=A0=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E8=81=94=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在CrmOrder实体类中新增contractCode字段用于存储合同号
- 在CrmOrderBo业务对象中添加contractCode字段支持
- 在CrmOrderMapper中增加按合同号查询的方法
- 更新CrmOrderMapper.xml映射文件以支持合同号字段映射
- 实现CrmOrderServiceImpl中合同号条件查询功能
- 在CrmOrderVo视图对象中添加合同号字段并支持Excel导出
- 为WmsDeliveryWaybill添加关联订单ID字段建立与CRM订单关联
- 在WMS模块中实现发货单与CRM订单的关联查询功能
- 重构WmsDeliveryWaybillServiceImpl中的查询方法以支持多表关联查询
- 完善WMS发货单查询界面以支持按关联订单筛选功能
---
 .../java/com/klp/crm/domain/CrmOrder.java     |  6 ++
 .../com/klp/crm/domain/bo/CrmOrderBo.java     |  5 ++
 .../com/klp/crm/domain/vo/CrmOrderVo.java     |  6 ++
 .../com/klp/crm/mapper/CrmOrderMapper.java    |  2 +
 .../crm/service/impl/CrmOrderServiceImpl.java |  2 +
 .../main/resources/mapper/CrmOrderMapper.xml  | 33 ++++++++
 .../com/klp/domain/WmsDeliveryWaybill.java    |  6 ++
 .../klp/domain/bo/WmsDeliveryWaybillBo.java   |  5 ++
 .../klp/domain/vo/WmsDeliveryWaybillVo.java   | 15 ++++
 .../klp/mapper/WmsDeliveryWaybillMapper.java  |  8 ++
 .../impl/WmsDeliveryWaybillServiceImpl.java   | 31 ++++++-
 .../mapper/klp/WmsDeliveryWaybillMapper.xml   | 83 +++++++++++++++++++
 12 files changed, 198 insertions(+), 4 deletions(-)

diff --git a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java
index e138d56d..230acebf 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/CrmOrder.java
@@ -79,6 +79,12 @@ public class CrmOrder extends BaseEntity {
      * 备注
      */
     private String remark;
+
+    /**
+     * 合同号
+     */
+    private String contractCode;
+
     /**
      * 删除标识 0正常 2删除
      */
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java
index 42e58d91..4a92bf88 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/bo/CrmOrderBo.java
@@ -90,5 +90,10 @@ public class CrmOrderBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 合同号
+     */
+    private String contractCode;
+
 
 }
diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
index e56ea33e..86e22111 100644
--- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
+++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java
@@ -108,6 +108,12 @@ public class CrmOrderVo extends BaseEntity {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 合同号
+     */
+    @ExcelProperty(value = "合同号")
+    private String contractCode;
+
 
 //    @ExcelProperty(value = "客户编号")
     private String customerCode;
diff --git a/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java b/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java
index e6a60d44..55c54d89 100644
--- a/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java
+++ b/klp-crm/src/main/java/com/klp/crm/mapper/CrmOrderMapper.java
@@ -16,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
 public interface CrmOrderMapper extends BaseMapperPlus<CrmOrderMapper, CrmOrder, CrmOrderVo> {
 
     Page<CrmOrderVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<CrmOrder> lqw);
+
+    CrmOrderVo selectVoById(@Param("orderId") String orderId);
 }
diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java
index bb394e28..c092ce81 100644
--- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java
+++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java
@@ -94,6 +94,7 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
         qw.eq(bo.getOrderStatus() != null, "co.order_status", bo.getOrderStatus());
         qw.eq(bo.getFinanceStatus() != null, "co.finance_status", bo.getFinanceStatus());
         qw.eq(bo.getUnpaidAmount() != null, "co.unpaid_amount", bo.getUnpaidAmount());
+        qw.like(StringUtils.isNotBlank(bo.getContractCode()), "co.contract_code", bo.getContractCode());
         //逻辑删除
         qw.eq("co.del_flag", 0);
         //根据orderType排序预订单是0 正是订单是1 0排在前面 1排在后面 升序
@@ -126,6 +127,7 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
         lqw.eq(bo.getOrderStatus() != null, CrmOrder::getOrderStatus, bo.getOrderStatus());
         lqw.eq(bo.getFinanceStatus() != null, CrmOrder::getFinanceStatus, bo.getFinanceStatus());
         lqw.eq(bo.getUnpaidAmount() != null, CrmOrder::getUnpaidAmount, bo.getUnpaidAmount());
+        lqw.like(StringUtils.isNotBlank(bo.getContractCode()), CrmOrder::getContractCode, bo.getContractCode());
         return lqw;
     }
 
diff --git a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
index d8421338..3d89ce6d 100644
--- a/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
+++ b/klp-crm/src/main/resources/mapper/CrmOrderMapper.xml
@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="financeStatus" column="finance_status"/>
         <result property="unpaidAmount" column="unpaid_amount"/>
         <result property="remark" column="remark"/>
+        <result property="contractCode" column="contract_code"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             co.finance_status AS financeStatus,
             co.unpaid_amount AS unpaidAmount,
             co.remark,
+            co.contract_code AS contractCode,
             co.create_by AS createBy,
             co.create_time AS createTime,
             co.update_by AS updateBy,
@@ -56,4 +58,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectVoById" resultType="com.klp.crm.domain.vo.CrmOrderVo">
+        SELECT
+            co.order_id AS orderId,
+            co.order_code AS orderCode,
+            co.order_type AS orderType,
+            co.customer_id AS customerId,
+            co.order_amount AS orderAmount,
+            co.salesman,
+            co.delivery_date AS deliveryDate,
+            co.pre_order_status AS preOrderStatus,
+            co.audit_user AS auditUser,
+            co.audit_time AS auditTime,
+            co.order_status AS orderStatus,
+            co.finance_status AS financeStatus,
+            co.unpaid_amount AS unpaidAmount,
+            co.remark,
+            co.contract_code AS contractCode,
+            co.create_by AS createBy,
+            co.create_time AS createTime,
+            co.update_by AS updateBy,
+            co.update_time AS updateTime,
+            cu.customer_code AS customerCode,
+            cu.contact_person AS contactPerson,
+            cu.contact_way AS contactWay,
+            cu.company_name AS companyName,
+            cu.address AS address
+        FROM crm_order co
+        LEFT JOIN crm_customer cu ON co.customer_id = cu.customer_id
+        WHERE co.order_id = #{orderId}
+    </select>
+
 </mapper>
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsDeliveryWaybill.java b/klp-wms/src/main/java/com/klp/domain/WmsDeliveryWaybill.java
index 8268c5a0..848f9256 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsDeliveryWaybill.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsDeliveryWaybill.java
@@ -38,6 +38,12 @@ public class WmsDeliveryWaybill extends BaseEntity {
      * 关联发货计划ID
      */
     private Long planId;
+
+    /**
+     * 关联订单ID（关联crm_order.order_id）
+     */
+    private Long orderId;
+
     /**
      * 车牌（支持新能源车牌）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java
index 1b9c9d0e..22011187 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java
@@ -41,6 +41,11 @@ public class WmsDeliveryWaybillBo extends BaseEntity {
      */
     private Long planId;
 
+    /**
+     * 关联订单ID（关联crm_order.order_id）
+     */
+    private Long orderId;
+
     /**
      * 车牌（支持新能源车牌）
      */
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java
index 3a3e5e04..6ad0b5f9 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java
@@ -47,6 +47,21 @@ public class WmsDeliveryWaybillVo extends BaseEntity {
     @ExcelProperty(value = "关联发货计划ID")
     private Long planId;
 
+    /**
+     * 关联订单ID（关联crm_order.order_id）
+     */
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 合同号
+     */
+    private String contractCode;
+
     /**
      * 车牌（支持新能源车牌）
      */
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryWaybillMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryWaybillMapper.java
index 00f32daa..946d4e25 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryWaybillMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsDeliveryWaybillMapper.java
@@ -1,8 +1,13 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.domain.WmsDeliveryWaybill;
 import com.klp.domain.vo.WmsDeliveryWaybillVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 发货单主Mapper接口
@@ -12,4 +17,7 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsDeliveryWaybillMapper extends BaseMapperPlus<WmsDeliveryWaybillMapper, WmsDeliveryWaybill, WmsDeliveryWaybillVo> {
 
+    Page<WmsDeliveryWaybillVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<WmsDeliveryWaybill> lqw);
+
+    List<WmsDeliveryWaybillVo> selectVoListPlus(@Param("ew") QueryWrapper<WmsDeliveryWaybill> lqw);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
index f133c884..26dbcb59 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
@@ -1,6 +1,7 @@
 package com.klp.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
@@ -49,8 +50,8 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
      */
     @Override
     public TableDataInfo<WmsDeliveryWaybillVo> queryPageList(WmsDeliveryWaybillBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsDeliveryWaybill> lqw = buildQueryWrapper(bo);
-        Page<WmsDeliveryWaybillVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<WmsDeliveryWaybill> lqw = buildQueryWrapperPlus(bo);
+        Page<WmsDeliveryWaybillVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -59,8 +60,29 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
      */
     @Override
     public List<WmsDeliveryWaybillVo> queryList(WmsDeliveryWaybillBo bo) {
-        LambdaQueryWrapper<WmsDeliveryWaybill> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<WmsDeliveryWaybill> lqw = buildQueryWrapperPlus(bo);
+        return baseMapper.selectVoListPlus(lqw);
+    }
+
+    private com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<WmsDeliveryWaybill> buildQueryWrapperPlus(WmsDeliveryWaybillBo bo) {
+        Map<String, Object> params = bo.getParams();
+        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<WmsDeliveryWaybill> qw = Wrappers.query();
+        qw.eq(StringUtils.isNotBlank(bo.getWaybillNo()), "wd.waybill_no", bo.getWaybillNo());
+        qw.like(StringUtils.isNotBlank(bo.getWaybillName()), "wd.waybill_name", bo.getWaybillName());
+        qw.eq(bo.getPlanId() != null, "wd.plan_id", bo.getPlanId());
+        qw.eq(bo.getOrderId() != null, "wd.order_id", bo.getOrderId());
+        qw.eq(StringUtils.isNotBlank(bo.getLicensePlate()), "wd.license_plate", bo.getLicensePlate());
+        qw.eq(StringUtils.isNotBlank(bo.getConsigneeUnit()), "wd.consignee_unit", bo.getConsigneeUnit());
+        qw.eq(StringUtils.isNotBlank(bo.getSenderUnit()), "wd.sender_unit", bo.getSenderUnit());
+        qw.eq(bo.getDeliveryTime() != null, "wd.delivery_time", bo.getDeliveryTime());
+        qw.eq(StringUtils.isNotBlank(bo.getWeighbridge()), "wd.weighbridge", bo.getWeighbridge());
+        qw.eq(StringUtils.isNotBlank(bo.getSalesPerson()), "wd.sales_person", bo.getSalesPerson());
+        qw.eq(StringUtils.isNotBlank(bo.getPrincipal()), "wd.principal", bo.getPrincipal());
+        qw.eq(StringUtils.isNotBlank(bo.getPrincipalPhone()), "wd.principal_phone", bo.getPrincipalPhone());
+        qw.eq(bo.getStatus() != null, "wd.status", bo.getStatus());
+        // 逻辑删除
+        qw.eq("wd.del_flag", 0);
+        return qw;
     }
 
     private LambdaQueryWrapper<WmsDeliveryWaybill> buildQueryWrapper(WmsDeliveryWaybillBo bo) {
@@ -78,6 +100,7 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
         lqw.eq(StringUtils.isNotBlank(bo.getPrincipal()), WmsDeliveryWaybill::getPrincipal, bo.getPrincipal());
         lqw.eq(StringUtils.isNotBlank(bo.getPrincipalPhone()), WmsDeliveryWaybill::getPrincipalPhone, bo.getPrincipalPhone());
         lqw.eq(bo.getStatus() != null, WmsDeliveryWaybill::getStatus, bo.getStatus());
+        lqw.eq(bo.getOrderId() != null, WmsDeliveryWaybill::getOrderId, bo.getOrderId());
         return lqw;
     }
 
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
index a7e97e52..6147a756 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
@@ -9,6 +9,7 @@
         <result property="waybillNo" column="waybill_no"/>
         <result property="waybillName" column="waybill_name"/>
         <result property="planId" column="plan_id"/>
+        <result property="orderId" column="order_id"/>
         <result property="licensePlate" column="license_plate"/>
         <result property="consigneeUnit" column="consignee_unit"/>
         <result property="senderUnit" column="sender_unit"/>
@@ -26,5 +27,87 @@
         <result property="updateBy" column="update_by"/>
     </resultMap>
 
+    <resultMap type="com.klp.domain.vo.WmsDeliveryWaybillVo" id="WmsDeliveryWaybillVoResult">
+        <result property="waybillId" column="waybill_id"/>
+        <result property="waybillNo" column="waybill_no"/>
+        <result property="waybillName" column="waybill_name"/>
+        <result property="planId" column="plan_id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="orderCode" column="order_code"/>
+        <result property="contractCode" column="contract_code"/>
+        <result property="licensePlate" column="license_plate"/>
+        <result property="consigneeUnit" column="consignee_unit"/>
+        <result property="senderUnit" column="sender_unit"/>
+        <result property="deliveryTime" column="delivery_time"/>
+        <result property="weighbridge" column="weighbridge"/>
+        <result property="salesPerson" column="sales_person"/>
+        <result property="principal" column="principal"/>
+        <result property="principalPhone" column="principal_phone"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <select id="selectVoPagePlus" resultMap="WmsDeliveryWaybillVoResult">
+        SELECT 
+            wd.waybill_id AS waybill_id,
+            wd.waybill_no AS waybill_no,
+            wd.waybill_name AS waybill_name,
+            wd.plan_id AS plan_id,
+            wd.order_id AS order_id,
+            co.order_code AS order_code,
+            co.contract_code AS contract_code,
+            wd.license_plate AS license_plate,
+            wd.consignee_unit AS consignee_unit,
+            wd.sender_unit AS sender_unit,
+            wd.delivery_time AS delivery_time,
+            wd.weighbridge AS weighbridge,
+            wd.sales_person AS sales_person,
+            wd.principal AS principal,
+            wd.principal_phone AS principal_phone,
+            wd.status AS status,
+            wd.remark AS remark,
+            wd.del_flag AS del_flag,
+            wd.create_time AS create_time,
+            wd.create_by AS create_by,
+            wd.update_time AS update_time,
+            wd.update_by AS update_by
+        FROM wms_delivery_waybill wd
+        LEFT JOIN crm_order co ON wd.order_id = co.order_id
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectVoListPlus" resultMap="WmsDeliveryWaybillVoResult">
+        SELECT 
+            wd.waybill_id AS waybill_id,
+            wd.waybill_no AS waybill_no,
+            wd.waybill_name AS waybill_name,
+            wd.plan_id AS plan_id,
+            wd.order_id AS order_id,
+            co.order_code AS order_code,
+            co.contract_code AS contract_code,
+            wd.license_plate AS license_plate,
+            wd.consignee_unit AS consignee_unit,
+            wd.sender_unit AS sender_unit,
+            wd.delivery_time AS delivery_time,
+            wd.weighbridge AS weighbridge,
+            wd.sales_person AS sales_person,
+            wd.principal AS principal,
+            wd.principal_phone AS principal_phone,
+            wd.status AS status,
+            wd.remark AS remark,
+            wd.del_flag AS del_flag,
+            wd.create_time AS create_time,
+            wd.create_by AS create_by,
+            wd.update_time AS update_time,
+            wd.update_by AS update_by
+        FROM wms_delivery_waybill wd
+        LEFT JOIN crm_order co ON wd.order_id = co.order_id
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>

From eb541f850c38eb34a1adca6134be06df3b1b91de Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 11:28:30 +0800
Subject: [PATCH 25/29] =?UTF-8?q?fix(delivery):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 delFlag 字段的映射配置
- 在 CRM 订单关联查询中添加了删除标记过滤条件
- 确保只查询未删除的订单数据
- 修复了可能因已删除订单导致的数据不一致问题
---
 .../resources/mapper/klp/WmsDeliveryWaybillMapper.xml    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
index 6147a756..3acfc4c8 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
@@ -45,7 +45,6 @@
         <result property="principalPhone" column="principal_phone"/>
         <result property="status" column="status"/>
         <result property="remark" column="remark"/>
-        <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
         <result property="updateTime" column="update_time"/>
@@ -53,7 +52,7 @@
     </resultMap>
 
     <select id="selectVoPagePlus" resultMap="WmsDeliveryWaybillVoResult">
-        SELECT 
+        SELECT
             wd.waybill_id AS waybill_id,
             wd.waybill_no AS waybill_no,
             wd.waybill_name AS waybill_name,
@@ -77,12 +76,12 @@
             wd.update_time AS update_time,
             wd.update_by AS update_by
         FROM wms_delivery_waybill wd
-        LEFT JOIN crm_order co ON wd.order_id = co.order_id
+        LEFT JOIN crm_order co ON wd.order_id = co.order_id and co.del_flag = 0
         ${ew.customSqlSegment}
     </select>
 
     <select id="selectVoListPlus" resultMap="WmsDeliveryWaybillVoResult">
-        SELECT 
+        SELECT
             wd.waybill_id AS waybill_id,
             wd.waybill_no AS waybill_no,
             wd.waybill_name AS waybill_name,
@@ -106,7 +105,7 @@
             wd.update_time AS update_time,
             wd.update_by AS update_by
         FROM wms_delivery_waybill wd
-        LEFT JOIN crm_order co ON wd.order_id = co.order_id
+        LEFT JOIN crm_order co ON wd.order_id = co.order_id and co.del_flag = 0
         ${ew.customSqlSegment}
     </select>
 

From c80cf15730952c1a5332452f08b4215166a62f9b Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 11:31:46 +0800
Subject: [PATCH 26/29] =?UTF-8?q?refactor(mapper):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 从主查询结果映射中移除 del_flag 字段
- 从关联查询结果映射中移除 del_flag 字段
- 简化数据传输对象结构
- 减少不必要的数据库字段映射
- 提升查询性能和代码简洁性
---
 .../src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
index 3acfc4c8..7094a124 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillMapper.xml
@@ -70,7 +70,6 @@
             wd.principal_phone AS principal_phone,
             wd.status AS status,
             wd.remark AS remark,
-            wd.del_flag AS del_flag,
             wd.create_time AS create_time,
             wd.create_by AS create_by,
             wd.update_time AS update_time,
@@ -99,7 +98,6 @@
             wd.principal_phone AS principal_phone,
             wd.status AS status,
             wd.remark AS remark,
-            wd.del_flag AS del_flag,
             wd.create_time AS create_time,
             wd.create_by AS create_by,
             wd.update_time AS update_time,

From 81d278a16e0ab265fe1a861e757a370a1c3e51a2 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 13:12:05 +0800
Subject: [PATCH 27/29] =?UTF-8?q?refactor(domain):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=AF=B9=E8=B1=A1=E7=BB=A7=E6=89=BF=E5=9F=BA=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 BaseEntity 继承以支持基础字段
- 导入 Excel 忽略未注解功能
- 统一数据传输对象结构设计
---
 .../main/java/com/klp/domain/vo/WmsDeliveryPlanDetailVo.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanDetailVo.java
index 889cc777..ec100520 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanDetailVo.java
@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 
@@ -15,7 +16,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsDeliveryPlanDetailVo {
+public class WmsDeliveryPlanDetailVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

From adb0d85e912966d12214c2bf5fe3e5fef53a5443 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 3 Feb 2026 13:42:01 +0800
Subject: [PATCH 28/29] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=88=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsCheckTaskServiceImpl中添加按创建时间倒序排序逻辑
- 使用orderByDesc方法实现质检任务列表的倒序显示
- 确保最新创建的质检任务优先展示
---
 .../com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
index 2ffc9b96..35701c2e 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
@@ -242,6 +242,8 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService {
         lqw.like(StringUtils.isNotBlank(bo.getUnitGroup()), WmsCheckTask::getUnitGroup, bo.getUnitGroup());
         lqw.eq(bo.getInspectionResult() != null, WmsCheckTask::getInspectionResult, bo.getInspectionResult());
         lqw.like(StringUtils.isNotBlank(bo.getInspectionType()), WmsCheckTask::getInspectionType, bo.getInspectionType());
+        // 倒叙
+        lqw.orderByDesc(WmsCheckTask::getCreateTime);
         return lqw;
     }
 

From d84743635768148c0b61e0252290a13908c278bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 3 Feb 2026 13:53:10 +0800
Subject: [PATCH 29/29] =?UTF-8?q?feat(crm/order):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=B9=B6=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=A2=E5=8D=95=E7=BB=91=E5=AE=9A=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单编辑、详情和表格中添加合同号字段
- 创建新的OrderTable组件用于订单选择
- 添加发货单与订单的绑定功能
- 在运单详情中显示合同号信息
- 调整表格列宽和字体大小
---
 klp-ui/src/views/crm/bind/index.vue           | 157 ++++++++++++++++++
 klp-ui/src/views/crm/components/OrderEdit.vue |   6 +
 .../src/views/crm/components/OrderTable.vue   |  64 +++++++
 klp-ui/src/views/crm/order/index.vue          |   5 +-
 .../wms/delivery/components/detailTable.vue   |   4 +-
 .../views/wms/delivery/components/wayBill.vue |  54 +++---
 6 files changed, 267 insertions(+), 23 deletions(-)
 create mode 100644 klp-ui/src/views/crm/bind/index.vue
 create mode 100644 klp-ui/src/views/crm/components/OrderTable.vue

diff --git a/klp-ui/src/views/crm/bind/index.vue b/klp-ui/src/views/crm/bind/index.vue
new file mode 100644
index 00000000..8e8b95eb
--- /dev/null
+++ b/klp-ui/src/views/crm/bind/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="发货单名称" prop="waybillName">
+        <el-input v-model="queryParams.waybillName" placeholder="请输入发货单名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="收货单位" prop="consigneeUnit">
+        <el-input v-model="queryParams.consigneeUnit" 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-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" :disabled="!selectedPlan"
+          title="请先选择发货计划">新增</el-button> -->
+        <el-button type="success" plain icon="el-icon-refresh" size="mini" @click="handleQuery">刷新</el-button>
+        <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button> -->
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" border :data="deliveryWaybillList" highlight-current-row>
+      <el-table-column label="发货单唯一ID" align="center" prop="waybillId" v-if="false" />
+      <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="senderUnit" />
+      <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="principalPhone" width="100" />
+      <el-table-column label="完成状态" align="center" prop="status" width="120">
+        <template slot-scope="scope">
+          <el-tag size="mini" type="success" v-if="scope.row.status === 1">已发货</el-tag>
+          <el-tag size="mini" type="info" v-else>未发货</el-tag>
+          <!-- <el-select v-model="scope.row.status" placeholder="请选择完成状态" @change="handleStatusChange(scope.row)">
+            <el-option label="已发货" :value="1" />
+            <el-option label="未发货" :value="0" />
+          </el-select> -->
+        </template>
+      </el-table-column>
+      <el-table-column label="订单合同号" align="center" prop="contractCode" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-paperclip" @click.stop="handleBind(scope.row)">绑定订单</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === 1" title="已发货的发货单不能修改"
+            @click.stop="handleUpdate(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" :disabled="scope.row.status === 1"
+            title="已发货的发货单不能删除" @click.stop="handleDelete(scope.row)">删除</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <el-dialog title="选择订单" :visible.sync="dialogVisible" width="80%">
+      <order-table ref="orderTable" @row-click="submitBind" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDeliveryWaybill, updateDeliveryWaybill } from "@/api/wms/deliveryWaybill";
+import OrderTable from "../components/OrderTable.vue";
+
+export default {
+  data() {
+    return {
+      deliveryWaybillList: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        waybillName: '',
+        consigneeUnit: ''
+      },
+      dialogVisible: false,
+      currentWaybill: {},
+      currentWaybillDetails: [],
+      loading: false,
+      showSearch: true,
+    }
+  },
+  components: {
+    OrderTable,
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    /** 完成状态改变时的处理 */
+    handleStatusChange(row) {
+      // 确保在更新状态时包含waybillId
+      updateDeliveryWaybillStatus({
+        waybillId: row.waybillId,
+        status: row.status
+      }).then(() => {
+        this.$modal.msgSuccess("状态更新成功");
+        this.getList(); // 刷新列表
+      });
+    },
+    /** 查询发货单列表 */
+    getList() {
+      this.loading = true;
+      // 确保查询参数包含planId
+      const params = {
+        ...this.queryParams,
+        // 如果选中了计划，传递planId，否则不传递该参数
+        planId: this.selectedPlan ? this.selectedPlan.planId : undefined
+      };
+      listDeliveryWaybill(params).then(response => {
+        this.deliveryWaybillList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleBind(row) {
+      this.dialogVisible = true;
+      this.currentWaybill = row;
+    },
+    submitBind(order) {
+      this.loading = true;
+      this.dialogVisible = false;
+      updateDeliveryWaybill({
+        ...this.currentWaybill,
+        orderId: order.orderId,
+      }).then(() => {
+        this.loading = false;
+        this.$modal.msgSuccess("绑定成功");
+        this.getList();
+      }).catch(() => {
+        this.$modal.msgError("绑定失败");
+        this.dialogVisible = true;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/deliveryWaybill/export', {
+        ...this.queryParams
+      }, `deliveryWaybill_${new Date().getTime()}.xlsx`)
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/crm/components/OrderEdit.vue b/klp-ui/src/views/crm/components/OrderEdit.vue
index 304c84eb..889bc807 100644
--- a/klp-ui/src/views/crm/components/OrderEdit.vue
+++ b/klp-ui/src/views/crm/components/OrderEdit.vue
@@ -48,6 +48,12 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="合同号" prop="contractCode">
+            <el-input v-model="form.contractCode" placeholder="请输入合同号"></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :rows="4" />
diff --git a/klp-ui/src/views/crm/components/OrderTable.vue b/klp-ui/src/views/crm/components/OrderTable.vue
new file mode 100644
index 00000000..6db9f556
--- /dev/null
+++ b/klp-ui/src/views/crm/components/OrderTable.vue
@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="orderList" height="400px" highlight-current-row @row-click="handleRowClick">
+      <el-table-column label="订单编号" align="center" prop="orderCode" />
+      <el-table-column label="客户" align="center" prop="companyName" />
+      <el-table-column label="总金额" align="center" prop="orderAmount" />
+      <el-table-column label="销售员" align="center" prop="salesman" />
+      <el-table-column label="合同号" align="center" prop="contractCode" />
+
+      <el-table-column label="交货日期" align="center" prop="deliveryDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deliveryDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="orderType">
+        <template slot-scope="scope">
+          <span v-if="scope.row.orderType === 0" class="text-primary">未审核</span>
+          <span v-else-if="scope.row.orderType === 1">已审核</span>
+          <span v-else>未知状态</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { listOrder } from "@/api/crm/order";
+
+export default {
+  name: 'OrderTable',
+  data() {
+    return {
+      orderList: [],
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderNo: '',
+        customerName: '',
+      },
+      loading: false,
+    }
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      listOrder(this.queryParams).then(res => {
+        this.orderList = res.rows
+        this.total = res.total
+        this.loading = false
+      })
+    },
+    handleRowClick(row) {
+      this.$emit('row-click', row)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/crm/order/index.vue b/klp-ui/src/views/crm/order/index.vue
index 46a66d73..99db2513 100644
--- a/klp-ui/src/views/crm/order/index.vue
+++ b/klp-ui/src/views/crm/order/index.vue
@@ -50,7 +50,7 @@
                 <el-descriptions-item label="订单编号">{{ form.orderCode }}</el-descriptions-item>
                 <el-descriptions-item label="销售员">{{ form.salesman }}</el-descriptions-item>
                 <el-descriptions-item label="交货日期">{{ form.deliveryDate }}</el-descriptions-item>
-
+                <el-descriptions-item label="合同号">{{ form.contractCode }}</el-descriptions-item>
                 <el-descriptions-item label="客户公司">{{ form.companyName }}</el-descriptions-item>
                 <el-descriptions-item label="联系人">{{ form.contactPerson }}</el-descriptions-item>
                 <el-descriptions-item label="联系电话">{{ form.contactWay }}</el-descriptions-item>
@@ -113,6 +113,9 @@
         <el-form-item label="销售员" prop="salesman">
           <el-input v-model="form.salesman" placeholder="请输入销售员" />
         </el-form-item>
+        <el-form-item label="合同号" prop="contractCode">
+          <el-input v-model="form.contractCode" placeholder="请输入合同号" />
+        </el-form-item>
         <el-form-item label="交货日期" prop="deliveryDate">
           <el-date-picker clearable v-model="form.deliveryDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择交货日期">
diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue
index 24e3d435..f8dcef96 100644
--- a/klp-ui/src/views/wms/delivery/components/detailTable.vue
+++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue
@@ -33,7 +33,7 @@
         <el-table-column label="数量" align="center" prop="quantity" />
         <el-table-column label="重量" align="center" prop="weight" />
         <!-- <el-table-column label="单价" align="center" prop="unitPrice" /> -->
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
@@ -106,7 +106,7 @@
         <el-form-item label="单价" prop="unitPrice">
           <el-input v-model="form.unitPrice" placeholder="请输入单价" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="备注" prop="remark" >
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 6afad7fc..487e97fa 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -34,6 +34,10 @@
           <span class="label">电话：</span>
           <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principalPhone }}</div>
         </div>
+        <div class="header-right">
+          <span class="label">合同号：</span>
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.contractCode }}</div>
+        </div>
         <div class="header-center">
           <span class="label">车牌：</span>
           <div class="editable-input transparent-input" contenteditable>{{ localWaybill.licensePlate }}</div>
@@ -54,9 +58,9 @@
             <th>规格</th>
             <th>材质</th>
             <!-- <th>数量（件）</th> -->
-            <th>重量（T）</th>
-            <!-- <th>单价</th> -->
-
+            <th>重量(t)</th>
+            <th>单价</th>
+            <th>备注</th>
           </tr>
         </thead>
         <tbody>
@@ -83,7 +87,8 @@
                 placeholder="0" /></td> -->
             <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
                 placeholder="0.00" /></td>
-            <!-- <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></td> -->
+            <td><div class="table-input transparent-input" contenteditable>{{ item.unitPrice }}</div></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.remark }}</div></td>
           </tr>
           <!-- 加粗最后一行的线 -->
           <tr style="height: 0;">
@@ -99,6 +104,8 @@
             <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
                 placeholder="0" /></td> -->
             <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
           </tr>
         </tbody>
       </table>
@@ -207,7 +214,8 @@ export default {
             principal: newVal.principal || '',
             principalPhone: newVal.principalPhone || '',
             licensePlate: newVal.licensePlate || '',
-            pickupLocation: newVal.pickupLocation || ''
+            pickupLocation: newVal.pickupLocation || '',
+            contractCode: newVal.contractCode || ''
           };
         }
       },
@@ -551,7 +559,7 @@ export default {
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
-  font-size: 18px;
+  font-size: 16px;
   font-weight: 900;
   padding: 0;
   overflow: hidden;
@@ -561,7 +569,7 @@ export default {
 /* 表格列宽设置 */
 .waybill-table th:nth-child(1),
 .waybill-table td:nth-child(1) {
-  width: 60px;
+  width: 70px;
   /* 品名 */
 }
 
@@ -573,37 +581,37 @@ export default {
 
 .waybill-table th:nth-child(3),
 .waybill-table td:nth-child(3) {
-  width: 40px;
+  width: 50px;
   /* 包装 */
 }
 
 .waybill-table th:nth-child(4),
 .waybill-table td:nth-child(4) {
-  width: 80px;
+  width: 90px;
   /* 仓库位置 */
 }
 
 .waybill-table th:nth-child(5),
 .waybill-table td:nth-child(5) {
-  width: 40px;
+  width: 60px;
   /* 结算 */
 }
 
 .waybill-table th:nth-child(6),
 .waybill-table td:nth-child(6) {
-  width: 80px;
+  width: 70px;
   /* 原料厂家 */
 }
 
 .waybill-table th:nth-child(7),
 .waybill-table td:nth-child(7) {
-  width: 100px;
+  width: 110px;
   /* 卷号 */
 }
 
 .waybill-table th:nth-child(8),
 .waybill-table td:nth-child(8) {
-  width: 80px;
+  width: 90px;
   /* 规格 */
 }
 
@@ -620,18 +628,24 @@ export default {
 
 } */
 
+  /* 重量（kg） */
 .waybill-table th:nth-child(10),
 .waybill-table td:nth-child(10) {
-  width: 80px;
-  /* 重量（kg） */
+  width: 70px;
+
 }
 
   /* 单价 */
-/* .waybill-table th:nth-child(12),
-.waybill-table td:nth-child(12) {
-  width: 40px;
+.waybill-table th:nth-child(11),
+.waybill-table td:nth-child(11) {
+  width: 50px;
+}
 
-} */
+  /* 备注 */
+.waybill-table th:nth-child(12),
+.waybill-table td:nth-child(12) {
+  /* width: 40px; */
+}
 
 
 .waybill-table th {
@@ -654,7 +668,7 @@ export default {
   outline: none;
   background: transparent;
   /* font-family: inherit; */
-  font-size: 18px;
+  font-size: 16px;
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;