DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(stock): 优化库存查询逻辑并调整分组策略

Browse Source 
- 修改 XML 中的查询语句，将 CASE 表达式包裹在 MIN 函数内以适配 GROUP BY
- 显式添加 GROUP BY 子句到 SQL 查询中
- 在 Java 代码中将模糊查询优化为前缀匹配，提高索引使用效率
- 移除 QueryWrapper 中冗余的 groupBy 字段，改由 SQL 层统一控制分组逻辑
- 简化 Java 层动态条件构造，提升可读性和维护性
This commit is contained in:
Joshi
2025-12-17 17:14:55 +08:00
parent 0e1f9fe113
commit eb429ad7f1
2 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java
View File

@@ -81,23 +81,10 @@ public class WmsStockServiceImpl implements IWmsStockService {
} }
qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId()); qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId());
qw.like(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo()); // 优化模糊查询为前缀匹配，便于走索引（若有）
qw.likeRight(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo());
// 分组改由 SQL 中显式控制，避免在 Wrapper 中拼装大量分组字段
// 使用 groupBy 进行分组
qw.groupBy(
"mc.actual_warehouse_id",
"mc.item_type",
"mc.item_id",
"w.actual_warehouse_name",
"CASE WHEN mc.item_type = 'product' THEN p.product_name WHEN mc.item_type = 'raw_material' THEN r.raw_material_name ELSE NULL END",
"CASE WHEN mc.item_type = 'product' THEN p.product_code WHEN mc.item_type = 'raw_material' THEN r.raw_material_code ELSE NULL END",
"CASE WHEN mc.item_type = 'product' THEN p.specification WHEN mc.item_type = 'raw_material' THEN r.specification ELSE NULL END",
"CASE WHEN mc.item_type = 'product' THEN p.material WHEN mc.item_type = 'raw_material' THEN r.material ELSE NULL END",
"CASE WHEN mc.item_type = 'product' THEN p.surface_treatment_desc WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc ELSE NULL END",
"CASE WHEN mc.item_type = 'product' THEN p.zinc_layer WHEN mc.item_type = 'raw_material' THEN r.zinc_layer ELSE NULL END",
"CASE WHEN mc.item_type = 'product' THEN p.manufacturer WHEN mc.item_type = 'raw_material' THEN r.manufacturer ELSE NULL END"
);
return qw; return qw;
} }

79
klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
View File

@@ -91,53 +91,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY totalQuantity DESC ORDER BY totalQuantity DESC
</select> </select>
<select id="selectVoPagePlusActual" resultType="com.klp.domain.vo.WmsStockVo"> <select id="selectVoPagePlusActual" resultType="com.klp.domain.vo.WmsStockVo">
SELECT mc.actual_warehouse_id AS actualWarehouseId, SELECT
mc.item_type AS itemType, mc.actual_warehouse_id AS actualWarehouseId,
mc.item_id AS itemId, mc.item_type AS itemType,
w.actual_warehouse_name AS actualWarehouseName, mc.item_id AS itemId,
CASE MIN(w.actual_warehouse_name) AS actualWarehouseName,
WHEN mc.item_type = 'product' THEN p.product_name MIN(CASE WHEN mc.item_type = 'product' THEN p.product_name
WHEN mc.item_type = 'raw_material' THEN r.raw_material_name WHEN mc.item_type = 'raw_material' THEN r.raw_material_name
ELSE NULL ELSE NULL END) AS itemName,
END AS itemName, MIN(CASE WHEN mc.item_type = 'product' THEN p.product_code
CASE WHEN mc.item_type = 'raw_material' THEN r.raw_material_code
WHEN mc.item_type = 'product' THEN p.product_code ELSE NULL END) AS itemCode,
WHEN mc.item_type = 'raw_material' THEN r.raw_material_code MIN(CASE WHEN mc.item_type = 'product' THEN p.specification
ELSE NULL WHEN mc.item_type = 'raw_material' THEN r.specification
END AS itemCode, ELSE NULL END) AS specification,
CASE MIN(CASE WHEN mc.item_type = 'product' THEN p.material
WHEN mc.item_type = 'product' THEN p.specification WHEN mc.item_type = 'raw_material' THEN r.material
WHEN mc.item_type = 'raw_material' THEN r.specification ELSE NULL END) AS material,
ELSE NULL MIN(CASE WHEN mc.item_type = 'product' THEN p.surface_treatment_desc
END AS specification, WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc
CASE ELSE NULL END) AS surfaceTreatmentDesc,
WHEN mc.item_type = 'product' THEN p.material MIN(CASE WHEN mc.item_type = 'product' THEN p.zinc_layer
WHEN mc.item_type = 'raw_material' THEN r.material WHEN mc.item_type = 'raw_material' THEN r.zinc_layer
ELSE NULL ELSE NULL END) AS zincLayer,
END AS material, MIN(CASE WHEN mc.item_type = 'product' THEN p.manufacturer
CASE WHEN mc.item_type = 'raw_material' THEN r.manufacturer
WHEN mc.item_type = 'product' THEN p.surface_treatment_desc ELSE NULL END) AS manufacturer,
WHEN mc.item_type = 'raw_material' THEN r.surface_treatment_desc COUNT(*) AS totalQuantity,
ELSE NULL SUM(CASE WHEN mc.status = 1 THEN 1 ELSE 0 END) AS onTheWay
END AS surfaceTreatmentDesc,
CASE
WHEN mc.item_type = 'product' THEN p.zinc_layer
WHEN mc.item_type = 'raw_material' THEN r.zinc_layer
ELSE NULL
END AS zincLayer,
CASE
WHEN mc.item_type = 'product' THEN p.manufacturer
WHEN mc.item_type = 'raw_material' THEN r.manufacturer
ELSE NULL
END AS manufacturer,
COUNT(*) AS totalQuantity,
SUM(CASE WHEN mc.status = 1 THEN 1 ELSE 0 END) AS onTheWay
FROM wms_material_coil mc FROM wms_material_coil mc
LEFT JOIN wms_actual_warehouse w ON mc.actual_warehouse_id = w.actual_warehouse_id AND w.del_flag = 0 LEFT JOIN wms_actual_warehouse w ON mc.actual_warehouse_id = w.actual_warehouse_id AND w.del_flag = 0
LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id AND p.del_flag = 0 LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id AND p.del_flag = 0
LEFT JOIN wms_raw_material r LEFT JOIN wms_raw_material r ON mc.item_type = 'raw_material' AND mc.item_id = r.raw_material_id AND r.del_flag = 0
ON mc.item_type = 'raw_material' AND mc.item_id = r.raw_material_id AND r.del_flag = 0 ${ew.customSqlSegment}
${ew.customSqlSegment} GROUP BY mc.actual_warehouse_id, mc.item_type, mc.item_id
</select> </select>
</mapper> </mapper>