diff --git a/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java b/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java index c13628186..b04b7408e 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java @@ -2,6 +2,7 @@ package com.klp.controller; import com.klp.common.core.domain.R; import com.klp.domain.bo.WmsAnnealPerformanceBo; +import com.klp.domain.bo.WmsMaterialCoilBo; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo; import com.klp.service.IWmsAnnealPerformanceService; @@ -36,7 +37,7 @@ public class WmsAnnealPerformanceController { * 查询退火计划中的加工前钢卷列表 */ @GetMapping("/rawCoils") - public R> getRawCoils(WmsAnnealPerformanceBo bo) { - return R.ok(performanceService.queryPlanCoils(bo)); + public R> getRawCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) { + return R.ok(performanceService.queryPlanCoils(bo, coilBo)); } } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java b/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java index 61890b130..6e08554db 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java @@ -1,6 +1,7 @@ package com.klp.service; import com.klp.domain.bo.WmsAnnealPerformanceBo; +import com.klp.domain.bo.WmsMaterialCoilBo; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo; @@ -19,5 +20,5 @@ public interface IWmsAnnealPerformanceService { /** * 查询退火计划中的加工前钢卷列表 */ - List queryPlanCoils(WmsAnnealPerformanceBo bo); + List queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java index 4544a10b7..e7356aefe 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAnnealPerformanceServiceImpl.java @@ -204,7 +204,7 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer } @Override - public List queryPlanCoils(WmsAnnealPerformanceBo bo) { + public List queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) { // 1. 查询退火计划 LambdaQueryWrapper planQw = new LambdaQueryWrapper() .ge(bo.getStartTime() != null, WmsFurnacePlan::getActualStartTime, bo.getStartTime()) @@ -236,8 +236,7 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer return Collections.emptyList(); } - // 3. 按coilId直接查询加工前的钢卷 - WmsMaterialCoilBo coilBo = new WmsMaterialCoilBo(); + // 3. 按coilId查询加工前的钢卷,筛选条件由coilBo带入 coilBo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(","))); PageQuery pageQuery = new PageQuery(); pageQuery.setPageNum(1);