Compare commits
2 Commits
440e70ee82
...
c1938e29a4
| Author | SHA1 | Date | |
|---|---|---|---|
| c1938e29a4 | |||
| 54d426984b |
@@ -68,6 +68,15 @@ public class WmsMaterialCoilController extends BaseController {
|
||||
return iWmsMaterialCoilService.queryPageListWithBindInfo(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计筛选条件下的全量汇总数据
|
||||
* 独立的统计接口,使用与分页列表相同的查询条件
|
||||
*/
|
||||
@GetMapping("/statisticsList")
|
||||
public R<Map<String, java.math.BigDecimal>> getStatistics(WmsMaterialCoilBo bo) {
|
||||
return R.ok(iWmsMaterialCoilService.getStatistics(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 原料钢卷库位分布查询(先库位,再钢卷映射)
|
||||
*/
|
||||
|
||||
@@ -97,5 +97,12 @@ List<WmsMaterialCoilDeliveryExportVo> selectDeliveryExportListByCoilIds(@Param("
|
||||
* @return 不匹配的钢卷列表
|
||||
*/
|
||||
List<WmsMaterialCoil> selectMismatchedItemCoils();
|
||||
|
||||
/**
|
||||
* 统计筛选条件下的全量汇总数据(高性能:只查sum/count)
|
||||
* @param qw 查询条件(只使用WHERE和JOIN部分)
|
||||
* @return 统计结果(Map包含totalGrossWeight, totalNetWeight)
|
||||
*/
|
||||
Map<String, Object> selectStatistics(@Param("ew") QueryWrapper<WmsMaterialCoil> qw);
|
||||
}
|
||||
|
||||
|
||||
@@ -42,6 +42,12 @@ public interface IWmsMaterialCoilService {
|
||||
*/
|
||||
List<WmsMaterialCoilVo> queryList(WmsMaterialCoilBo bo);
|
||||
|
||||
/**
|
||||
* 统计筛选条件下的全量汇总数据(高性能:只查sum/count)
|
||||
* 独立的统计接口,不影响分页查询
|
||||
*/
|
||||
Map<String, java.math.BigDecimal> getStatistics(WmsMaterialCoilBo bo);
|
||||
|
||||
/**
|
||||
* 新增钢卷物料表
|
||||
*/
|
||||
|
||||
@@ -342,6 +342,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
return TableDataInfo.build(bindResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计筛选条件下的全量汇总数据(高性能:只查sum/count)
|
||||
* 独立的统计接口,不影响分页查询
|
||||
*/
|
||||
@Override
|
||||
public Map<String, BigDecimal> getStatistics(WmsMaterialCoilBo bo) {
|
||||
QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
|
||||
return selectMaterialCoilStatistics(qw);
|
||||
}
|
||||
|
||||
private Page<WmsMaterialCoilVo> queryMaterialCoilPage(WmsMaterialCoilBo bo, PageQuery pageQuery) {
|
||||
QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
|
||||
Page<WmsMaterialCoilVo> result;
|
||||
@@ -380,6 +390,30 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计筛选条件下的全量汇总数据(高性能:只查sum/count)
|
||||
*/
|
||||
private Map<String, BigDecimal> selectMaterialCoilStatistics(QueryWrapper<WmsMaterialCoil> qw) {
|
||||
Map<String, BigDecimal> result = new HashMap<>();
|
||||
result.put("total_gross_weight", BigDecimal.ZERO);
|
||||
result.put("total_net_weight", BigDecimal.ZERO);
|
||||
result.put("total_count", BigDecimal.ZERO);
|
||||
|
||||
try {
|
||||
Map<String, Object> stats = baseMapper.selectStatistics(qw);
|
||||
if (stats != null) {
|
||||
Object grossWeight = stats.get("total_gross_weight");
|
||||
Object netWeight = stats.get("total_net_weight");
|
||||
result.put("total_gross_weight", grossWeight != null ? new BigDecimal(grossWeight.toString()) : BigDecimal.ZERO);
|
||||
result.put("total_net_weight", netWeight != null ? new BigDecimal(netWeight.toString()) : BigDecimal.ZERO);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("统计查询失败: {}", e.getMessage());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private void fillBindInfoForPage(List<WmsMaterialCoilBindVo> records) {
|
||||
// 绑定信息仅用于专用接口,避免污染通用分页结构
|
||||
try {
|
||||
|
||||
@@ -902,5 +902,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
)
|
||||
</select>
|
||||
|
||||
<!-- 统计筛选条件下的全量汇总数据(高性能:只查sum/count) -->
|
||||
<select id="selectStatistics" resultType="java.util.Map">
|
||||
SELECT
|
||||
IFNULL(SUM(mc.gross_weight), 0) AS total_gross_weight,
|
||||
IFNULL(SUM(mc.net_weight), 0) AS total_net_weight,
|
||||
COUNT(mc.coil_id) AS total_count
|
||||
FROM wms_material_coil mc
|
||||
LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
|
||||
LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
|
||||
LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
|
||||
LEFT JOIN sys_user su ON mc.sale_id = su.user_id
|
||||
LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
|
||||
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
|
||||
LEFT JOIN (
|
||||
SELECT coil_id, COUNT(*) AS abnormal_count
|
||||
FROM wms_coil_abnormal
|
||||
WHERE del_flag = 0
|
||||
GROUP BY coil_id
|
||||
) ca ON mc.coil_id = ca.coil_id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user