From 03978d23d78853f1fc7976dcfbb2633c7d2af7a9 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 12:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 8 ++++++-- .../pickingOrder/service/PickingOrderDomainService.java | 4 +++- .../pickingOrder/service/ReviewOrderDomainService.java | 3 ++- .../repository/persistence/ShiftMaterialDetailImpl.java | 7 +++++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index ee2655055..1865c6e22 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -551,7 +551,9 @@ public class OutMaterialDetailImpl extends ServiceImpl outMaterialDetailList,String outOrderNumber,LoginUser loginUser) { - StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); + StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag, 1)); for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity(); if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) { @@ -700,7 +702,9 @@ public class OutMaterialDetailImpl extends ServiceImpl outMaterialDetailList,String outOrderNumber,LoginUser loginUser) { - StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); + StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(StockOutOrder::getDelFlag,1)); for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { BigDecimal nowAllocationQuantity = outMaterialDetail.getNowAllocationQuantity(); if (nowAllocationQuantity == null || nowAllocationQuantity.compareTo(BigDecimal.ZERO) <= 0) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java index d79187f09..078a926d6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java @@ -522,7 +522,9 @@ public class PickingOrderDomainService { List list = pickingMaterialDetailService.list(new QueryWrapper().lambda().eq(PickingMaterialDetail::getPickingOrderNumber, pickingOrder.getPickingOrderNumber())); for (PickingMaterialDetail pickingMaterialDetail :list){ - OutMaterialDetail outMaterialDetail = outMaterialDetailMapper.selectOne(new QueryWrapper().lambda().eq(OutMaterialDetail::getUniqueId, pickingMaterialDetail.getOutUniqueId())); + OutMaterialDetail outMaterialDetail = outMaterialDetailMapper.selectOne(new QueryWrapper().lambda() + .eq(OutMaterialDetail::getUniqueId, pickingMaterialDetail.getOutUniqueId()) + .eq(OutMaterialDetail::getDelFlag,1)); outMaterialDetail.setPickingQuantity(pickingMaterialDetail.getPickingQuantity()); outMaterialDetailMapper.updateById(outMaterialDetail); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java index 56ecf7782..054f14b46 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/ReviewOrderDomainService.java @@ -260,7 +260,8 @@ public class ReviewOrderDomainService { .eq(OutMaterialDetail::getDelFlag, 1)); if (outMd == null) { outMd = outMaterialDetailMapper.selectOne(new LambdaQueryWrapper() - .eq(OutMaterialDetail::getUniqueId, line.getOutUniqueId())); + .eq(OutMaterialDetail::getUniqueId, line.getOutUniqueId()) + .eq(OutMaterialDetail::getDelFlag, 1)); } if (outMd != null) { d.setMaterialDetailId(outMd.getMaterialDetailId()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java index 44f73bcaf..945430d61 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java @@ -20,6 +20,7 @@ import com.mhd.wms.domain.materialInventory.repository.facade.IMaterialInventory import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper; import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO; import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO; +import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail; import com.mhd.wms.domain.outMaterialDetailSerialNumber.entity.OutMaterialDetailSerialNumber; import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.facade.IOutMaterialDetailSerialNumberService; import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.todo.OutMaterialDetailSerialNumberDO; @@ -153,7 +154,9 @@ public class ShiftMaterialDetailImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); // 按照物料名称排序 - lqw.eq(ShiftMaterialDetail::getShiftIoDetailId, shiftIoDetailId).orderByAsc(ShiftMaterialDetail::getMaterialName); + lqw.eq(ShiftMaterialDetail::getShiftIoDetailId, shiftIoDetailId) + .eq(ShiftMaterialDetail::getDelFlag, 1) + .orderByAsc(ShiftMaterialDetail::getMaterialName); ShiftMaterialDetail shiftMaterialDetail = shiftMaterialDetailMapper.selectOne(lqw); ShiftMaterialDetailPO shiftMaterialDetailPO = new ShiftMaterialDetailPO(); BeanUtils.copyProperties(shiftMaterialDetail, shiftMaterialDetailPO); @@ -888,4 +891,4 @@ public class ShiftMaterialDetailImpl extends ServiceImpl