发31

2026-09-04 13:55:07 +08:00
parent 77e0c77fbf
commit 12e43080b8
13 changed files with 57 additions and 25 deletions
@@ -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<ExecutionStockOutOrder>().lambda().eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber), false);
+                ExecutionStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<ExecutionStockOutOrder>().lambda()
+                        .eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber)
+                        .eq(ExecutionStockOutOrder::getDelFlag,1), false);
                if (stockOutOrder != null) {
                    ExecutionStockInOrder reservationStockInOrder = new ExecutionStockInOrder();
                    reservationStockInOrder.setPictureUrl(pictureUrl);
@@ -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<ReservationStockOutOrder>().lambda().eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber), false);
+                ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new QueryWrapper<ReservationStockOutOrder>().lambda()
+                        .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber)
+                        .eq(ReservationStockOutOrder::getDelFlag,1), false);
                if (stockOutOrder != null) {
                    ReservationStockInOrder reservationStockInOrder = new ReservationStockInOrder();
                    reservationStockInOrder.setPictureUrl(pictureUrl);
@@ -104,7 +104,8 @@ public class ReservationStockOutOrderApi extends BaseController {
    {
        // 根据出库单号查询出库单，再按出库单ID查询详情，保证与出库管理页面一致
        ReservationStockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper<ReservationStockOutOrder>()
-                .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<ReservationStockOutOrder>()
-                .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber));
+                .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber)
+                .eq(ReservationStockOutOrder::getDelFlag,1));
        if (stockOutOrder == null) {
            return AjaxResult.error("出库单不存在");
        }
@@ -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<ReserveStockOutOrder>()
-                .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<ReserveStockOutOrder>()
-                .eq(ReserveStockOutOrder::getOutOrderNumber, orderNumber));
+                .eq(ReserveStockOutOrder::getOutOrderNumber, orderNumber)
+                .eq(ReserveStockOutOrder::getDelFlag,1));
        if (stockOutOrder == null) {
            return AjaxResult.error("出库单不存在");
        }
@@ -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<ExecutionStockOutOrder>()
-                .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<ExecutionStockOutOrder>()
-                .eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber));
+                .eq(ExecutionStockOutOrder::getOutOrderNumber, orderNumber)
+                .eq(ExecutionStockOutOrder::getDelFlag,1));
        if (stockOutOrder == null) {
            return AjaxResult.error("出库单不存在");
        }