From 49606bf823cb9db5d0ccca987eb079c64461ea1b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 13 Jul 2026 10:45:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor(anneal):=20=E4=BC=98=E5=8C=96=E9=80=80?= =?UTF-8?q?=E7=81=AB=E6=80=A7=E8=83=BD=E6=9C=8D=E5=8A=A1=E7=9A=84=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将查询方法参数从两个独立BO合并为单一的WmsAnnealPlanCoilBo复合BO - 修改queryPlanCoils方法签名以使用新的复合查询对象 - 更新控制器层接口调用方式并改为POST请求方法 - 添加空值检查逻辑避免潜在的空指针异常 - 创建WmsAnnealPlanCoilBo复合数据传输对象用于封装查询条件 - 调整查询参数传递方式提高代码可读性和维护性 --- .../WmsAnnealPerformanceController.java | 12 +++++------- .../com/klp/domain/bo/WmsAnnealPlanCoilBo.java | 17 +++++++++++++++++ .../service/IWmsAnnealPerformanceService.java | 4 ++-- .../impl/WmsAnnealPerformanceServiceImpl.java | 16 +++++++++++----- 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPlanCoilBo.java 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 b04b7408e..4524aa2bc 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsAnnealPerformanceController.java @@ -2,15 +2,13 @@ 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.bo.WmsAnnealPlanCoilBo; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo; import com.klp.service.IWmsAnnealPerformanceService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -36,8 +34,8 @@ public class WmsAnnealPerformanceController { /** * 查询退火计划中的加工前钢卷列表 */ - @GetMapping("/rawCoils") - public R> getRawCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) { - return R.ok(performanceService.queryPlanCoils(bo, coilBo)); + @PostMapping("/rawCoils") + public R> getRawCoils(@RequestBody WmsAnnealPlanCoilBo bo) { + return R.ok(performanceService.queryPlanCoils(bo)); } } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPlanCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPlanCoilBo.java new file mode 100644 index 000000000..10bcfc159 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsAnnealPlanCoilBo.java @@ -0,0 +1,17 @@ +package com.klp.domain.bo; + +import lombok.Data; + +/** + * 退火计划钢卷查询复合BO + * + * @author klp + * @date 2026-07-14 + */ +@Data +public class WmsAnnealPlanCoilBo { + + private WmsAnnealPerformanceBo planBo; + + private WmsMaterialCoilBo 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 6e08554db..b3ee8b38b 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsAnnealPerformanceService.java @@ -1,7 +1,7 @@ package com.klp.service; import com.klp.domain.bo.WmsAnnealPerformanceBo; -import com.klp.domain.bo.WmsMaterialCoilBo; +import com.klp.domain.bo.WmsAnnealPlanCoilBo; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceVo; @@ -20,5 +20,5 @@ public interface IWmsAnnealPerformanceService { /** * 查询退火计划中的加工前钢卷列表 */ - List queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo); + List queryPlanCoils(WmsAnnealPlanCoilBo bo); } 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 893cc2016..2bfa1383b 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 @@ -5,6 +5,7 @@ import com.klp.common.core.domain.PageQuery; import com.klp.common.core.page.TableDataInfo; import com.klp.common.utils.StringUtils; import com.klp.domain.bo.WmsAnnealPerformanceBo; +import com.klp.domain.bo.WmsAnnealPlanCoilBo; import com.klp.domain.bo.WmsMaterialCoilBo; import com.klp.domain.vo.WmsMaterialCoilVo; import com.klp.domain.vo.anneal.WmsAnnealPerformanceDetailVo; @@ -210,13 +211,18 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer } @Override - public List queryPlanCoils(WmsAnnealPerformanceBo bo, WmsMaterialCoilBo coilBo) { + public List queryPlanCoils(WmsAnnealPlanCoilBo bo) { + WmsAnnealPerformanceBo planBo = bo.getPlanBo(); + WmsMaterialCoilBo coilBo = bo.getCoilBo(); + if (planBo == null || coilBo == null) { + return Collections.emptyList(); + } // 1. 查询退火计划 LambdaQueryWrapper planQw = new LambdaQueryWrapper() - .ge(bo.getStartTime() != null, WmsFurnacePlan::getActualStartTime, bo.getStartTime()) - .le(bo.getEndTime() != null, WmsFurnacePlan::getActualStartTime, bo.getEndTime()) - .eq(bo.getTargetFurnaceId() != null, WmsFurnacePlan::getTargetFurnaceId, bo.getTargetFurnaceId()) - .like(StringUtils.isNotBlank(bo.getPlanNo()), WmsFurnacePlan::getPlanNo, bo.getPlanNo()) + .ge(planBo.getStartTime() != null, WmsFurnacePlan::getActualStartTime, planBo.getStartTime()) + .le(planBo.getEndTime() != null, WmsFurnacePlan::getActualStartTime, planBo.getEndTime()) + .eq(planBo.getTargetFurnaceId() != null, WmsFurnacePlan::getTargetFurnaceId, planBo.getTargetFurnaceId()) + .like(StringUtils.isNotBlank(planBo.getPlanNo()), WmsFurnacePlan::getPlanNo, planBo.getPlanNo()) .eq(WmsFurnacePlan::getDelFlag, 0); List plans = planMapper.selectList(planQw);