From 135f6af4479fdb50cae4cbcfcd36802126b7c45f 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:49:04 +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

---
 .../persistence/ReservationStockInOrderImpl.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 6d4f0053b..f5844ce58 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
@@ -247,6 +247,9 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
                     reservationOutMaterialDetailDO.setUnitPrice(unitPrice);
                     BigDecimal amount = unitPrice.multiply(reservationOutMaterialDetailDO.getQuantity());
                     reservationOutMaterialDetailDO.setTotalAmount(amount);
+                } else {
+                    reservationOutMaterialDetailDO.setUnitPrice(BigDecimal.ZERO);
+                    reservationOutMaterialDetailDO.setTotalAmount(BigDecimal.ZERO);
                 }
             }
 
@@ -385,6 +388,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
             reservationInMaterialDetailDO.setCreateByName(loginUser.getUserPo().getUserName());
             reservationInMaterialDetailDO.setCreateTime(new Date());
             MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(stockInProductDetail.getProductCode());
+            reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
             if (materialBaseInfoPO != null) {
                 reservationInMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
                 reservationInMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
@@ -395,9 +399,12 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
                     reservationInMaterialDetailDO.setUnitPrice(unitPrice);
                     BigDecimal amount = unitPrice.multiply(reservationInMaterialDetailDO.getQuantity());
                     reservationInMaterialDetailDO.setTotalPrice(amount);
+                } else {
+                    reservationInMaterialDetailDO.setUnitPrice(BigDecimal.ZERO);
+                    reservationInMaterialDetailDO.setTotalPrice(BigDecimal.ZERO);
                 }
             }
-            reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+
             String lot = generateDateSerialNumber();
             lot = lot+"-"+index;
             index++;