From 931fc74ed700f97e0ba52e3af9a056fa329609e9 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 17 Jun 2026 08:21:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E7=8E=AF=E6=AF=94=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IWmsMaterialCoilService 中新增 queryPeriodComparisonList 方法 - 在 WmsMaterialCoilController 中新增 /listForPeriodComparison 接口 - 在 WmsMaterialCoilMapper 中新增 selectPeriodComparisonList 查询方法 - 修改原 selectPageReportList 为 selectReportList 并调整相关调用 - 新增 WmsMaterialCoilPeriodComparisonVo 数据传输对象 - 添加环比报表专用的 SQL 查询语句，包含实际长度、理论长度、理论厚度字段 --- .../controller/WmsMaterialCoilController.java | 9 +++++ .../vo/WmsMaterialCoilPeriodComparisonVo.java | 35 +++++++++++++++++++ .../com/klp/mapper/WmsMaterialCoilMapper.java | 15 +++++--- .../klp/service/IWmsMaterialCoilService.java | 9 +++++ .../impl/WmsMaterialCoilServiceImpl.java | 13 ++++++- .../mapper/klp/WmsMaterialCoilMapper.xml | 22 +++++++++++- 6 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilPeriodComparisonVo.java diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index db8a7806..4628b1e5 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -71,6 +71,15 @@ public class WmsMaterialCoilController extends BaseController { return iWmsMaterialCoilService.queryReportList(bo); } + /** + * 查询钢卷物料表列表（环比报表专用，轻量级，返回coilId、netWeight、warehouseId、qualityStatus、team、实际长度、理论长度、理论厚度） + * 使用与list相同的查询条件，但额外返回长度与厚度字段用于环比计算 + */ + @PostMapping("/listForPeriodComparison") + public List listForPeriodComparison(@RequestBody WmsMaterialCoilBo bo) { + return iWmsMaterialCoilService.queryPeriodComparisonList(bo); + } + /** * 查询钢卷物料表列表（包含发货绑定增强字段） */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilPeriodComparisonVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilPeriodComparisonVo.java new file mode 100644 index 00000000..3e701762 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilPeriodComparisonVo.java @@ -0,0 +1,35 @@ +package com.klp.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 钢卷物料环比报表VO（轻量级，返回报表展示所需字段，含实际长度、理论长度、理论厚度） + * + * @author Joshi + * @date 2025-07-18 + */ +@Data +public class WmsMaterialCoilPeriodComparisonVo { + + // 钢卷ID + private Long coilId; + // 净重 + private BigDecimal netWeight; + // 实际库区ID + private Long warehouseId; + // 质量状态 + private String qualityStatus; + // 班组 + private String team; + // 创建时间 + private String createTime; + + // 实际长度 + private Long actualLength; + // 理论长度 + private BigDecimal theoreticalLength; + // 理论厚度 + private BigDecimal theoreticalThickness; +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java index 339f5531..53e8343d 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.metadata.IPage; import com.klp.domain.WmsMaterialCoil; -import com.klp.domain.vo.WmsMaterialCoilAnnealExportVo; -import com.klp.domain.vo.WmsMaterialCoilDeliveryExportVo; -import com.klp.domain.vo.WmsMaterialCoilReportVo; -import com.klp.domain.vo.WmsMaterialCoilVo; +import com.klp.domain.vo.*; import com.klp.common.core.mapper.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import com.klp.domain.vo.dashboard.CoilTrimRawVo; @@ -112,7 +109,15 @@ public interface WmsMaterialCoilMapper extends BaseMapperPlus selectPageReportList(@Param("ew") QueryWrapper lqw); + List selectReportList(@Param("ew") QueryWrapper lqw); + + /** + * 分页查询钢卷环比报表数据（轻量级，包含实际长度、理论长度、理论厚度） + * + * @param lqw 查询条件 + * @return 环比报表数据 + */ + List selectPeriodComparisonList(@Param("ew") QueryWrapper lqw); List selectCoilTrimStatistics(); diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java index c702dda7..b68e7e73 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java @@ -356,6 +356,15 @@ public interface IWmsMaterialCoilService { */ List queryReportList(WmsMaterialCoilBo bo); + /** + * 查询钢卷环比报表数据（轻量级，包含实际长度、理论长度、理论厚度） + * 使用与分页列表相同的查询条件 + * + * @param bo 查询条件 + * @return 环比报表数据 + */ + List queryPeriodComparisonList(WmsMaterialCoilBo bo); + /** * 退火报表导出数据列表（按 coilIds） * 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 1e106ee2..bcfc2458 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 @@ -3465,7 +3465,18 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { @Transactional(readOnly = true) public List queryReportList(WmsMaterialCoilBo bo) { QueryWrapper lqw = buildQueryWrapperPlus(bo); - return baseMapper.selectPageReportList(lqw); + return baseMapper.selectReportList(lqw); + } + + /** + * 查询钢卷环比报表数据（轻量级，包含实际长度、理论长度、理论厚度） + * 使用与分页列表相同的查询条件 + */ + @Override + @Transactional(readOnly = true) + public List queryPeriodComparisonList(WmsMaterialCoilBo bo) { + QueryWrapper lqw = buildQueryWrapperPlus(bo); + return baseMapper.selectPeriodComparisonList(lqw); } /** diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index 4b4e580a..c8dc757f 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -409,7 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT mc.coil_id AS coilId, mc.net_weight AS netWeight, @@ -425,6 +425,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${ew.customSqlSegment} + + +