From edb7a5343d6eaa0277a036e1f3cf5d2d9cc50191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 4 Sep 2026 11:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockOutOrder/StockOutOrderApplicationService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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("出库明细不存在"); }