DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(service): 更新退火性能服务查询方法

Browse Source 
- 在 IWmsAnnealPerformanceService 接口中添加 WmsMaterialCoilBo 参数
- 修改 queryPlanCoils 方法签名以支持额外的筛选条件
- 更新控制器 WmsAnnealPerformanceController 中的 getRawCoils 方法参数
- 实现类 WmsAnnealPerformanceServiceImpl 中相应调整方法实现
- 钢卷查询逻辑从硬编码改为通过 coilBo 传入筛选条件
This commit is contained in:
Joshi
2026-07-11 17:57:40 +08:00
parent ee17d558f2
commit a83a8147a4
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java
View File

@@ -2,6 +2,7 @@ package com.klp.controller;
import com.klp.common.core.domain.R; import com.klp.common.core.domain.R;
import com.klp.domain.bo.WmsAnnealPerformanceBo; import com.klp.domain.bo.WmsAnnealPerformanceBo;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo;
import com.klp.service.IWmsAnnealPerformanceService; import com.klp.service.IWmsAnnealPerformanceService;
@@ -36,7 +37,7 @@ public class WmsAnnealPerformanceController {
* 查询退火计划中的加工前钢卷列表 * 查询退火计划中的加工前钢卷列表
*/ */
@GetMapping("/rawCoils") @GetMapping("/rawCoils")
public R<List<WmsMaterialCoilVo>> getRawCoils(WmsAnnealPerformanceBo bo) { public R<List<WmsMaterialCoilVo>> getRawCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) {
return R.ok(performanceService.queryPlanCoils(bo)); return R.ok(performanceService.queryPlanCoils(bo, coilBo));
} }
} }

3
klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java
View File

@@ -1,6 +1,7 @@
package com.klp.service; package com.klp.service;
import com.klp.domain.bo.WmsAnnealPerformanceBo; import com.klp.domain.bo.WmsAnnealPerformanceBo;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo;
@@ -19,5 +20,5 @@ public interface IWmsAnnealPerformanceService {
/** /**
* 查询退火计划中的加工前钢卷列表 * 查询退火计划中的加工前钢卷列表
*/ */
List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo); List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo);
} }

5
klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java
View File

@@ -204,7 +204,7 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
} }
@Override @Override
public List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo) { public List<WmsMaterialCoilVo> queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) {
// 1. 查询退火计划 // 1. 查询退火计划
LambdaQueryWrapper<WmsFurnacePlan> planQw = new LambdaQueryWrapper<WmsFurnacePlan>() LambdaQueryWrapper<WmsFurnacePlan> planQw = new LambdaQueryWrapper<WmsFurnacePlan>()
.ge(bo.getStartTime() != null, WmsFurnacePlan::getActualStartTime, bo.getStartTime()) .ge(bo.getStartTime() != null, WmsFurnacePlan::getActualStartTime, bo.getStartTime())
@@ -236,8 +236,7 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
return Collections.emptyList(); return Collections.emptyList();
} }
// 3. 按coilId直接查询加工前的钢卷 // 3. 按coilId查询加工前的钢卷，筛选条件由coilBo带入
WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo();
coilBo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(","))); coilBo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
PageQuery pageQuery = new PageQuery(); PageQuery pageQuery = new PageQuery();
pageQuery.setPageNum(1); pageQuery.setPageNum(1);