给 cost_item 增加了 production_line_id字段，并加了索引。

后端 CRUD 补齐

klp-cost/src/main/java/com/klp/cost/domain/CostItem.java

@@ -48,6 +48,8 @@ public class CostItem extends BaseEntity {
      * 查询条件（JSON格式）
      */
     private String queryCondition;
+
+    private Long productionLineId;
     /**
      * 删除标识 0=正常 2=删除
      */

klp-cost/src/main/java/com/klp/cost/domain/WmsProductionLineSimple.java

@@ -0,0 +1,16 @@
+package com.klp.cost.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("wms_production_line")
+public class WmsProductionLineSimple {
+
+    @TableId(value = "line_id")
+    private Long lineId;
+
+    private String lineName;
+}
+

klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java

@@ -52,5 +52,7 @@ public class CostItemBo extends BaseEntity {
      */
     private String queryCondition;
 
+    private Long productionLineId;
+
 
 }

klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java

@@ -61,5 +61,10 @@ public class CostItemVo {
     @ExcelProperty(value = "查询条件（JSON格式）")
     private String queryCondition;
 
+    @ExcelProperty(value = "产线ID")
+    private Long productionLineId;
+
+    @ExcelProperty(value = "产线")
+    private String productionLineName;
 
 }

klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java

@@ -1,23 +1,28 @@
 package com.klp.cost.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 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.baomidou.mybatisplus.extension.toolkit.Db;
 import com.klp.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.cost.domain.bo.CostItemBo;
 import com.klp.cost.domain.vo.CostItemVo;
 import com.klp.cost.domain.CostItem;
+import com.klp.cost.domain.WmsProductionLineSimple;
 import com.klp.cost.mapper.CostItemMapper;
 import com.klp.cost.service.ICostItemService;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 成本项目配置Service业务层处理
@@ -36,7 +41,11 @@ public class CostItemServiceImpl implements ICostItemService {
      */
     @Override
     public CostItemVo queryById(Long itemId){
-        return baseMapper.selectVoById(itemId);
+        CostItemVo vo = baseMapper.selectVoById(itemId);
+        if (vo != null) {
+            fillProductionLineName(CollUtil.newArrayList(vo));
+        }
+        return vo;
     }
 
     /**
@@ -46,6 +55,7 @@ public class CostItemServiceImpl implements ICostItemService {
     public TableDataInfo<CostItemVo> queryPageList(CostItemBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<CostItem> lqw = buildQueryWrapper(bo);
         Page<CostItemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        fillProductionLineName(result.getRecords());
         return TableDataInfo.build(result);
     }
 
@@ -55,7 +65,9 @@ public class CostItemServiceImpl implements ICostItemService {
     @Override
     public List<CostItemVo> queryList(CostItemBo bo) {
         LambdaQueryWrapper<CostItem> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<CostItemVo> list = baseMapper.selectVoList(lqw);
+        fillProductionLineName(list);
+        return list;
     }
 
     private LambdaQueryWrapper<CostItem> buildQueryWrapper(CostItemBo bo) {
@@ -66,9 +78,32 @@ public class CostItemServiceImpl implements ICostItemService {
         lqw.eq(StringUtils.isNotBlank(bo.getCategory()), CostItem::getCategory, bo.getCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CostItem::getUnit, bo.getUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getQueryCondition()), CostItem::getQueryCondition, bo.getQueryCondition());
+        lqw.eq(bo.getProductionLineId() != null, CostItem::getProductionLineId, bo.getProductionLineId());
         return lqw;
     }
 
+    private void fillProductionLineName(List<CostItemVo> voList) {
+        if (CollUtil.isEmpty(voList)) {
+            return;
+        }
+        List<Long> lineIds = voList.stream()
+            .map(CostItemVo::getProductionLineId)
+            .filter(Objects::nonNull)
+            .distinct()
+            .collect(Collectors.toList());
+        if (CollUtil.isEmpty(lineIds)) {
+            return;
+        }
+        Map<Long, String> lineNameMap = Db.lambdaQuery(WmsProductionLineSimple.class)
+            .in(WmsProductionLineSimple::getLineId, lineIds)
+            .select(WmsProductionLineSimple::getLineId, WmsProductionLineSimple::getLineName)
+            .list()
+            .stream()
+            .collect(Collectors.toMap(WmsProductionLineSimple::getLineId, WmsProductionLineSimple::getLineName, (a, b) -> a));
+
+        voList.forEach(v -> v.setProductionLineName(lineNameMap.get(v.getProductionLineId())));
+    }
+
     /**
      * 新增成本项目配置
      */

klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit" column="unit"/>
         <result property="remark" column="remark"/>
         <result property="queryCondition" column="query_condition"/>
+        <result property="productionLineId" column="production_line_id"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>