From 9e3cedb5962a12eb223d6cc62e84c8d675e76491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 3 Jul 2026 22:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8D=95=E8=B0=83=E6=95=B4=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=A8=8E=E9=A2=9D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ReservationStockInOrderDomainService.java  |  6 ++++++
 .../service/ReservationStockOutOrderDomainService.java | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

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 eeead47c4..1ab6b1b96 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
@@ -521,6 +521,12 @@ public class ReservationStockInOrderDomainService {
                 reservationStockInOrder.setOrderTypeName("普通入库");
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
+                if (warehouseId == null || warehouseId == 0L){
+                    reservationStockInOrder.setWarehouseId(byId.getWarehouseId());
+                    reservationStockInOrder.setWarehouseCode(byId.getWarehouseCode());
+                    reservationStockInOrder.setWarehouseName(byId.getWarehouseName());
+                }
+
 //                reservationStockInOrder.setOrganizationId(orgId);
 //                reservationStockInOrder.setOrganizationName(orgName);
 //                reservationStockInOrder.setTopOrganizationId(topOrgId);
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
index 18ee27e12..188a572b5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java
@@ -372,11 +372,17 @@ public class ReservationStockOutOrderDomainService {
                 reservationStockInOrder.setOrderTypeName("普通出库");
                 reservationStockInOrder.setReservationOrderSource("客户预约");
                 reservationStockInOrder.setWarehouseId(warehouseId);
+                reservationStockInOrder.setWarehouseCode(warehouseCode);
+                reservationStockInOrder.setWarehouseName(warehouseName);
+                if (warehouseId == null || warehouseId == 0L){
+                    reservationStockInOrder.setWarehouseId(byId.getWarehouseId());
+                    reservationStockInOrder.setWarehouseCode(byId.getWarehouseCode());
+                    reservationStockInOrder.setWarehouseName(byId.getWarehouseName());
+                }
 //                reservationStockInOrder.setOrganizationId(orgId);
 //                reservationStockInOrder.setOrganizationName(orgName);
 //                reservationStockInOrder.setTopOrganizationId(topOrgId);
-                reservationStockInOrder.setWarehouseCode(warehouseCode);
-                reservationStockInOrder.setWarehouseName(warehouseName);
+
                 reservationStockInOrder.setBusinessOutOrderNumber(inOrderNumber);
                 if (materialDetailGroupByWarehouse!=null&&materialDetailGroupByWarehouse.size()>1) {
                     reservationStockInOrder.setOutOrderNumber(OrderSequence.getOrderCode("CK"));