From c3b7551240f3ae65d1e79878978348fb78b17647 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 6 Feb 2026 10:30:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(delivery):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E5=85=A5?=
 =?UTF-8?q?=E5=9C=BA=E9=92=A2=E5=8D=B7=E5=8F=B7=E6=98=BE=E7=A4=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入 WmsMaterialCoil 和 WmsMaterialCoilMapper 依赖
- 在 WmsDeliveryWaybillDetailVo 中新增 enterCoilNo 字段
- 实现分页查询时根据 coilId 关联查询入场钢卷号
- 为每个明细记录设置对应的入场钢卷号信息
---
 .../domain/vo/WmsDeliveryWaybillDetailVo.java   |  5 +++++
 .../WmsDeliveryWaybillDetailServiceImpl.java    | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
index 1d5c6864..e10151c2 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
@@ -40,6 +40,11 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity {
     @ExcelDictFormat(readConverterExp = "钢=卷基础信息在钢卷表中")
     private Long coilId;
 
+    /**
+     * 入场钢卷号
+     */
+    private String enterCoilNo;
+
     /**
      * 品名（如：冷硬钢卷、冷轧钢卷）
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
index ea4dfa29..7abb8b2e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
 import com.klp.common.exception.ServiceException;
 import com.klp.domain.WmsDeliveryWaybill;
+import com.klp.domain.WmsMaterialCoil;
 import com.klp.mapper.WmsDeliveryWaybillMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -17,6 +18,7 @@ import com.klp.domain.vo.WmsDeliveryWaybillDetailVo;
 import com.klp.domain.WmsDeliveryWaybillDetail;
 import com.klp.domain.vo.WmsCoilBindInfoVo;
 import com.klp.mapper.WmsDeliveryWaybillDetailMapper;
+import com.klp.mapper.WmsMaterialCoilMapper;
 import com.klp.service.IWmsDeliveryWaybillDetailService;
 
 import java.util.List;
@@ -38,6 +40,8 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD
 
     private final WmsDeliveryWaybillMapper wmsDeliveryWaybillMapper;
 
+    private final WmsMaterialCoilMapper wmsMaterialCoilMapper;
+
     /**
      * 查询发货单明细
      */
@@ -53,6 +57,19 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD
     public TableDataInfo<WmsDeliveryWaybillDetailVo> queryPageList(WmsDeliveryWaybillDetailBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsDeliveryWaybillDetail> lqw = buildQueryWrapper(bo);
         Page<WmsDeliveryWaybillDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        // 为每个明细查询入场钢卷号
+        if (result.getRecords() != null && !result.getRecords().isEmpty()) {
+            result.getRecords().forEach(detail -> {
+                if (detail.getCoilId() != null) {
+                    WmsMaterialCoil materialCoil = wmsMaterialCoilMapper.selectById(detail.getCoilId());
+                    if (materialCoil != null) {
+                        detail.setEnterCoilNo(materialCoil.getEnterCoilNo());
+                    }
+                }
+            });
+        }
+
         return TableDataInfo.build(result);
     }