diff --git a/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php b/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php
index 17070d16a..deaa23fe0 100644
--- a/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php
+++ b/app/admin/controller/purchase_product_offer/PurchaseProductOfferController.php
@@ -96,6 +96,12 @@ class PurchaseProductOfferController extends BaseAdminController
         PurchaseProductOfferLogic::setStoreroomInfo($params);
         return $this->success('设置成功', [], 1, 1);
     }
+    public function setStoreroomInfoTwo()
+    {
+        $params = $this->request->post();
+        PurchaseProductOfferLogic::setStoreroomInfoTwo($params);
+        return $this->success('设置成功', [], 1, 1);
+    }
     /**
      * @notes 删除采购商品
      * @return \think\response\Json
diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
index 3755bfd56..a83d437d9 100644
--- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
+++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php
@@ -58,6 +58,11 @@ class BeforehandOrderLogic extends BaseLogic
         if ($order_type == 4) {
             throw new BusinessException('不能添加线上订单，线上订单只能转换');
         }
+        if($order_type==7 ||$order_type==5){
+            $is_buyer=1;
+        }else{
+            $is_buyer=-1;
+        }
         Db::startTrans();
         try {
             $datas = [];
@@ -83,6 +88,7 @@ class BeforehandOrderLogic extends BaseLogic
                 $datas[$k]['net_weight'] = $v['net_weight'] ?? '';
                 $datas[$k]['cart_num'] = $v['nums'];
                 $datas[$k]['accept_num'] = $v['nums'];
+                $datas[$k]['is_buyer'] = $is_buyer;
                 $datas[$k]['price'] = $v['price'];
                 $datas[$k]['package'] = $v['package'] ?? '';
                 $datas[$k]['total_price'] = $total_prices;
diff --git a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
index 42e18dcb8..f26b26ddb 100644
--- a/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
+++ b/app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php
@@ -255,6 +255,18 @@ class PurchaseProductOfferLogic extends BaseLogic
             throw new BusinessException($e->getMessage());
         }
     }
+    public static function setStoreroomInfoTwo(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            PurchaseProductOffer::where('id', $params['id'])->update(['buyer_nums' => $params['buyer_nums']]);
+            Db::commit();
+            return true;
+        } catch (\Throwable $e) {
+            Db::rollback();
+            throw new BusinessException($e->getMessage());
+        }
+    }
     /**
      * 是否需采购
      */
diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
index 2b99da170..159125f0e 100644
--- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php
+++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php
@@ -218,16 +218,26 @@ class WarehouseProductLogic extends BaseLogic
                     $before_nums = $warehouseProductStorege['nums'];
                     $after_nums = bcsub($warehouseProductStorege['nums'], $params['nums'], 2);
                 }
-                WarehouseProduct::where('id', $params['id'])->update([
-                    'nums' => $params['nums'],
-                    'supplier_id' => $params['supplier_id'],
-                    'pay_type' => $params['pay_type'],
-                    'nums' => $params['nums'],
-                    'purchase' => $params['purchase'],
-                    'before_nums' => $before_nums,
-                    'after_nums' => $after_nums,
-                    'total_price' => $params['nums'] * $params['purchase'],
-                ]);
+                if($find['financial_pm']==1){
+                    $datas=[
+                        'nums' => $params['nums'],
+                        'supplier_id' => $params['supplier_id'],
+                        'pay_type' => $params['pay_type'],
+                        'purchase' => $params['purchase'],
+                        'before_nums' => $before_nums,
+                        'after_nums' => $after_nums,
+                        'total_price' => $params['total_price'],
+                    ];
+                }else{
+                    $datas=[
+                        'nums' => $params['nums'],
+                        'price' => $params['price'],
+                        'before_nums' => $before_nums,
+                        'after_nums' => $after_nums,
+                        'total_price' => $params['total_price'],
+                    ];
+                }
+                WarehouseProduct::where('id', $params['id'])->update($datas);
                 $finds = WarehouseProduct::where('oid', $params['oid'])->field('sum(nums) as nums,sum(total_price) as total_price')->find();
                 if ($finds) {
                     WarehouseOrder::where('id', $params['oid'])->update([