diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 7dfe88da6..af7cae9d0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1005,7 +1005,8 @@ public class StockOutOrderApplicationService { } BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD); List outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper().lambda() - .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber())); + .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber()) + .eq(OutMaterialDetail::getDelFlag,1)); List materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class); List materialDetailList2 = new ArrayList<>(); // 仅通宇账号启用与库存分配弹窗同口径的新匹配(物料+箱号/卡板+Sheet Ref 多值拆 token); @@ -1103,7 +1104,8 @@ public class StockOutOrderApplicationService { } BeanUtils.copyProperties(stockOutOrderDb, stockOutOrderD); List outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper().lambda() - .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber())); + .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDb.getOutOrderNumber()) + .eq(OutMaterialDetail::getDelFlag, 1)); List materialDetailList = cn.hutool.core.bean.BeanUtil.copyToList(outMaterialDetailList, OutMaterialDetailDO.class); List materialDetailList2 = new ArrayList<>(); for (OutMaterialDetailDO detail : materialDetailList) { @@ -1441,7 +1443,9 @@ public class StockOutOrderApplicationService { List returnOutMaterialDetailDOList = new ArrayList<>(); for (OutMaterialDetailDO outMaterialDetailDO : stockOutOrderDO.getMaterialDetailList()){ Long uniqueId = outMaterialDetailDO.getUniqueId(); - OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper().eq(OutMaterialDetail::getUniqueId, uniqueId)); + OutMaterialDetail outMaterialDetail = outMaterialDetailService.getOne(new LambdaQueryWrapper() + .eq(OutMaterialDetail::getUniqueId, uniqueId) + .eq(OutMaterialDetail::getDelFlag,1)); if (outMaterialDetail == null){ throw new ServiceException("出库明细不存在"); }