From 569dc4c3c93fb8c47bd4d1dccaaa07cd564eb6b2 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 8 Dec 2025 11:43:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEcoil=5Fid=E6=9F=A5=E8=AF=A2=E9=92=A2=E5=8D=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在IWmsDeliveryPlanService中新增getCoilInfoByIds方法定义 - 在WmsDeliveryPlanController中添加/coils GET接口用于查询钢卷信息 - 在WmsDeliveryPlanServiceImpl中实现根据逗号分隔的coil_id字符串查询钢卷信息逻辑 - 引入WmsMaterialCoil实体类和WmsMaterialCoilMapper数据访问层组件 - 使用Stream API处理coil_id字符串分割、过滤及类型转换操作 - 返回封装后的WmsMaterialCoilVo对象列表供前端使用 --- .../controller/WmsDeliveryPlanController.java | 18 +++++++++--- .../klp/service/IWmsDeliveryPlanService.java | 3 ++ .../impl/WmsDeliveryPlanServiceImpl.java | 28 +++++++++++++++++++ 3 files changed, 45 insertions(+), 4 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 c98caf82..ee80a9e5 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryPlanController.java @@ -5,9 +5,7 @@ import java.util.List; import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonFormat; -import com.klp.domain.vo.WmsDeliveryPlanStatisticsVo; -import com.klp.domain.vo.WmsDeliveryReportResultVo; -import com.klp.domain.vo.WmsDeliveryReportVo; +import com.klp.domain.vo.*; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -24,7 +22,6 @@ import com.klp.common.core.validate.AddGroup; import com.klp.common.core.validate.EditGroup; import com.klp.common.enums.BusinessType; import com.klp.common.utils.poi.ExcelUtil; -import com.klp.domain.vo.WmsDeliveryPlanVo; import com.klp.domain.bo.WmsDeliveryPlanBo; import com.klp.service.IWmsDeliveryPlanService; import com.klp.common.core.page.TableDataInfo; @@ -129,4 +126,17 @@ public class WmsDeliveryPlanController extends BaseController { WmsDeliveryReportResultVo report = iWmsDeliveryPlanService.getDeliveryReport(startTime, endTime); return R.ok(report); } + + + /** + * 根据逗号分隔的coil_id字符串查询对应的钢卷信息 + * + * @param coilIds 逗号分隔的coil_id字符串 + * @return 钢卷信息列表 + */ + @GetMapping("/coils") + public R> getCoilInfoByIds(@RequestParam String coilIds) { + List coilInfoList = iWmsDeliveryPlanService.getCoilInfoByIds(coilIds); + return R.ok(coilInfoList); + } } 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 951aa642..14ef261a 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryPlanService.java @@ -7,6 +7,7 @@ import com.klp.domain.bo.WmsDeliveryPlanBo; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.klp.domain.vo.WmsDeliveryReportResultVo; +import com.klp.domain.vo.WmsMaterialCoilVo; import java.util.Collection; import java.util.Date; @@ -59,4 +60,6 @@ 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 e8381f69..6fd66f9c 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 @@ -8,7 +8,9 @@ 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.klp.common.utils.StringUtils; +import com.klp.domain.WmsMaterialCoil; import com.klp.domain.vo.*; +import com.klp.mapper.WmsMaterialCoilMapper; import com.klp.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -34,6 +36,8 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService { private final ISysUserService userService; + private final WmsMaterialCoilMapper coilMapper; + /** * 查询发货计划 */ @@ -163,4 +167,28 @@ 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); + } }