From 12e43080b8af43e019e1446aa4d03b3a76851b09 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 13:55:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExecutionStockOutOrderDomainService.java | 4 +++- .../ReservationStockOutOrderDomainService.java | 4 +++- .../ReservationStockOutOrderApi.java | 6 ++++-- .../ReserveStockOutOrderApi.java | 7 +++++-- .../ExecutionStockOutOrderApi.java | 7 +++++-- .../repository/persistence/DeliveTaskImpl.java | 5 +++-- .../service/HandoverTaskOrderDomainService.java | 1 + .../persistence/OutMaterialDetailImpl.java | 10 ++++++++-- .../service/PickingOrderDomainService.java | 8 +++++--- .../pushSyncBms/PushSyncBmsDomainService.java | 6 +++--- .../SowingDistributionDetailsImpl.java | 15 ++++++++++----- .../service/StockOutTaskOrderDomainService.java | 7 +++++-- .../facadeApi/stockOutOrder/StockOutOrderApi.java | 2 ++ 13 files changed, 57 insertions(+), 25 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java index 311b600ae..faa399de7 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/service/ExecutionStockOutOrderDomainService.java @@ -1028,7 +1028,9 @@ public class ExecutionStockOutOrderDomainService { ReservationDeliveryDetailsLink reservationDeliveryDetailsLink = list.get(0); String orderNumber = reservationDeliveryDetailsLink.getOrderNumber(); Integer bag = reservationDeliveryDetailsLink.getBag(); - ExecutionStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda().eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber), false); + ExecutionStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() + .eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber) + .eq(ExecutionStockOutOrder::getDelFlag,1), false); if (stockOutOrder != null) { ExecutionStockInOrder reservationStockInOrder = new ExecutionStockInOrder(); reservationStockInOrder.setPictureUrl(pictureUrl); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java index a90e17cdb..84c3abc6b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java @@ -1220,7 +1220,9 @@ public class ReservationStockOutOrderDomainService { ReservationDeliveryDetailsLink reservationDeliveryDetailsLink = list.get(0); String orderNumber = reservationDeliveryDetailsLink.getOrderNumber(); Integer bag = reservationDeliveryDetailsLink.getBag(); - ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda().eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber), false); + ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper().lambda() + .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber) + .eq(ReservationStockOutOrder::getDelFlag,1), false); if (stockOutOrder != null) { ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder(); reservationStockInOrder.setPictureUrl(pictureUrl); diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java index 77dd5ebf6..28114c62b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java @@ -104,7 +104,8 @@ public class ReservationStockOutOrderApi extends BaseController { { // 根据出库单号查询出库单，再按出库单ID查询详情，保证与出库管理页面一致 ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(ReservationStockOutOrder::getOutOrderNumber, outOrderNumber)); + .eq(ReservationStockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(ReservationStockOutOrder::getDelFlag,1)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); } @@ -122,7 +123,8 @@ public class ReservationStockOutOrderApi extends BaseController { return AjaxResult.error("orderNumber不能为空"); } ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber)); + .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber) + .eq(ReservationStockOutOrder::getDelFlag,1)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java index 5be6eb209..0b3d587e7 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.mhd.common.core.web.controller.BaseController; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; +import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder; import com.mhd.oms.domain.reserveOutMaterialDetail.repository.po.ReserveOutMaterialDetailPO; import com.mhd.oms.domain.reserveStockInOrder.repository.listener.ValidationException; import com.mhd.oms.domain.reserveStockInOrder.repository.todo.ReserveStockInOrderDO; @@ -149,7 +150,8 @@ public class ReserveStockOutOrderApi extends BaseController { { // 根据出库单号查询出库单，再按出库单ID查询详情，保证与出库管理页面一致 ReserveStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(ReserveStockOutOrder::getOutOrderNumber, outOrderNumber)); + .eq(ReserveStockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(ReserveStockOutOrder::getDelFlag,1)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); } @@ -167,7 +169,8 @@ public class ReserveStockOutOrderApi extends BaseController { return AjaxResult.error("orderNumber不能为空"); } ReserveStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(ReserveStockOutOrder::getOutOrderNumber, orderNumber)); + .eq(ReserveStockOutOrder::getOutOrderNumber, orderNumber) + .eq(ReserveStockOutOrder::getDelFlag,1)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java index 271db670f..d0c679bc3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockOutOrder/ExecutionStockOutOrderApi.java @@ -12,6 +12,7 @@ import com.mhd.oms.domain.executionStockOutOrder.repository.todo.ExecutionStockO import com.mhd.oms.domain.executionStockOutOrder.repository.todo.ExecutionStockOutOrderDTO; import com.mhd.oms.domain.executionStockOutOrder.service.ExecutionStockOutOrderApplicationService; import com.mhd.oms.domain.executionStockOutOrder.service.ExecutionStockOutOrderAssembler; +import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder; import com.mhd.system.api.domain.OutMaterialDetailTZPD; import com.mhd.system.api.domain.StockOutOrderTZPD; import io.swagger.annotations.ApiOperation; @@ -102,7 +103,8 @@ public class ExecutionStockOutOrderApi extends BaseController { { // 根据出库单号查询出库单，再按出库单ID查询详情，保证与出库管理页面一致 ExecutionStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(ExecutionStockOutOrder::getOutOrderNumber, outOrderNumber)); + .eq(ExecutionStockOutOrder::getOutOrderNumber, outOrderNumber) + .eq(ExecutionStockOutOrder::getDelFlag,1)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); } @@ -120,7 +122,8 @@ public class ExecutionStockOutOrderApi extends BaseController { return AjaxResult.error("orderNumber不能为空"); } ExecutionStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber)); + .eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber) + .eq(ExecutionStockOutOrder::getDelFlag,1)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java index 5d9fbaa99..df5867e8d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/deliveTask/repository/persistence/DeliveTaskImpl.java @@ -120,7 +120,8 @@ public class DeliveTaskImpl extends ServiceImpl im String orderNumber = handoverTaskOrder.getOrderNumber();//出库单号 // 已复核数量、出库单信息：直接从出库单获取（需在物料统计前获取，用于判断是否需要复核） StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(StockOutOrder::getOutOrderNumber, orderNumber)); + .eq(StockOutOrder::getOutOrderNumber, orderNumber) + .eq(StockOutOrder::getDelFlag,1)); if (stockOutOrder != null) { deliveTaskPO.setOutOrderNumber(stockOutOrder.getOutOrderNumber()); deliveTaskPO.setOutOrderStatus(stockOutOrder.getStatus()); @@ -297,4 +298,4 @@ public class DeliveTaskImpl extends ServiceImpl im public DeliveTaskPO querySum(DeliveTaskDO deliveTaskDO) { return deliveTaskMapper.querySum(deliveTaskDO); } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index e9ecea6d7..e7e0d0941 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -407,6 +407,7 @@ public class HandoverTaskOrderDomainService { //交接完成节点修改库存 String orderNumber = handoverTaskOrder.getOrderNumber(); StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getDelFlag,1) .eq(StockOutOrder::getOutOrderNumber, orderNumber)); if (stockOutOrder == null) { continue; 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 1865c6e22..a473fa5ed 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 @@ -999,7 +999,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::getDelFlag,1) + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); for (OutMaterialDetailDO outMaterialDetail : outMaterialDetailList) { Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); BigDecimal allocationQuantity = outMaterialDetail.getActualQuantity(); @@ -1109,7 +1111,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::getDelFlag,1) + .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); for (OutMaterialDetailDO outMaterialDetail : outMaterialDetailList) { Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); BigDecimal allocationQuantity = outMaterialDetail.getActualQuantity(); @@ -1245,11 +1249,13 @@ public class OutMaterialDetailImpl extends ServiceImpl().lambda() .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrderDO.getOutOrderNumber()) + .eq(OutMaterialDetail::getDelFlag,1) .eq(OutMaterialDetail::getBarCode, stockOutOrderDO.getBarCode())); }else { OutMaterialDetailSerialNumber outMaterialDetailSerialNumber = outMaterialDetailSerialNumberService.getOne(new QueryWrapper().lambda() .eq(OutMaterialDetailSerialNumber::getSerialNumber, stockOutOrderDO.getSerialNumber())); outMaterialDetailDb = outMaterialDetailMapper.selectOne(new QueryWrapper().lambda() + .eq(OutMaterialDetail::getDelFlag,1) .eq(OutMaterialDetail::getUniqueId, outMaterialDetailSerialNumber.getMaterialDetailUniqueId())); } if(outMaterialDetailDb == null){ 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 078a926d6..d255f2cea 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 @@ -401,7 +401,8 @@ public class PickingOrderDomainService { // 拣货提交（/pickingOrderApi/picking）一次拣满也会完成拣货，此前仅 completePicking 会生成复核单，此处对齐 if (Boolean.TRUE.equals(updated) && Integer.valueOf(1).equals(pickingOrderPODb.getType())) { StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() - .eq(StockOutOrder::getOutOrderNumber, pickingOrderPODb.getOrderNumber())); + .eq(StockOutOrder::getOutOrderNumber, pickingOrderPODb.getOrderNumber()) + .eq(StockOutOrder::getDelFlag,1)); if (stockOutOrder != null) { Long newReviewId = reviewOrderDomainService.tryGenerateReviewOrderAfterPickingComplete(pickingOrderPODb, stockOutOrder); if (newReviewId != null) { @@ -493,7 +494,8 @@ public class PickingOrderDomainService { int status = 6; //不需要复核的单子 标记出库单完成 StockOutOrder stockOutOrderDb = stockOutOrderService.getOne(new QueryWrapper().lambda() - .eq(StockOutOrder::getOutOrderNumber, pickingOrderPODb.getOrderNumber())); + .eq(StockOutOrder::getOutOrderNumber, pickingOrderPODb.getOrderNumber()) + .eq(StockOutOrder::getDelFlag,1)); // 与下发拣货数量比较：只下发部分时用拣货计划数量，否则用出库单总数量 List allPickingOrders = pickingOrderService.list(new QueryWrapper().lambda() .eq(PickingOrder::getDelFlag, 1) @@ -736,7 +738,7 @@ public class PickingOrderDomainService { throw new ServiceException("拣货单不存在"); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StockOutOrder::getOutOrderNumber, pickingOrderPO.getOrderNumber()); + queryWrapper.eq(StockOutOrder::getDelFlag,1).eq(StockOutOrder::getOutOrderNumber, pickingOrderPO.getOrderNumber()); StockOutOrder stockOutOrder = stockOutOrderService.getOne(queryWrapper); if(null == stockOutOrder){ throw new ServiceException("出库单不存在"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pushSyncBms/PushSyncBmsDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pushSyncBms/PushSyncBmsDomainService.java index 14861f700..85876594f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pushSyncBms/PushSyncBmsDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pushSyncBms/PushSyncBmsDomainService.java @@ -48,7 +48,7 @@ public class PushSyncBmsDomainService { public void pushInShelfOrder(String inOrderNumber) { // 根据入库单号，查询入库单信息，并拼接推送所需参数 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StockInOrder::getInOrderNumber, inOrderNumber); + queryWrapper.eq(StockInOrder::getInOrderNumber, inOrderNumber).eq(StockInOrder::getDelFlag,1); StockInOrder stockInOrder = iStockInOrderService.getOne(queryWrapper); if(null == stockInOrder){ throw new ServiceException("入库单信息未找到"); @@ -96,7 +96,7 @@ public class PushSyncBmsDomainService { */ public void pushOutOrder(String outOrderNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StockOutOrder::getOutOrderNumber, outOrderNumber); + queryWrapper.eq(StockOutOrder::getOutOrderNumber, outOrderNumber).eq(StockOutOrder::getDelFlag,1); StockOutOrder stockOutOrder = iStockOutOrderService.getOne(queryWrapper); if(null == stockOutOrder){ throw new ServiceException("出库单信息未找到"); @@ -153,4 +153,4 @@ public class PushSyncBmsDomainService { } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/sowingDistributionDetails/repository/persistence/SowingDistributionDetailsImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/sowingDistributionDetails/repository/persistence/SowingDistributionDetailsImpl.java index 6cbb43dbd..4be0031fa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/sowingDistributionDetails/repository/persistence/SowingDistributionDetailsImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/sowingDistributionDetails/repository/persistence/SowingDistributionDetailsImpl.java @@ -233,8 +233,9 @@ public class SowingDistributionDetailsImpl extends ServiceImpl().lambda(). - eq(OutMaterialDetail::getUniqueId, outMaterialDetailSerialNumber.getMaterialDetailUniqueId())); + OutMaterialDetail outMaterialDetail = outMaterialDetailMapper.selectOne(new QueryWrapper().lambda() + .eq(OutMaterialDetail::getDelFlag,1) + .eq(OutMaterialDetail::getUniqueId, outMaterialDetailSerialNumber.getMaterialDetailUniqueId())); if (outMaterialDetail == null){ throw new ServiceException("物料不存在"); } @@ -273,7 +274,9 @@ public class SowingDistributionDetailsImpl extends ServiceImpl allocationByOrder(AllocationByOrderDO allocationByOrderDO) { - StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda().eq(StockOutOrder::getOutOrderNumber, allocationByOrderDO.getOutOrderNumber())); + StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, allocationByOrderDO.getOutOrderNumber()) + .eq(StockOutOrder::getDelFlag,1)); if (stockOutOrder == null){ throw new ServiceException("出库单不存在"); } @@ -306,7 +309,9 @@ public class SowingDistributionDetailsImpl extends ServiceImpl().lambda().eq(StockOutOrder::getOutOrderNumber, allocationByOrderDO.getOutOrderNumber())); + StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda() + .eq(StockOutOrder::getOutOrderNumber, allocationByOrderDO.getOutOrderNumber()) + .eq(StockOutOrder::getDelFlag,1)); if (stockOutOrder == null){ throw new ServiceException("出库单不存在"); } @@ -356,4 +361,4 @@ public class SowingDistributionDetailsImpl extends ServiceImpl().lambda().eq(PickingOrder::getPickingOrderNumber, stockOutTaskOrderPODb.getPickingOrderNumber())); + PickingOrder onePickingOrder = pickingOrderService.getOne(new QueryWrapper().lambda() + .eq(PickingOrder::getPickingOrderNumber, stockOutTaskOrderPODb.getPickingOrderNumber()) + .eq(PickingOrder::getDelFlag,1)); PickingOrderPO pickingOrderPODb = pickingOrderService.getInfoByIdAndType(onePickingOrder.getPickingOrderId(), onePickingOrder.getType()); return updateStockOutOrder(pickingOrderPODb); } @@ -938,6 +940,7 @@ public class StockOutTaskOrderDomainService { // 与 PickingOrderDomainService.picking 一致：PDA 按物料拣货/作业单路径拣满时只走本方法，需触发生成复核单 if (stockOutUpdated) { StockOutOrder so = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getDelFlag,1) .eq(StockOutOrder::getOutOrderNumber, pickingOrderPODb.getOrderNumber())); if (so != null) { Long newReviewId = reviewOrderDomainService.tryGenerateReviewOrderAfterPickingComplete(pickingOrderPODb, so); @@ -1068,4 +1071,4 @@ public class StockOutTaskOrderDomainService { } } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java index 6e3d11735..eb8575300 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java @@ -208,6 +208,7 @@ public class StockOutOrderApi extends BaseController { public AjaxResult getInfoOutOrderNumber(String outOrderNumber) { // 根据出库单号查询出库单，再按出库单ID查询详情，保证与出库管理页面一致 StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getDelFlag,1) .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在"); @@ -226,6 +227,7 @@ public class StockOutOrderApi extends BaseController { return AjaxResult.error("orderNumber不能为空"); } StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper() + .eq(StockOutOrder::getDelFlag,1) .eq(StockOutOrder::getOutOrderNumber, orderNumber)); if (stockOutOrder == null) { return AjaxResult.error("出库单不存在");