From 8f09785f30389aee6de706157d69c8fdfd4c929d Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Sat, 22 Feb 2025 11:10:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/warehouse_product/WarehouseProductLists.php    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index a8c08fcc7..3cd8cedd6 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -74,8 +74,13 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
                 return [];
             }
         }
-        return WarehouseProduct::where($this->searchWhere)
-            ->field(['id', 'code','pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay', 'order_type','vip_price'])
+        $query = WarehouseProduct::where($this->searchWhere);
+        if (isset($this->params['is_group']) && $this->params['is_group'] == 1) {
+            $query->group('product_id')->field(['id', 'code','pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'sum(nums) nums', 'price', 'purchase', 'cost', 'sum(total_price) total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay', 'order_type','vip_price']);
+        } else {
+            $query->field(['id', 'code','pay_type','oid','admin_id','supplier_id', 'store_id', 'warehouse_id', 'product_id', 'financial_pm', 'batch', 'nums', 'price', 'purchase', 'cost', 'total_price', 'manufacture', 'expiration_date', 'status', 'mark', 'create_time','is_pay', 'order_type','vip_price']);
+        }
+        return $query
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             // ->withTrashed()