diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
index 508e64d9b..2c5b20546 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java
@@ -42,6 +42,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -178,9 +180,39 @@ public class ReserveStockOutOrderDomainService {
             stockOutOrderDO.setCheckTaskDistribution(2);
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
-//        stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
-//        stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
+        if (stockOutOrderDO.getWarehouseId() != null) {
+            AjaxResult wr = systemServiceFeign.getWarehouseInfoByWarehouseId(stockOutOrderDO.getWarehouseId());
+            if ("200".equals(String.valueOf(wr.get("code")))) {
+                WarehouseFeignPO wh = JSON.parseObject(JSONObject.toJSONString(wr.get("data")), WarehouseFeignPO.class);
+                if (stockOutOrderDO.getOrganizationId() == null && wh.getOrganizationId() != null) {
+                    stockOutOrderDO.setOrganizationId(wh.getOrganizationId());
+                    stockOutOrderDO.setOrganizationName(wh.getOrganizationName());
+                }
+                if (wh.getTopOrganizationId() != null) {
+                    stockOutOrderDO.setTopOrganizationId(wh.getTopOrganizationId());
+                }
+                if (StringUtils.isBlank(stockOutOrderDO.getWarehouseCode())) {
+                    stockOutOrderDO.setWarehouseCode(wh.getWarehouseCode());
+                    stockOutOrderDO.setWarehouseName(wh.getWarehouseName());
+                }
+            }
+        }
+        if (stockOutOrderDO.getTopOrganizationId() == null) {
+            stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+        }
+        if (stockOutOrderDO.getOrganizationId() == null) {
+            stockOutOrderDO.setOrganizationId(2841L);
+            stockOutOrderDO.setOrganizationName("仓码");
+        }
+        if (stockOutOrderDO.getShipperId() == null && loginUser.getUserShipperPo() != null) {
+            stockOutOrderDO.setShipperId(loginUser.getUserPo().getUserId());
+            stockOutOrderDO.setShipperName(loginUser.getUserPo().getUserName());
+            stockOutOrderDO.setCustomerId(loginUser.getUserPo().getUserId());
+            stockOutOrderDO.setCustomerName(loginUser.getUserPo().getUserName());
+        }
+        if (stockOutOrderDO.getStatus() == null) {
+            stockOutOrderDO.setStatus(1);
+        }
         stockOutOrderService.insert(stockOutOrderDO);
         return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
     }