feat(wms,oms):库存管理新增入库排名统计(按仓单+货品汇总,件数降序,与出库排名tab配对);还原出库排名第一版源码

入库排名统计(新增):WMS /inboundRankApi、OMS /executionInboundRankApi 的 queryMaterialRankList 分页+合计、exportMaterialRank 导出;口径:仅已入库(status=5),明细仅level=1主行,日期区间按入仓日期warehouse_date筛选(必填);一行=仓单内某货品合计(GROUP BY 仓单+货品 ORDER BY 件数DESC);字段:入仓日期/仓单编号/客户编号/存货人/货名/件数/毛重(吨=KG/1000)/投保总额(货品档案保额,组内MAX防重复累加)/体积(CBM)+货号/规格/单位;合计行:totalPieceCount/totalGrossWeightTon/totalInsureAmount/totalVolume/totalOrderCount;登录上下文:日期必填校验+topOrganizationId租户隔离,WMS另注入关联仓库warehouseId。出库排名统计(还原第一版):/outboundRankApi、/executionOutboundRankApi,按货品/线路汇总排名
This commit is contained in:
rcx
2026-08-31 17:47:09 +08:00
parent a983ae639e
commit bf96f5f005
50 changed files with 2887 additions and 0 deletions
@@ -0,0 +1,76 @@
package com.mhd.wms.application.service.inboundRank;
import com.mhd.common.core.exception.ServiceException;
import com.mhd.common.core.utils.StringUtils;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO;
import com.mhd.wms.domain.inboundRank.repository.po.InboundRankTotalPO;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import com.mhd.wms.domain.inboundRank.service.InboundRankDomainService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 入库排名统计应用服务
*
* <p>负责登录用户组织隔离注入、日期区间校验,查询逻辑在 InboundRankDomainService → InboundRankMapper.xml</p>
*
* @author rcx
* @date 2026-08-31
*/
@Service
@Slf4j
public class InboundRankApplicationService {
@Autowired
private InboundRankDomainService inboundRankDomainService;
/**
* 分页查询商品入库排名列表(仓单+货品汇总,按件数降序)
*/
public List<InboundMaterialRankPO> queryMaterialRankList(InboundRankDO inboundRankDO) {
fillLoginContext(inboundRankDO);
return inboundRankDomainService.queryMaterialRankList(inboundRankDO);
}
/**
* 商品入库排名合计(当前筛选条件全量,不分页)
*/
public InboundRankTotalPO queryMaterialRankTotal(InboundRankDO inboundRankDO) {
return inboundRankDomainService.queryMaterialRankTotal(inboundRankDO);
}
/**
* 导出商品入库排名(不分页全量)
*/
public List<InboundMaterialRankPO> exportMaterialRank(InboundRankDO inboundRankDO) {
fillLoginContext(inboundRankDO);
return inboundRankDomainService.queryMaterialRankList(inboundRankDO);
}
/**
* 注入登录用户组织隔离与关联仓库,并校验入仓日期区间必填
*/
private void fillLoginContext(InboundRankDO inboundRankDO) {
if (StringUtils.isEmpty(inboundRankDO.getWarehouseDateStart()) || StringUtils.isEmpty(inboundRankDO.getWarehouseDateEnd())) {
throw new ServiceException("请选择统计日期区间");
}
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null && loginUser.getUserPo() != null) {
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1) {
inboundRankDO.setTopOrganizationId(topOrganizationId);
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null && associationWarehouseCacheDO.getWarehouseId() != null) {
inboundRankDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
}
}
}
}
@@ -0,0 +1,100 @@
package com.mhd.wms.application.service.outboundRank;
import com.mhd.common.core.utils.StringUtils;
import com.mhd.common.core.exception.ServiceException;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import com.mhd.wms.domain.outboundRank.service.OutboundRankDomainService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 出库排名统计应用服务
*
* <p>负责登录用户组织隔离注入、日期区间校验,统计逻辑在 OutboundRankDomainService → OutboundRankMapper.xml</p>
*
* @author rcx
* @date 2026-08-31
*/
@Service
@Slf4j
public class OutboundRankApplicationService {
@Autowired
private OutboundRankDomainService outboundRankDomainService;
/**
* 分页查询商品出库排名列表
*/
public List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO) {
fillLoginContext(outboundRankDO);
return outboundRankDomainService.queryMaterialRankList(outboundRankDO);
}
/**
* 分页查询线路出库排名列表
*/
public List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO) {
fillLoginContext(outboundRankDO);
return outboundRankDomainService.queryLineRankList(outboundRankDO);
}
/**
* 商品出库排名合计(当前筛选条件全量,不分页)
*/
public OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO) {
return outboundRankDomainService.queryMaterialRankTotal(outboundRankDO);
}
/**
* 线路出库排名合计(当前筛选条件全量,不分页)
*/
public OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO) {
return outboundRankDomainService.queryLineRankTotal(outboundRankDO);
}
/**
* 导出商品出库排名(不分页全量)
*/
public List<OutboundMaterialRankPO> exportMaterialRankList(OutboundRankDO outboundRankDO) {
fillLoginContext(outboundRankDO);
return outboundRankDomainService.queryMaterialRankList(outboundRankDO);
}
/**
* 导出线路出库排名(不分页全量)
*/
public List<OutboundLineRankPO> exportLineRankList(OutboundRankDO outboundRankDO) {
fillLoginContext(outboundRankDO);
return outboundRankDomainService.queryLineRankList(outboundRankDO);
}
/**
* 注入登录用户组织隔离与关联仓库,并校验日期区间必填
*/
private void fillLoginContext(OutboundRankDO outboundRankDO) {
if (StringUtils.isEmpty(outboundRankDO.getCreateTimeStart()) || StringUtils.isEmpty(outboundRankDO.getCreateTimeEnd())) {
throw new ServiceException("请选择统计日期区间");
}
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null && loginUser.getUserPo() != null) {
Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
if (topOrganizationId != null && topOrganizationId != 1) {
outboundRankDO.setTopOrganizationId(topOrganizationId);
}
AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
if (associationWarehouseCacheDO != null && associationWarehouseCacheDO.getWarehouseId() != null) {
outboundRankDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
}
}
}
}
@@ -0,0 +1,26 @@
package com.mhd.wms.domain.inboundRank.repository.facade;
import com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO;
import com.mhd.wms.domain.inboundRank.repository.po.InboundRankTotalPO;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import java.util.List;
/**
* 入库排名统计Service接口
*
* @author rcx
* @date 2026-08-31
*/
public interface IInboundRankService {
/**
* 商品入库排名列表(仓单+货品汇总,按件数降序)
*/
List<InboundMaterialRankPO> queryMaterialRankList(InboundRankDO inboundRankDO);
/**
* 商品入库排名合计(不分页)
*/
InboundRankTotalPO queryMaterialRankTotal(InboundRankDO inboundRankDO);
}
@@ -0,0 +1,26 @@
package com.mhd.wms.domain.inboundRank.repository.mapper;
import com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO;
import com.mhd.wms.domain.inboundRank.repository.po.InboundRankTotalPO;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import java.util.List;
/**
* 入库排名统计Mapper接口
*
* @author rcx
* @date 2026-08-31
*/
public interface InboundRankMapper {
/**
* 商品入库排名列表(仓单+货品汇总,按件数降序)
*/
List<InboundMaterialRankPO> queryMaterialRankList(InboundRankDO inboundRankDO);
/**
* 商品入库排名合计(不分页,当前筛选条件全量合计)
*/
InboundRankTotalPO queryMaterialRankTotal(InboundRankDO inboundRankDO);
}
@@ -0,0 +1,34 @@
package com.mhd.wms.domain.inboundRank.repository.persistence;
import com.mhd.wms.domain.inboundRank.repository.facade.IInboundRankService;
import com.mhd.wms.domain.inboundRank.repository.mapper.InboundRankMapper;
import com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO;
import com.mhd.wms.domain.inboundRank.repository.po.InboundRankTotalPO;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 入库排名统计Service业务层处理
*
* @author rcx
* @date 2026-08-31
*/
@Service
public class InboundRankImpl implements IInboundRankService {
@Autowired
private InboundRankMapper inboundRankMapper;
@Override
public List<InboundMaterialRankPO> queryMaterialRankList(InboundRankDO inboundRankDO) {
return inboundRankMapper.queryMaterialRankList(inboundRankDO);
}
@Override
public InboundRankTotalPO queryMaterialRankTotal(InboundRankDO inboundRankDO) {
return inboundRankMapper.queryMaterialRankTotal(inboundRankDO);
}
}
@@ -0,0 +1,79 @@
package com.mhd.wms.domain.inboundRank.repository.po;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mhd.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 入库排名统计PO(一行 = 某仓单内某货品的合计,按件数降序排名)
*
* <p>字段口径:入仓日期=入仓单入仓日期;仓单编号=入库单号;客户编号/存货人=入仓单货主;
* 件数/毛重/体积=仓单内该货品明细合计;毛重(吨)=明细总毛重KG/1000;
* 投保总额=货品档案保额(material_base_info.insure_amount,组内取MAX防多批次明细行重复累加)</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
@ApiModel(value = "入库排名统计对象", description = "入库排名统计响应对象")
public class InboundMaterialRankPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("入仓日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "入仓日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date warehouseDate;
@ApiModelProperty("仓单编号(入库单号)")
@Excel(name = "仓单编号")
private String inOrderNumber;
@ApiModelProperty("客户编号")
@Excel(name = "客户编号")
private String shipperCode;
@ApiModelProperty("存货人(客户名称)")
@Excel(name = "存货人")
private String shipperName;
@ApiModelProperty("商品货号")
@Excel(name = "商品货号")
private String materialCode;
@ApiModelProperty("货名/商品名称")
@Excel(name = "货名")
private String materialName;
@ApiModelProperty("规格型号")
@Excel(name = "规格型号")
private String specificationModel;
@ApiModelProperty("单位")
@Excel(name = "单位")
private String unitName;
@ApiModelProperty("件数(仓单内该货品合计,排名依据)")
@Excel(name = "件数")
private BigDecimal pieceCount;
@ApiModelProperty("毛重(吨)(仓单内该货品合计,KG/1000)")
@Excel(name = "毛重(吨)")
private BigDecimal grossWeightTon;
@ApiModelProperty("投保总额(货品档案保额)")
@Excel(name = "投保总额")
private BigDecimal insureAmount;
@ApiModelProperty("体积(CBM)(仓单内该货品合计)")
@Excel(name = "体积(CBM)")
private BigDecimal totalVolume;
}
@@ -0,0 +1,39 @@
package com.mhd.wms.domain.inboundRank.repository.po;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 入库排名统计合计PO
*
* <p>当前筛选条件下不分页的全量合计,随分页列表一起返回
* totalPieceCount/totalGrossWeightTon/totalInsureAmount/totalVolume/totalOrderCount</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
@ApiModel(value = "入库排名统计合计对象", description = "入库排名统计合计响应对象")
public class InboundRankTotalPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("件数合计")
private BigDecimal totalPieceCount;
@ApiModelProperty("毛重(吨)合计")
private BigDecimal totalGrossWeightTon;
@ApiModelProperty("投保总额合计(各仓单+货品行保额之和)")
private BigDecimal totalInsureAmount;
@ApiModelProperty("体积(CBM)合计")
private BigDecimal totalVolume;
@ApiModelProperty("仓单数合计")
private Long totalOrderCount;
}
@@ -0,0 +1,50 @@
package com.mhd.wms.domain.inboundRank.repository.todo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 入库排名统计查询DO
*
* <p>topOrganizationId / warehouseId 由服务端按登录用户注入,前端不传</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
public class InboundRankDO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("入仓日期-开始 yyyy-MM-dd(必填)")
private String warehouseDateStart;
@ApiModelProperty("入仓日期-结束 yyyy-MM-dd(必填)")
private String warehouseDateEnd;
@ApiModelProperty("仓单编号/入库单号(模糊)")
private String inOrderNumber;
@ApiModelProperty("客户编号(模糊)")
private String shipperCode;
@ApiModelProperty("存货人/客户名称(模糊)")
private String shipperName;
@ApiModelProperty("商品货号(模糊)")
private String materialCode;
@ApiModelProperty("货名/商品名称(模糊)")
private String materialName;
@ApiModelProperty("仓库名称(模糊)")
private String warehouseName;
@ApiModelProperty("一级组织表ID(登录用户隔离,非1时注入)")
private Long topOrganizationId;
@ApiModelProperty("仓库id(按用户关联仓库注入)")
private Long warehouseId;
}
@@ -0,0 +1,39 @@
package com.mhd.wms.domain.inboundRank.service;
import com.mhd.wms.domain.inboundRank.repository.facade.IInboundRankService;
import com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO;
import com.mhd.wms.domain.inboundRank.repository.po.InboundRankTotalPO;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 入库排名统计领域服务
*
* @author rcx
* @date 2026-08-31
*/
@Service
@Slf4j
public class InboundRankDomainService {
@Autowired
private IInboundRankService inboundRankService;
/**
* 商品入库排名列表(仓单+货品汇总,按件数降序)
*/
public List<InboundMaterialRankPO> queryMaterialRankList(InboundRankDO inboundRankDO) {
return inboundRankService.queryMaterialRankList(inboundRankDO);
}
/**
* 商品入库排名合计(不分页)
*/
public InboundRankTotalPO queryMaterialRankTotal(InboundRankDO inboundRankDO) {
return inboundRankService.queryMaterialRankTotal(inboundRankDO);
}
}
@@ -0,0 +1,37 @@
package com.mhd.wms.domain.outboundRank.repository.facade;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import java.util.List;
/**
* 出库排名统计Service接口
*
* @author rcx
* @date 2026-08-31
*/
public interface IOutboundRankService {
/**
* 商品出库排名列表
*/
List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO);
/**
* 线路出库排名列表
*/
List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO);
/**
* 商品出库排名合计(不分页)
*/
OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO);
/**
* 线路出库排名合计(不分页)
*/
OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO);
}
@@ -0,0 +1,37 @@
package com.mhd.wms.domain.outboundRank.repository.mapper;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import java.util.List;
/**
* 出库排名统计Mapper接口
*
* @author rcx
* @date 2026-08-31
*/
public interface OutboundRankMapper {
/**
* 商品出库排名列表(按销售量倒序)
*/
List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO);
/**
* 线路出库排名列表(按销售量倒序)
*/
List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO);
/**
* 商品出库排名合计(不分页,当前筛选条件全量合计)
*/
OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO);
/**
* 线路出库排名合计(不分页,当前筛选条件全量合计)
*/
OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO);
}
@@ -0,0 +1,45 @@
package com.mhd.wms.domain.outboundRank.repository.persistence;
import com.mhd.wms.domain.outboundRank.repository.facade.IOutboundRankService;
import com.mhd.wms.domain.outboundRank.repository.mapper.OutboundRankMapper;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 出库排名统计Service业务层处理
*
* @author rcx
* @date 2026-08-31
*/
@Service
public class OutboundRankImpl implements IOutboundRankService {
@Autowired
private OutboundRankMapper outboundRankMapper;
@Override
public List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO) {
return outboundRankMapper.queryMaterialRankList(outboundRankDO);
}
@Override
public List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO) {
return outboundRankMapper.queryLineRankList(outboundRankDO);
}
@Override
public OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO) {
return outboundRankMapper.queryMaterialRankTotal(outboundRankDO);
}
@Override
public OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO) {
return outboundRankMapper.queryLineRankTotal(outboundRankDO);
}
}
@@ -0,0 +1,45 @@
package com.mhd.wms.domain.outboundRank.repository.po;
import com.mhd.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 线路出库排名PO
*
* <p>按日期区间对出库单聚合:销售量=SUM(出库数量),交易数=COUNT(DISTINCT 出库单号),金额=SUM(明细总价);
* 仅统计带线路的出库单(line_code 为 2026-08-20 新增冗余字段,历史单为空)</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
@ApiModel(value = "线路出库排名对象", description = "线路出库排名响应对象")
public class OutboundLineRankPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("线路编码")
@Excel(name = "线路编码")
private String lineCode;
@ApiModelProperty("线路名称")
@Excel(name = "线路名称")
private String lineName;
@ApiModelProperty("销售量(出库数量合计)")
@Excel(name = "销售量")
private BigDecimal salesQuantity;
@ApiModelProperty("交易数(出库单据数)")
@Excel(name = "交易数")
private Long tradeCount;
@ApiModelProperty("金额")
@Excel(name = "金额")
private BigDecimal amount;
}
@@ -0,0 +1,52 @@
package com.mhd.wms.domain.outboundRank.repository.po;
import com.mhd.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 商品出库排名PO
*
* <p>按日期区间对出库明细聚合:销售量=SUM(出库数量),交易数=COUNT(DISTINCT 出库单号),金额=SUM(明细总价)</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
@ApiModel(value = "商品出库排名对象", description = "商品出库排名响应对象")
public class OutboundMaterialRankPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("商品货号")
@Excel(name = "商品货号")
private String materialCode;
@ApiModelProperty("商品名称")
@Excel(name = "商品名称")
private String materialName;
@ApiModelProperty("规格")
@Excel(name = "规格")
private String specificationModel;
@ApiModelProperty("单位")
@Excel(name = "单位")
private String unitName;
@ApiModelProperty("销售量(出库数量合计)")
@Excel(name = "销售量")
private BigDecimal salesQuantity;
@ApiModelProperty("交易数(出库单据数)")
@Excel(name = "交易数")
private Long tradeCount;
@ApiModelProperty("金额")
@Excel(name = "金额")
private BigDecimal amount;
}
@@ -0,0 +1,32 @@
package com.mhd.wms.domain.outboundRank.repository.po;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 出库排名合计PO
*
* <p>当前筛选条件下不分页的全量合计,随分页列表一起返回(totalSalesQuantity/totalTradeCount/totalAmount</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
@ApiModel(value = "出库排名合计对象", description = "出库排名合计响应对象")
public class OutboundRankTotalPO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("销售量合计")
private BigDecimal totalSalesQuantity;
@ApiModelProperty("交易数合计(去重出库单数)")
private Long totalTradeCount;
@ApiModelProperty("金额合计")
private BigDecimal totalAmount;
}
@@ -0,0 +1,53 @@
package com.mhd.wms.domain.outboundRank.repository.todo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 出库排名统计查询DO
*
* <p>topOrganizationId / warehouseId 由服务端按登录用户注入,前端不传</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
public class OutboundRankDO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("出库日期-开始 yyyy-MM-dd(必填)")
private String createTimeStart;
@ApiModelProperty("出库日期-结束 yyyy-MM-dd(必填)")
private String createTimeEnd;
@ApiModelProperty("商品货号(模糊)")
private String materialCode;
@ApiModelProperty("商品名称(模糊)")
private String materialName;
@ApiModelProperty("线路编码(模糊)")
private String lineCode;
@ApiModelProperty("线路名称(模糊)")
private String lineName;
@ApiModelProperty("仓库名称(模糊)")
private String warehouseName;
@ApiModelProperty("客户名称(模糊)")
private String customerName;
@ApiModelProperty("货主名称(模糊)")
private String shipperName;
@ApiModelProperty("一级组织表ID(登录用户隔离,非1时注入)")
private Long topOrganizationId;
@ApiModelProperty("仓库id(按用户关联仓库注入)")
private Long warehouseId;
}
@@ -0,0 +1,54 @@
package com.mhd.wms.domain.outboundRank.service;
import com.mhd.wms.domain.outboundRank.repository.facade.IOutboundRankService;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 出库排名统计领域服务
*
* @author rcx
* @date 2026-08-31
*/
@Service
@Slf4j
public class OutboundRankDomainService {
@Autowired
private IOutboundRankService outboundRankService;
/**
* 商品出库排名列表
*/
public List<OutboundMaterialRankPO> queryMaterialRankList(OutboundRankDO outboundRankDO) {
return outboundRankService.queryMaterialRankList(outboundRankDO);
}
/**
* 线路出库排名列表
*/
public List<OutboundLineRankPO> queryLineRankList(OutboundRankDO outboundRankDO) {
return outboundRankService.queryLineRankList(outboundRankDO);
}
/**
* 商品出库排名合计(不分页)
*/
public OutboundRankTotalPO queryMaterialRankTotal(OutboundRankDO outboundRankDO) {
return outboundRankService.queryMaterialRankTotal(outboundRankDO);
}
/**
* 线路出库排名合计(不分页)
*/
public OutboundRankTotalPO queryLineRankTotal(OutboundRankDO outboundRankDO) {
return outboundRankService.queryLineRankTotal(outboundRankDO);
}
}
@@ -0,0 +1,36 @@
package com.mhd.wms.interfaces.assember.inboundRank;
import cn.hutool.core.util.ObjectUtil;
import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
import com.mhd.common.core.exception.digitalLogisticsException.UserError;
import com.mhd.common.core.utils.IgnoreNullUtil;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import com.mhd.wms.interfaces.dto.inboundRank.InboundRankDTO;
import org.springframework.stereotype.Component;
/**
* 入库排名统计Assembler
*
* @author rcx
* @date 2026-08-31
*/
@Component
public class InboundRankAssembler {
/**
* 转换实体
*/
public InboundRankDO toDO(InboundRankDTO inboundRankDTO) {
InboundRankDO inboundRankDO = new InboundRankDO();
// 拷贝
BeanUtils.copyProperties(inboundRankDTO, inboundRankDO, IgnoreNullUtil.getNullPropertyNames(inboundRankDTO));
LoginUser loginUser = SecurityUtils.getLoginUser();
if (ObjectUtil.isNull(loginUser)) {
throw new DigitalLogisticsException(UserError.TIMEOUT);
}
return inboundRankDO;
}
}
@@ -0,0 +1,36 @@
package com.mhd.wms.interfaces.assember.outboundRank;
import cn.hutool.core.util.ObjectUtil;
import com.mhd.common.core.exception.digitalLogisticsException.DigitalLogisticsException;
import com.mhd.common.core.exception.digitalLogisticsException.UserError;
import com.mhd.common.core.utils.IgnoreNullUtil;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.model.LoginUser;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import com.mhd.wms.interfaces.dto.outboundRank.OutboundRankDTO;
import org.springframework.stereotype.Component;
/**
* 出库排名统计Assembler
*
* @author rcx
* @date 2026-08-31
*/
@Component
public class OutboundRankAssembler {
/**
* 转换实体
*/
public OutboundRankDO toDO(OutboundRankDTO outboundRankDTO) {
OutboundRankDO outboundRankDO = new OutboundRankDO();
// 拷贝
BeanUtils.copyProperties(outboundRankDTO, outboundRankDO, IgnoreNullUtil.getNullPropertyNames(outboundRankDTO));
LoginUser loginUser = SecurityUtils.getLoginUser();
if (ObjectUtil.isNull(loginUser)) {
throw new DigitalLogisticsException(UserError.TIMEOUT);
}
return outboundRankDO;
}
}
@@ -0,0 +1,45 @@
package com.mhd.wms.interfaces.dto.inboundRank;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 入库排名统计入参DTO
*
* <p>按入仓日期区间筛选商品入库量统计排名,统计口径:入仓日期 + 仅已入库状态(5) + 明细仅取 level=1 主行;
* 一行 = 某仓单内某货品的合计,按件数降序排名</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
public class InboundRankDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("入仓日期-开始 yyyy-MM-dd(必填,按入仓单入仓日期筛选)")
private String warehouseDateStart;
@ApiModelProperty("入仓日期-结束 yyyy-MM-dd(必填,按入仓单入仓日期筛选)")
private String warehouseDateEnd;
@ApiModelProperty("仓单编号/入库单号(模糊)")
private String inOrderNumber;
@ApiModelProperty("客户编号(模糊)")
private String shipperCode;
@ApiModelProperty("存货人/客户名称(模糊)")
private String shipperName;
@ApiModelProperty("商品货号(模糊)")
private String materialCode;
@ApiModelProperty("货名/商品名称(模糊)")
private String materialName;
@ApiModelProperty("仓库名称(模糊)")
private String warehouseName;
}
@@ -0,0 +1,43 @@
package com.mhd.wms.interfaces.dto.outboundRank;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 出库排名统计入参DTO
*
* <p>按日期区间统计商品/线路出库量排名,统计口径:出库单创建时间 + 已出库及之后状态(9,12,13)</p>
*
* @author rcx
* @date 2026-08-31
*/
@Data
public class OutboundRankDTO {
@ApiModelProperty("出库日期-开始 yyyy-MM-dd(必填,按出库单创建时间统计)")
private String createTimeStart;
@ApiModelProperty("出库日期-结束 yyyy-MM-dd(必填,按出库单创建时间统计)")
private String createTimeEnd;
@ApiModelProperty("商品货号(模糊)")
private String materialCode;
@ApiModelProperty("商品名称(模糊)")
private String materialName;
@ApiModelProperty("线路编码(模糊)")
private String lineCode;
@ApiModelProperty("线路名称(模糊)")
private String lineName;
@ApiModelProperty("仓库名称(模糊)")
private String warehouseName;
@ApiModelProperty("客户名称(模糊)")
private String customerName;
@ApiModelProperty("货主名称(模糊)")
private String shipperName;
}
@@ -0,0 +1,105 @@
package com.mhd.wms.interfaces.facadeApi.inboundRank;
import com.github.pagehelper.PageInfo;
import com.mhd.common.core.constant.HttpStatus;
import com.mhd.common.core.utils.PageUtils;
import com.mhd.common.core.utils.poi.ExcelUtil;
import com.mhd.wms.application.service.inboundRank.InboundRankApplicationService;
import com.mhd.wms.domain.inboundRank.repository.po.InboundMaterialRankPO;
import com.mhd.wms.domain.inboundRank.repository.po.InboundRankTotalPO;
import com.mhd.wms.domain.inboundRank.repository.todo.InboundRankDO;
import com.mhd.wms.interfaces.assember.inboundRank.InboundRankAssembler;
import com.mhd.wms.interfaces.dto.inboundRank.InboundRankDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
/**
* 入库排名统计Api
*
* <p>按入仓日期区间筛选商品入库量统计排名。统计口径:入仓日期 + 仅已入库状态(5),
* 明细仅取 level=1 主行;一行 = 某仓单内某货品的合计,按件数降序排名。
* 字段:入仓日期/仓单编号/客户编号/存货人/货名/件数/毛重(吨)/投保总额/体积(CBM)。
* 与出库排名(/outboundRankApi)配对,前端用 tab 页区分</p>
*
* @author rcx
* @date 2026-08-31
*/
@RestController
@RequestMapping("/inboundRankApi")
public class InboundRankApi {
@Resource
private InboundRankAssembler inboundRankAssembler;
@Autowired
private InboundRankApplicationService inboundRankApplicationService;
/**
* 分页查询商品入库排名列表(含合计行)
*/
@ApiOperation("分页查询商品入库排名列表")
@GetMapping("/queryMaterialRankList")
public HashMap<String, Object> queryMaterialRankList(InboundRankDTO inboundRankDTO) {
//转换实体
InboundRankDO inboundRankDO = inboundRankAssembler.toDO(inboundRankDTO);
startPage();
List<InboundMaterialRankPO> list = inboundRankApplicationService.queryMaterialRankList(inboundRankDO);
InboundRankTotalPO total = inboundRankApplicationService.queryMaterialRankTotal(inboundRankDO);
return getDataTableWithTotal(list, total);
}
/**
* 导出商品入库排名Excel
*/
@ApiOperation("导出商品入库排名Excel")
@GetMapping("/exportMaterialRank")
public void exportMaterialRank(HttpServletResponse response, InboundRankDTO inboundRankDTO) throws Exception {
//转换实体(不分页,导出全量)
InboundRankDO inboundRankDO = inboundRankAssembler.toDO(inboundRankDTO);
List<InboundMaterialRankPO> list = inboundRankApplicationService.exportMaterialRank(inboundRankDO);
String fileName = URLEncoder.encode("入库排名统计", "UTF-8").replaceAll("\\+", "%20");
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
ExcelUtil<InboundMaterialRankPO> util = new ExcelUtil<>(InboundMaterialRankPO.class);
util.exportExcel(response, list, "入库排名统计");
}
/**
* 分页结果 + 合计行:data/total/code/msg 之外追加
* totalPieceCount/totalGrossWeightTon/totalInsureAmount/totalVolume/totalOrderCount
*/
private HashMap<String, Object> getDataTableWithTotal(List<?> list, InboundRankTotalPO total) {
HashMap<String, Object> result = new HashMap<>();
result.put("data", list);
result.put("total", new PageInfo<>(list).getTotal());
result.put("code", HttpStatus.SUCCESS);
result.put("msg", "查询成功");
if (total != null) {
result.put("totalPieceCount", total.getTotalPieceCount());
result.put("totalGrossWeightTon", total.getTotalGrossWeightTon());
result.put("totalInsureAmount", total.getTotalInsureAmount());
result.put("totalVolume", total.getTotalVolume());
result.put("totalOrderCount", total.getTotalOrderCount());
}
return result;
}
/**
* 设置请求分页数据
*/
protected void startPage() {
PageUtils.startPage();
}
}
@@ -0,0 +1,134 @@
package com.mhd.wms.interfaces.facadeApi.outboundRank;
import com.github.pagehelper.PageInfo;
import com.mhd.common.core.constant.HttpStatus;
import com.mhd.common.core.utils.PageUtils;
import com.mhd.common.core.utils.poi.ExcelUtil;
import com.mhd.wms.application.service.outboundRank.OutboundRankApplicationService;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundLineRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundMaterialRankPO;
import com.mhd.wms.domain.outboundRank.repository.po.OutboundRankTotalPO;
import com.mhd.wms.domain.outboundRank.repository.todo.OutboundRankDO;
import com.mhd.wms.interfaces.assember.outboundRank.OutboundRankAssembler;
import com.mhd.wms.interfaces.dto.outboundRank.OutboundRankDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
/**
* 出库排名统计Api
*
* <p>按日期区间筛选,统计商品/线路出库量排名。统计口径:出库单创建时间 + 已出库及之后状态(9,12,13)
* 明细仅取 level=1 主行;销售量=SUM(出库数量)、交易数=COUNT(DISTINCT 出库单号)、金额=SUM(明细总价)</p>
*
* @author rcx
* @date 2026-08-31
*/
@RestController
@RequestMapping("/outboundRankApi")
public class OutboundRankApi {
@Resource
private OutboundRankAssembler outboundRankAssembler;
@Autowired
private OutboundRankApplicationService outboundRankApplicationService;
/**
* 分页查询商品出库排名列表(含合计行)
*/
@ApiOperation("分页查询商品出库排名列表")
@GetMapping("/queryMaterialRankList")
public HashMap<String, Object> queryMaterialRankList(OutboundRankDTO outboundRankDTO) {
//转换实体
OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
startPage();
List<OutboundMaterialRankPO> list = outboundRankApplicationService.queryMaterialRankList(outboundRankDO);
OutboundRankTotalPO total = outboundRankApplicationService.queryMaterialRankTotal(outboundRankDO);
return getDataTableWithTotal(list, total);
}
/**
* 分页查询线路出库排名列表(含合计行)
*/
@ApiOperation("分页查询线路出库排名列表")
@GetMapping("/queryLineRankList")
public HashMap<String, Object> queryLineRankList(OutboundRankDTO outboundRankDTO) {
//转换实体
OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
startPage();
List<OutboundLineRankPO> list = outboundRankApplicationService.queryLineRankList(outboundRankDO);
OutboundRankTotalPO total = outboundRankApplicationService.queryLineRankTotal(outboundRankDO);
return getDataTableWithTotal(list, total);
}
/**
* 导出商品出库排名Excel
*/
@ApiOperation("导出商品出库排名Excel")
@GetMapping("/exportMaterialRank")
public void exportMaterialRank(HttpServletResponse response, OutboundRankDTO outboundRankDTO) throws Exception {
//转换实体(不分页,导出全量)
OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
List<OutboundMaterialRankPO> list = outboundRankApplicationService.exportMaterialRankList(outboundRankDO);
String fileName = URLEncoder.encode("商品出库排名", "UTF-8").replaceAll("\\+", "%20");
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
ExcelUtil<OutboundMaterialRankPO> util = new ExcelUtil<>(OutboundMaterialRankPO.class);
util.exportExcel(response, list, "商品出库排名");
}
/**
* 导出线路出库排名Excel
*/
@ApiOperation("导出线路出库排名Excel")
@GetMapping("/exportLineRank")
public void exportLineRank(HttpServletResponse response, OutboundRankDTO outboundRankDTO) throws Exception {
//转换实体(不分页,导出全量)
OutboundRankDO outboundRankDO = outboundRankAssembler.toDO(outboundRankDTO);
List<OutboundLineRankPO> list = outboundRankApplicationService.exportLineRankList(outboundRankDO);
String fileName = URLEncoder.encode("线路出库排名", "UTF-8").replaceAll("\\+", "%20");
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setCharacterEncoding("utf-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
ExcelUtil<OutboundLineRankPO> util = new ExcelUtil<>(OutboundLineRankPO.class);
util.exportExcel(response, list, "线路出库排名");
}
/**
* 分页结果 + 合计行:data/total/code/msg 之外追加 totalSalesQuantity/totalTradeCount/totalAmount
*/
private HashMap<String, Object> getDataTableWithTotal(List<?> list, OutboundRankTotalPO total) {
HashMap<String, Object> result = new HashMap<>();
result.put("data", list);
result.put("total", new PageInfo<>(list).getTotal());
result.put("code", HttpStatus.SUCCESS);
result.put("msg", "查询成功");
if (total != null) {
result.put("totalSalesQuantity", total.getTotalSalesQuantity());
result.put("totalTradeCount", total.getTotalTradeCount());
result.put("totalAmount", total.getTotalAmount());
}
return result;
}
/**
* 设置请求分页数据
*/
protected void startPage() {
PageUtils.startPage();
}
}