From 0b792edafdc85c615cb28d6c9bb5b5188e4f52c6 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 8 Dec 2025 13:55:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor(delivery):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E9=92=A2=E5=8D=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 IWmsDeliveryPlanService 中的 getCoilInfoByIds 方法定义 - 删除 WmsDeliveryPlanBo 中冗余的 coilIds 字段 - 移除 WmsDeliveryPlanController 中独立的 /coils 接口实现 - 删除 WmsDeliveryPlanServiceImpl 中 getCoilInfoByIds 的具体实现 - 在 WmsMaterialCoilBo 中重新添加 coilIds 字段用于批量查询 - 优化 WmsMaterialCoilServiceImpl 中对 coilIds 的解析与查询逻辑 - 增强 coilIds 解析健壮性，忽略无效 ID 并防止空值异常 --- .../controller/WmsDeliveryPlanController.java | 11 --------- .../com/klp/domain/bo/WmsDeliveryPlanBo.java | 2 -- .../com/klp/domain/bo/WmsMaterialCoilBo.java | 5 ++++ .../klp/service/IWmsDeliveryPlanService.java | 2 -- .../impl/WmsDeliveryPlanServiceImpl.java | 23 ------------------- .../impl/WmsMaterialCoilServiceImpl.java | 17 ++++++++++++++ 6 files changed, 22 insertions(+), 38 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java index a71b13e9..04d71303 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java @@ -6,7 +6,6 @@ import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.domain.vo.*; -import liquibase.pro.packaged.W; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -129,14 +128,4 @@ public class WmsDeliveryPlanController extends BaseController { } - /** - * 根据逗号分隔的coil_id字符串查询对应的钢卷信息 - * - * @return 钢卷信息列表 - */ - @PostMapping("/coils") - public R> getCoilInfoByIds(@RequestBody WmsDeliveryPlanBo bo) { - List coilInfoList = iWmsDeliveryPlanService.getCoilInfoByIds(bo.getCoilIds()); - return R.ok(coilInfoList); - } } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java index 0fbb53ce..47611b11 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java @@ -46,7 +46,5 @@ public class WmsDeliveryPlanBo extends BaseEntity { // 钢卷集合 private String coil; - private String coilIds; - } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 25488627..7ed360e4 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -160,5 +160,10 @@ public class WmsMaterialCoilBo extends BaseEntity { */ private Integer minAbnormalCount; + /** + * 钢卷ID列表（逗号分隔，用于根据ID列表查询钢卷） + */ + private String coilIds; + } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java index 14ef261a..8fe1752b 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java @@ -60,6 +60,4 @@ public interface IWmsDeliveryPlanService { * 获取发货报表统计信息（包含汇总和按类型统计） */ WmsDeliveryReportResultVo getDeliveryReport(Date startTime, Date endTime); - - List getCoilInfoByIds(String coilIds); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java index 6fd66f9c..422a6372 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java @@ -168,27 +168,4 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService { return result; } - - /** - * 根据逗号分隔的coil_id字符串查询对应的钢卷信息 - * - * @param coilIds 逗号分隔的coil_id字符串 - * @return 钢卷信息列表 - */ - @Override - public List getCoilInfoByIds(String coilIds) { - if (StringUtils.isBlank(coilIds)) { - return Collections.emptyList(); - } - - // 将逗号分隔的字符串转换为ID列表 - List idList = Arrays.stream(coilIds.split(",")) - .map(String::trim) - .filter(s -> !s.isEmpty()) - .map(Long::valueOf) - .collect(Collectors.toList()); - - // 查询对应的钢卷信息 - return coilMapper.selectVoBatchIds(idList); - } } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 4a4f8ec7..4dda2338 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -350,6 +350,23 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 兼容原来的itemId单值查询 qw.eq("mc.item_id", bo.getItemId()); } + // 添加coilIds查询条件，支持逗号分隔的多个coilId查询 + if (StringUtils.isNotBlank(bo.getCoilIds())) { + String[] coilIdArray = bo.getCoilIds().split(","); + List coilIdList = new ArrayList<>(); + for (String coilIdStr : coilIdArray) { + if (StringUtils.isNotBlank(coilIdStr)) { + try { + coilIdList.add(Long.parseLong(coilIdStr.trim())); + } catch (NumberFormatException e) { + // 忽略无效的ID格式 + } + } + } + if (!coilIdList.isEmpty()) { + qw.in("mc.coil_id", coilIdList); + } + } //逻辑删除 qw.eq("mc.del_flag", 0); //把team字段作为筛选条件