From 03ca6a421262ec8cd325e66dd3cc50e296113785 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Thu, 4 Jun 2026 11:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/po/ReservationInMaterialDetailPO.java | 4 ++++ .../service/ReservationStockInOrderDomainService.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java index 576f58c05..faaf21c46 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java @@ -411,6 +411,10 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO @Excel(name = "lot编号") private String lotNo; + @ApiModelProperty("单价") + @Excel(name = "单价") + private BigDecimal unitPrice; + @ApiModelProperty("调整前库存数量") @Excel(name = "调整前库存数量") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java index de8416772..423fe967a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java @@ -303,6 +303,12 @@ public class ReservationStockInOrderDomainService { inMaterialDetail.setAdjustedVolume(inventoryAdjustmentRecordPO.getAdjustedVolume()); inMaterialDetail.setAdjustedArea(inventoryAdjustmentRecordPO.getAdjustedArea()); } + if(materialBaseInfoId != null){ + MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId); + if (materialBaseInfoPO != null &&materialBaseInfoPO.getUnitPrice() != null){ + inMaterialDetail.setUnitPrice(materialBaseInfoPO.getUnitPrice()); + } + } // 填充收货数量(入库单对应的收货单实际收货数量) //ReceiptMaterialDetailPO receiptDetail = receiptDetailMap.get(materialDetailId); // if (receiptDetail != null) {