Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

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 = "调整前库存数量")

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) {