From d91d8e9801e9240e3708c3cabe1a7aa3904afdd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 27 May 2026 20:07:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BB=96=E5=A5=B6=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/ReservationStockOutOrderDO.java | 2 ++ .../repository/todo/ReservationStockOutOrderDTO.java | 2 ++ .../service/ReservationStockOutOrderDomainService.java | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index 74c38dd1b..e459b8a4c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -3,6 +3,7 @@ package com.mhd.oms.domain.reservationStockOutOrder.repository.todo; import com.fasterxml.jackson.annotation.JsonFormat; import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; +import com.mhd.oms.domain.reservationDeliveryDetailsLink.entity.ReservationDeliveryDetailsLink; import com.mhd.oms.domain.reservationOutMaterialDetail.repository.todo.ReservationOutMaterialDetailDO; //import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; import io.swagger.annotations.ApiModelProperty; @@ -526,4 +527,5 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @ApiModelProperty("退货数量") @Excel(name = "退货数量") private BigDecimal returnQuantity; + private List reservationDeliveryDetailsLinkList; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index 2f64d5492..7f32d5509 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonFormat; import com.mhd.common.core.annotation.Excel; //import com.mhd.wms.interfaces.dto.outMaterialDetail.OutMaterialDetailDTO; +import com.mhd.oms.domain.reservationDeliveryDetailsLink.entity.ReservationDeliveryDetailsLink; import com.mhd.oms.domain.reservationOutMaterialDetail.repository.todo.ReservationOutMaterialDetailDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -514,4 +515,5 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @ApiModelProperty("退货数量") @Excel(name = "退货数量") private BigDecimal returnQuantity; + private List reservationDeliveryDetailsLinkList; } \ No newline at end of file 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 e8e410985..bdda8e91b 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 @@ -184,6 +184,10 @@ public class ReservationStockOutOrderDomainService { // } // } + List reservationDeliveryDetailsLinkList = stockOutOrderDO.getReservationDeliveryDetailsLinkList(); + if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) { + reservationDeliveryDetailsLinkService.updateBatchById(reservationDeliveryDetailsLinkList); + } return outMaterialDetailService.batchUpdate(stockOutOrderDO.getMaterialDetailList(), outMaterialDetailBaseDO); }