diff --git a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
index 8a31a5a44..b5980afee 100644
--- a/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
+++ b/app/admin/logic/warehouse_order/WarehouseOrderLogic.php
@@ -95,7 +95,7 @@ class WarehouseOrderLogic extends BaseLogic
         try {
             foreach ($params['product_arr'] as $k => $v) {
                 $data['admin_id'] = $params['admin_id'];
-                $data['store_id'] = 0;
+                $data['store_id'] = $find['store_id'];
                 $data['oid'] = $find['id'];
                 $data['supplier_id'] = $find['supplier_id'];
                 $data['warehouse_id'] = $find['warehouse_id'];
diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index f92f72b2c..c1731767c 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -2,7 +2,7 @@
 
 namespace app\admin\logic\warehouse_product;
 
-
+use app\admin\logic\store_product\StoreProductLogic;
 use app\common\model\warehouse_product\WarehouseProduct;
 use app\common\logic\BaseLogic;
 use app\common\model\purchase_product_offer\PurchaseProductOffer;
@@ -46,6 +46,18 @@ class WarehouseProductLogic extends BaseLogic
                     throw new BusinessException('库存不足,warehouse_id:'.$params['warehouse_id'].'product_id:'.$params['product_id']);
                 }
                 WarehouseProductStorege::where('id', $storege['id'])->dec('nums', $params['nums'])->update();
+                //门店加库存
+                $storeBranchProduct = StoreBranchProduct::where('product_id', $params['product_id'])->where('store_id',$params['store_id'])->find();
+                if(!$storeBranchProduct){
+                    $storeProduct = StoreProduct::where('id', $params['product_id'])->findOrEmpty()->toArray();
+                    if (!$storeProduct) {
+                        throw new BusinessException('商品不存在');
+                    }
+                    $storeBranchProduct=StoreProductLogic::ordinary(['id'=>$params['product_id']],$params['store_id'], $params['admin_id'], $storeProduct);
+                }
+                if ($params['nums'] > 0) {
+                    StoreBranchProduct::where('id', $storeBranchProduct['id'])->inc('stock',$params['nums'])->update();
+                } 
             } else {
                 $after_nums = $storege['nums'] + $params['nums'];
                 WarehouseProductStorege::where('id', $storege['id'])->inc('nums', $params['nums'])->update();