From 304e0d3199b5956f436aab7a02e459f89fa36c14 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 24 Jan 2025 17:43:33 +0800
Subject: [PATCH] =?UTF-8?q?perf(warehouse):=20=E4=BC=98=E5=8C=96=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了在搜索产品时对已删除产品的查询，提高搜索效率
- 注释掉了在获取列表时对已删除数据的查询，准备后续彻底移除
---
 app/admin/lists/warehouse_product/WarehouseProductLists.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index 0cc4ae86d..869ed72a6 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -54,7 +54,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
     {
         if ($this->request->get('product_id')) {
             $product_id = $this->request->get('product_id');
-            $ids = StoreProduct::where('store_name', 'like', '%' . $product_id . '%')->withTrashed()->column('id');
+            $ids = StoreProduct::where('store_name', 'like', '%' . $product_id . '%')->column('id');
             if ($ids) {
                 $this->searchWhere[] = ['product_id', 'in', $ids];
                 $this->ids = $ids;
@@ -64,7 +64,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
         }
         if ($this->request->get('bar_code')) {
             $bar_code = $this->request->get('bar_code');
-            $ids = StoreProduct::where('bar_code', 'like', '%' . $bar_code . '%')->withTrashed()->column('id');
+            $ids = StoreProduct::where('bar_code', 'like', '%' . $bar_code . '%')->column('id');
             if ($ids) {
                 $this->searchWhere[] = ['product_id', 'in', $ids];
                 $this->ids = $ids;
@@ -76,7 +76,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
             ->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'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->withTrashed()
+            // ->withTrashed()
             ->select()->each(function ($item) {
                 $item->store_name = '';
                 $item->image = '';