From 68fab40a256c634455df006ffe66cb95c7bf08d5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\Administrator" <604446095@qq.com>
Date: Fri, 20 Dec 2024 16:24:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=80=E6=9C=9F=E8=A1=A5=E5=8D=95?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=B8=8D=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BeforehandOrderCartInfoLogic.php               | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
index 1940ed98d..6381f8080 100644
--- a/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
+++ b/app/admin/logic/beforehand_order_cart_info/BeforehandOrderCartInfoLogic.php
@@ -212,6 +212,16 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
             ];
             $res = WarehouseOrder::create($arr);
             foreach ($offer_list as $k => $v) {
+                if (!empty($v['source_order_info'])) {
+                    // 采购单来源于往期补单，需要减少对应订单的入库数量
+                    $sourceOrderInfo = reset_index($v['source_order_info'], 'source_order_id');
+                    $orders = BeforehandOrder::field('id,order_type')->whereIn('id', array_keys($sourceOrderInfo))->select()->toArray();
+                    foreach ($orders as $order) {
+                        if ($order['order_type'] == 6) {
+                            $v['buyer_nums'] = $v['buyer_nums'] - $sourceOrderInfo[$order['id']]['need_num'];
+                        }
+                    }
+                }
                 $data['admin_id'] = $params['admin_id'];
                 $data['order_type'] = $beforehandOrder['order_type'];
                 $data['store_id'] = 0;
@@ -241,7 +251,9 @@ class BeforehandOrderCartInfoLogic extends BaseLogic
                 if($product_arr!=[]){
                     StoreProduct::where('id',$v['product_id'])->save($product_arr);
                 }
-                WarehouseProductLogic::add($data);
+                if ($data['nums'] > 0) {
+                    WarehouseProductLogic::add($data);
+                }
                 PurchaseProductOffer::where('id', $v['id'])->update(['status' => 1, 'is_storage' => 1]);
             }
             $attrs = ['warehousing_id' => $res['id'],'is_warehousing'=>1];

From 181bd0a689595f85d6e95c9375407a0b2490fcde Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 21 Dec 2024 11:19:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(admin):=20=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉了一段用于计算采购价格和总价的代码
- 注释掉了一段用于获取产品价格的代码
- 保留了获取产品名称、图片、单位名称、商店信息和顶级分类名称的代码
---
 .../lists/warehouse_product/WarehouseProductLists.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index 320a6586c..0cc4ae86d 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -110,13 +110,13 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                 if ($item->product_id) {
                     $find = StoreProduct::where('id', $item->product_id)->field('price,purchase,image,store_name,unit,store_info,top_cate_id')->withTrashed()->find();
                     if($find){
-                        if($item->purchase<=0){
-                            $item->purchase = $find->purchase;
-                            $item->total_price=bcmul($find->purchase,$item->nums,2);
-                        }
+                        // if($item->purchase<=0){
+                        //     $item->purchase = $find->purchase;
+                        //     $item->total_price=bcmul($find->purchase,$item->nums,2);
+                        // }
                         $item->store_name = $find->store_name . '|' . $item->product_id;
                         $item->image = $find->image;
-                        $item->price = $find->price;
+                        // $item->price = $find->price;
                         $item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name');
                         $item->store_info =$find->store_info;
                         $item->top_cate_name =StoreCategory::where('id', $find->top_cate_id)->value('name');