From cf94814ae6240138f1f425c4474d149284dbc72e Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 31 Jan 2026 15:05:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(material):=20=E4=BF=AE=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=AD=E7=BC=BA=E5=B0=91=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在采购单查询中添加状态过滤，排除已取消的采购单 - 在采购明细查询中添加逻辑删除标志过滤 - 在价格历史记录查询中统一添加逻辑删除标志过滤 - 确保所有数据查询都遵循逻辑删除规范 --- .../java/com/gear/mat/service/impl/MatMaterialServiceImpl.java | 3 +++ .../gear/mat/service/impl/MatPurchaseInDetailServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java b/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java index 4251fd8..0cf33d0 100644 --- a/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java +++ b/gear-mat/src/main/java/com/gear/mat/service/impl/MatMaterialServiceImpl.java @@ -200,6 +200,7 @@ public class MatMaterialServiceImpl implements IMatMaterialService { QueryWrapper purchaseQw = new QueryWrapper<>(); purchaseQw.in("material_id", materialIds); purchaseQw.eq("del_flag", 0); + purchaseQw.ne("status", 3); // 排除已取消的采购单 List purchaseListPo = matPurchaseMapper.selectList(purchaseQw); // 按materialId分组 @@ -220,6 +221,8 @@ public class MatMaterialServiceImpl implements IMatMaterialService { if (!purchaseIds.isEmpty()) { LambdaQueryWrapper detailLqw = Wrappers.lambdaQuery(); detailLqw.in(MatPurchaseInDetail::getPurchaseId, purchaseIds); + // 逻辑删除 + detailLqw.eq(MatPurchaseInDetail::getDelFlag, 0); List allDetails = matPurchaseInDetailMapper.selectList(detailLqw); detailsByPurchaseId = allDetails.stream() .collect(Collectors.groupingBy(MatPurchaseInDetail::getPurchaseId)); diff --git a/gear-mat/src/main/java/com/gear/mat/service/impl/MatPurchaseInDetailServiceImpl.java b/gear-mat/src/main/java/com/gear/mat/service/impl/MatPurchaseInDetailServiceImpl.java index 7a6774a..1d4eb97 100644 --- a/gear-mat/src/main/java/com/gear/mat/service/impl/MatPurchaseInDetailServiceImpl.java +++ b/gear-mat/src/main/java/com/gear/mat/service/impl/MatPurchaseInDetailServiceImpl.java @@ -317,6 +317,8 @@ public class MatPurchaseInDetailServiceImpl implements IMatPurchaseInDetailServi LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(MatPriceHistory::getMaterialId, materialId); lqw.orderByDesc(MatPriceHistory::getCreateTime); + // 逻辑删除 + lqw.eq(MatPriceHistory::getDelFlag, 0); lqw.last("LIMIT 1"); MatPriceHistoryVo lastHistory = matPriceHistoryMapper.selectVoOne(lqw); @@ -405,6 +407,7 @@ public class MatPurchaseInDetailServiceImpl implements IMatPurchaseInDetailServi LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(MatPriceHistory::getMaterialId, materialId); lqw.eq(MatPriceHistory::getPurchaseInDetailId, purchaseInDetailId); + lqw.eq(MatPriceHistory::getDelFlag, 0); // 查询待删除的记录 List historyList = matPriceHistoryMapper.selectVoList(lqw);