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

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-12-18 11:51:20 +08:00
parent e900aec86b f1656287c4
commit b82ab5a9e7
4 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-wms/src/main/java/com/klp/mapper/WmsStockMapper.java
View File

@@ -35,5 +35,7 @@ public interface WmsStockMapper extends BaseMapperPlus<WmsStockMapper, WmsStock,
*/
List<WmsStockVo> selectStockDistribution(@Param("itemType") String itemType, @Param("itemId") Long itemId);
Page<WmsStockVo> selectVoPagePlusActual(Page<Object> build,@Param("ew") Wrapper<WmsStock> lqw);
Page<WmsStockVo> selectVoPagePlusActual(Page<Object> build,
@Param("ew") Wrapper<WmsStock> lqw,
@Param("rootWarehouseId") Long rootWarehouseId);
}

9
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -910,7 +910,14 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 使用MyBatis-Plus的updateById方法直接更新
boolean flag = baseMapper.updateById(updateCoil) > 0;
if (bo.getStatus().equals(1)) {
// 特殊处理saleId字段，确保null值也能被正确更新
if (bo.getSaleId() == null) {
LambdaUpdateWrapper<WmsMaterialCoil> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(WmsMaterialCoil::getCoilId, bo.getCoilId());
updateWrapper.set(WmsMaterialCoil::getSaleId, (Long)null);
baseMapper.update(null, updateWrapper);
}
if (bo.getStatus() != null && bo.getStatus().equals(1)) {
WmsActualWarehouseBo disableWarehouseBo = new WmsActualWarehouseBo();
disableWarehouseBo.setActualWarehouseId(oldCoil.getActualWarehouseId());
disableWarehouseBo.setIsEnabled(1); // 设置为启用状态

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

@@ -59,61 +59,25 @@ public class WmsStockServiceImpl implements IWmsStockService {
@Override
public TableDataInfo<WmsStockVo> queryPageListActual(WmsStockBo bo, PageQuery pageQuery) {
QueryWrapper<WmsStock> lqw = buildQueryWrapperPlusActual(bo);
Page<WmsStockVo> result = baseMapper.selectVoPagePlusActual(pageQuery.build(), lqw);
Page<WmsStockVo> result = baseMapper.selectVoPagePlusActual(pageQuery.build(), lqw, bo.getActualWarehouseId());
return TableDataInfo.build(result);
}
private QueryWrapper<WmsStock> buildQueryWrapperPlusActual(WmsStockBo bo) { // 注意：这里改用 QueryWrapper 而非 LambdaQueryWrapper
QueryWrapper<WmsStock> qw = Wrappers.query(); // 使用普通 QueryWrapper
QueryWrapper<WmsStock> qw = Wrappers.query();
// 固定条件：未删除的现存数据
qw.eq("mc.del_flag", 0);
qw.eq("mc.data_type", 1);
qw.eq("mc.status", 0);
qw.in("mc.material_type", Arrays.asList("成品", "原料"));
// 处理仓库ID查询，支持递归查询子节点
if (bo.getActualWarehouseId() != null) {
List<Long> warehouseIds = getActualWarehouseIdsWithChildren(bo.getActualWarehouseId());
if (warehouseIds.size() == 1) {
qw.eq("mc.actual_warehouse_id", warehouseIds.get(0));
} else {
qw.in("mc.actual_warehouse_id", warehouseIds);
}
}
// 递归库区过滤下放到 SQL (CTE) 中处理，避免 Java 侧递归造成超大 IN 列表
qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId());
// 优化模糊查询为前缀匹配，便于走索引（若有）
// 优化模糊查询为前缀匹配，便于走索引
qw.likeRight(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo());
// 分组改由 SQL 中显式控制，避免在 Wrapper 中拼装大量分组字段
return qw;
}
private List<Long> getActualWarehouseIdsWithChildren(Long actualWarehouseId) {
List<Long> actualWarehouseIds = new ArrayList<>();
actualWarehouseIds.add(actualWarehouseId); // 添加当前仓库ID
// 递归获取所有子仓库ID
getChildActualWarehouseIds(actualWarehouseId,actualWarehouseIds);
return actualWarehouseIds;
}
private void getChildActualWarehouseIds(Long parentId, List<Long> actualWarehouseIds) {
// 查询直接子仓库
List<WmsActualWarehouse> children = actualWarehouseMapper.selectList(
Wrappers.<WmsActualWarehouse>lambdaQuery()
.eq(WmsActualWarehouse::getParentId, parentId)
.eq(WmsActualWarehouse::getDelFlag, 0)
);
// 递归处理每个子仓库
for (WmsActualWarehouse child : children) {
actualWarehouseIds.add(child.getActualWarehouseId());
getChildActualWarehouseIds(child.getActualWarehouseId(), actualWarehouseIds);
}
}
/**
* 查询库存：原材料/产品与库区/库位的存放关系列表
*/

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

@@ -91,40 +91,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY totalQuantity DESC
</select>
<select id="selectVoPagePlusActual" resultType="com.klp.domain.vo.WmsStockVo">
<if test="rootWarehouseId != null">
WITH RECURSIVE aw_tree AS (
SELECT aw.actual_warehouse_id
FROM wms_actual_warehouse aw
WHERE aw.actual_warehouse_id = #{rootWarehouseId} AND aw.del_flag = 0
UNION ALL
SELECT c.actual_warehouse_id
FROM wms_actual_warehouse c
INNER JOIN aw_tree p ON c.parent_id = p.actual_warehouse_id
WHERE c.del_flag = 0
)
</if>
SELECT
mc.actual_warehouse_id AS actualWarehouseId,
mc.item_type AS itemType,
mc.item_id AS itemId,
MIN(w.actual_warehouse_name) AS actualWarehouseName,
MIN(CASE WHEN mc.item_type = 'product' THEN p.product_name
WHEN mc.item_type = 'raw_material' THEN r.raw_material_name
ELSE NULL END) AS itemName,
MIN(CASE WHEN mc.item_type = 'product' THEN p.product_code
WHEN mc.item_type = 'raw_material' THEN r.raw_material_code
ELSE NULL END) AS itemCode,
MIN(CASE WHEN mc.item_type = 'product' THEN p.specification
WHEN mc.item_type = 'raw_material' THEN r.specification
ELSE NULL END) AS specification,
MIN(CASE WHEN mc.item_type = 'product' THEN p.material
WHEN mc.item_type = 'raw_material' THEN r.material
ELSE NULL END) AS material,
MIN(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) AS surfaceTreatmentDesc,
MIN(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,
MIN(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
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_raw_material r ON mc.item_type = 'raw_material' AND mc.item_id = r.raw_material_id AND r.del_flag = 0
${ew.customSqlSegment}
GROUP BY mc.actual_warehouse_id, mc.item_type, mc.item_id
g.actual_warehouse_id AS actualWarehouseId,
g.item_type AS itemType,
g.item_id AS itemId,
w.actual_warehouse_name AS actualWarehouseName,
CASE WHEN g.item_type = 'product' THEN p.product_name
WHEN g.item_type = 'raw_material' THEN r.raw_material_name
ELSE NULL END AS itemName,
CASE WHEN g.item_type = 'product' THEN p.product_code
WHEN g.item_type = 'raw_material' THEN r.raw_material_code
ELSE NULL END AS itemCode,
CASE WHEN g.item_type = 'product' THEN p.specification
WHEN g.item_type = 'raw_material' THEN r.specification
ELSE NULL END AS specification,
CASE WHEN g.item_type = 'product' THEN p.material
WHEN g.item_type = 'raw_material' THEN r.material
ELSE NULL END AS material,
CASE WHEN g.item_type = 'product' THEN p.surface_treatment_desc
WHEN g.item_type = 'raw_material' THEN r.surface_treatment_desc
ELSE NULL END AS surfaceTreatmentDesc,
CASE WHEN g.item_type = 'product' THEN p.zinc_layer
WHEN g.item_type = 'raw_material' THEN r.zinc_layer
ELSE NULL END AS zincLayer,
CASE WHEN g.item_type = 'product' THEN p.manufacturer
WHEN g.item_type = 'raw_material' THEN r.manufacturer
ELSE NULL END AS manufacturer,
g.totalQuantity,
g.onTheWay
FROM (
SELECT mc.actual_warehouse_id,
mc.item_type,
mc.item_id,
COUNT(*) AS totalQuantity,
SUM(CASE WHEN mc.status = 1 THEN 1 ELSE 0 END) AS onTheWay
FROM wms_material_coil mc FORCE INDEX (idx_mc_fixed_group)
${ew.customSqlSegment}
<if test="rootWarehouseId != null">
-- 过滤仓库ID：仅包含CTE查询出的根/子仓库
AND mc.actual_warehouse_id IN (SELECT actual_warehouse_id FROM aw_tree)
</if>
GROUP BY mc.actual_warehouse_id, mc.item_type, mc.item_id
) g
LEFT JOIN wms_actual_warehouse w ON g.actual_warehouse_id = w.actual_warehouse_id AND w.del_flag = 0
LEFT JOIN wms_product p ON g.item_type = 'product' AND g.item_id = p.product_id AND p.del_flag = 0
LEFT JOIN wms_raw_material r ON g.item_type = 'raw_material' AND g.item_id = r.raw_material_id AND r.del_flag = 0
ORDER BY g.actual_warehouse_id, g.item_type, g.item_id
</select>
</mapper>