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);