feat(wms): 添加钢卷打包明细关联钢卷信息查询功能

- 在 WmsCoilPackingDetailServiceImpl 中新增 IWmsMaterialCoilService 依赖注入
- 为分页查询和列表查询方法添加钢卷信息丰富逻辑
- 实现 enrichCoilInfo 方法通过钢卷ID批量获取钢卷完整信息
- 重构 WmsCoilPackingRecordServiceImpl 中的详情查询逻辑
- 移除 WmsCoilPackingDetailVo 中冗余的钢卷字段定义
- 使用关联查询替代原有的独立字段存储方式

klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPackingDetailVo.java

@@ -72,40 +72,6 @@ public class WmsCoilPackingDetailVo {
     @ExcelDictFormat(readConverterExp = "如=：库区A-钢卷1001")
     private String remark;
 
-    /**
-     * 钢卷入场钢卷号
-     */
-    private String coilEnterCoilNo;
-
-    /**
-     * 钢卷当前钢卷号
-     */
-    private String coilCurrentCoilNo;
-
-    /**
-     * 钢卷厂家原料卷号
-     */
-    private String coilSupplierCoilNo;
-
-    /**
-     * 钢卷物品类型
-     */
-    private String coilItemType;
-
-    /**
-     * 钢卷物品ID
-     */
-    private Long coilItemId;
-
-    /**
-     * 钢卷材料类型
-     */
-    private String coilMaterialType;
-
-    /**
-     * 钢卷状态
-     */
-    private Integer coilStatus;
 
     /**
      * 钢卷完整信息

klp-wms/src/main/java/com/klp/service/impl/WmsCoilPackingDetailServiceImpl.java

@@ -6,17 +6,20 @@ 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.WmsCoilPackingDetailBo;
+import com.klp.domain.bo.WmsMaterialCoilBo;
 import com.klp.domain.vo.WmsCoilPackingDetailVo;
+import com.klp.domain.vo.WmsMaterialCoilVo;
 import com.klp.domain.WmsCoilPackingDetail;
 import com.klp.mapper.WmsCoilPackingDetailMapper;
 import com.klp.service.IWmsCoilPackingDetailService;
+import com.klp.service.IWmsMaterialCoilService;
 
-import java.util.List;
+import java.util.*;
-import java.util.Map;
+import java.util.stream.Collectors;
-import java.util.Collection;
 
 /**
  * 钢卷打包明细（存储每个钢卷的库区/重量信息）Service业务层处理
@@ -29,6 +32,7 @@ import java.util.Collection;
 public class WmsCoilPackingDetailServiceImpl implements IWmsCoilPackingDetailService {
 
     private final WmsCoilPackingDetailMapper baseMapper;
+    private final IWmsMaterialCoilService iWmsMaterialCoilService;
 
     /**
      * 查询钢卷打包明细（存储每个钢卷的库区/重量信息）
@@ -45,6 +49,11 @@ public class WmsCoilPackingDetailServiceImpl implements IWmsCoilPackingDetailSer
     public TableDataInfo<WmsCoilPackingDetailVo> queryPageList(WmsCoilPackingDetailBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsCoilPackingDetail> lqw = buildQueryWrapper(bo);
         Page<WmsCoilPackingDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        
+        if (result.getRecords() != null && !result.getRecords().isEmpty()) {
+            enrichCoilInfo(result.getRecords());
+        }
+        
         return TableDataInfo.build(result);
     }
 
@@ -54,7 +63,36 @@ public class WmsCoilPackingDetailServiceImpl implements IWmsCoilPackingDetailSer
     @Override
     public List<WmsCoilPackingDetailVo> queryList(WmsCoilPackingDetailBo bo) {
         LambdaQueryWrapper<WmsCoilPackingDetail> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<WmsCoilPackingDetailVo> list = baseMapper.selectVoList(lqw);
+        
+        if (list != null && !list.isEmpty()) {
+            enrichCoilInfo(list);
+        }
+        
+        return list;
+    }
+
+    private void enrichCoilInfo(List<WmsCoilPackingDetailVo> detailVos) {
+        List<Long> coilIds = detailVos.stream()
+            .map(WmsCoilPackingDetailVo::getCoilId)
+            .filter(Objects::nonNull)
+            .distinct()
+            .collect(Collectors.toList());
+        
+        if (coilIds.isEmpty()) {
+            return;
+        }
+        
+        WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
+        coilBo.setCoilIds(StringUtils.join(coilIds, ","));
+        List<WmsMaterialCoilVo> coilVoList = iWmsMaterialCoilService.queryList(coilBo);
+        
+        Map<Long, WmsMaterialCoilVo> coilMap = coilVoList.stream()
+            .collect(Collectors.toMap(WmsMaterialCoilVo::getCoilId, v -> v, (a, b) -> a));
+        
+        for (WmsCoilPackingDetailVo detailVo : detailVos) {
+            detailVo.setCoil(coilMap.get(detailVo.getCoilId()));
+        }
     }
 
     private LambdaQueryWrapper<WmsCoilPackingDetail> buildQueryWrapper(WmsCoilPackingDetailBo bo) {

klp-wms/src/main/java/com/klp/service/impl/WmsCoilPackingRecordServiceImpl.java

@@ -59,32 +59,25 @@ public class WmsCoilPackingRecordServiceImpl implements IWmsCoilPackingRecordSer
     public TableDataInfo<WmsCoilPackingRecordVo> queryPageList(WmsCoilPackingRecordBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<WmsCoilPackingRecord> lqw = buildQueryWrapper(bo);
         Page<WmsCoilPackingRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        
-        if (result.getRecords() != null && !result.getRecords().isEmpty()) {
-            for (WmsCoilPackingRecordVo recordVo : result.getRecords()) {
-                enrichRecordWithDetails(recordVo);
-            }
-        }
-        
         return TableDataInfo.build(result);
     }
 
     private void enrichRecordWithDetails(WmsCoilPackingRecordVo recordVo) {
         Long packingId = recordVo.getPackingId();
-        
+
         LambdaQueryWrapper<WmsCoilPackingDetail> detailLqw = Wrappers.lambdaQuery();
         detailLqw.eq(WmsCoilPackingDetail::getPackingId, packingId);
         List<WmsCoilPackingDetail> details = detailMapper.selectList(detailLqw);
-        
+
         if (details == null || details.isEmpty()) {
             return;
         }
-        
+
         List<Long> coilIds = new ArrayList<>();
         for (WmsCoilPackingDetail detail : details) {
             coilIds.add(detail.getCoilId());
         }
-        
+
         Map<Long, WmsMaterialCoilVo> coilMap = new HashMap<>();
         if (!coilIds.isEmpty()) {
             WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
@@ -94,14 +87,14 @@ public class WmsCoilPackingRecordServiceImpl implements IWmsCoilPackingRecordSer
                 coilMap.put(coilVo.getCoilId(), coilVo);
             }
         }
-        
+
         List<WmsCoilPackingDetailVo> detailVos = new ArrayList<>();
         for (WmsCoilPackingDetail detail : details) {
             WmsCoilPackingDetailVo detailVo = BeanUtil.toBean(detail, WmsCoilPackingDetailVo.class);
             detailVo.setCoil(coilMap.get(detail.getCoilId()));
             detailVos.add(detailVo);
         }
-        
+
         recordVo.setDetails(detailVos);
     }
 
@@ -112,13 +105,13 @@ public class WmsCoilPackingRecordServiceImpl implements IWmsCoilPackingRecordSer
     public List<WmsCoilPackingRecordVo> queryList(WmsCoilPackingRecordBo bo) {
         LambdaQueryWrapper<WmsCoilPackingRecord> lqw = buildQueryWrapper(bo);
         List<WmsCoilPackingRecordVo> list = baseMapper.selectVoList(lqw);
-        
+
         if (list != null && !list.isEmpty()) {
             for (WmsCoilPackingRecordVo recordVo : list) {
                 enrichRecordWithDetails(recordVo);
             }
         }
-        
+
         return list;
     }