weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

维他奶配送明细修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-27 20:07:07 +08:00
parent e2d312a79c
commit d91d8e9801
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+2
View File
@@ -3,6 +3,7 @@ package com.mhd.oms.domain.reservationStockOutOrder.repository.todo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.annotation.Excel;
import com.mhd.common.core.web.domain.BaseVOEntity; 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.oms.domain.reservationOutMaterialDetail.repository.todo.ReservationOutMaterialDetailDO;
//import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; //import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -526,4 +527,5 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
@ApiModelProperty("退货数量") @ApiModelProperty("退货数量")
@Excel(name = "退货数量") @Excel(name = "退货数量")
private BigDecimal returnQuantity; private BigDecimal returnQuantity;
private List<ReservationDeliveryDetailsLink> reservationDeliveryDetailsLinkList;
} }
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
+2
View File
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.annotation.Excel;
//import com.mhd.wms.interfaces.dto.outMaterialDetail.OutMaterialDetailDTO; //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 com.mhd.oms.domain.reservationOutMaterialDetail.repository.todo.ReservationOutMaterialDetailDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -514,4 +515,5 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
@ApiModelProperty("退货数量") @ApiModelProperty("退货数量")
@Excel(name = "退货数量") @Excel(name = "退货数量")
private BigDecimal returnQuantity; private BigDecimal returnQuantity;
private List<ReservationDeliveryDetailsLink> reservationDeliveryDetailsLinkList;
} }
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+4
View File
@@ -184,6 +184,10 @@ public class ReservationStockOutOrderDomainService {
// } // }
// } // }
List<ReservationDeliveryDetailsLink> reservationDeliveryDetailsLinkList = stockOutOrderDO.getReservationDeliveryDetailsLinkList();
if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) {
reservationDeliveryDetailsLinkService.updateBatchById(reservationDeliveryDetailsLinkList);
}
return outMaterialDetailService.batchUpdate(stockOutOrderDO.getMaterialDetailList(), outMaterialDetailBaseDO); return outMaterialDetailService.batchUpdate(stockOutOrderDO.getMaterialDetailList(), outMaterialDetailBaseDO);
} }