From e3021854a1635d7c51021d4e8694c19e2ee746cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Thu, 4 Jun 2026 17:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=87=91=E9=A2=9D=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReservationStockInOrderImpl.java          | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
index b8ec9b043..5c3fba35e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
@@ -236,11 +236,20 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             ReservationOutMaterialDetailDO reservationOutMaterialDetailDO = new ReservationOutMaterialDetailDO();
             reservationOutMaterialDetailDO.setOutOrderNumber(reservationStockOutOrderDO.getOutOrderNumber());
             MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
-            reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
-            reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(productDetail.getBoxCount()).setScale(2, BigDecimal.ROUND_HALF_UP)));
-            reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
-            reservationOutMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
-            reservationOutMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
+            if (materialBaseInfoPO != null) {
+                reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
+                reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
+                reservationOutMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
+                reservationOutMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
+                BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
+                if (unitPrice != null)  {
+                    reservationOutMaterialDetailDO.setUnitPrice(unitPrice);
+                    BigDecimal amount = unitPrice.multiply(reservationOutMaterialDetailDO.getQuantity());
+                    reservationOutMaterialDetailDO.setTotalAmount(amount);
+                }
+            }
+
+            reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             reservationOutMaterialDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
             reservationOutMaterialDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
             reservationOutMaterialDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -380,6 +389,13 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
                 reservationInMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
                 reservationInMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
                 reservationInMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
+//                reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+                BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
+                if (unitPrice != null)  {
+                    reservationInMaterialDetailDO.setUnitPrice(unitPrice);
+                    BigDecimal amount = unitPrice.multiply(reservationInMaterialDetailDO.getQuantity());
+                    reservationInMaterialDetailDO.setTotalPrice(amount);
+                }
             }
             reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             String lot = generateDateSerialNumber();