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"));