From 4d1d2e0745a2e9b70275c1e0a7381970728be981 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 29 Aug 2024 11:01:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(CartList):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E5=92=8C=E5=8D=95=E4=BD=8D=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/lists/cart/CartList.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/store/lists/cart/CartList.php b/app/store/lists/cart/CartList.php
index bfa55e9de..f136bdfcc 100644
--- a/app/store/lists/cart/CartList.php
+++ b/app/store/lists/cart/CartList.php
@@ -49,7 +49,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
             'is_pay' => 0
         ];
         $list = Cart::where($this->searchWhere)->where($where)
-            ->limit($this->limitOffset, $this->limitLength)
+            ->limit(100)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) {
 
@@ -91,7 +91,14 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
                 $item['image'] = $find['image'];
                 $item['cost'] = $find['cost'];
                 $item['store_name'] = $find['store_name'];
-                $item['unit_name'] = StoreProductUnit::where('id', $find['unit'])->value('name');
+                $unit = StoreProductUnit::where('id', $find['unit'])->find();
+                if($unit){
+                    $item['unit_name']=$unit['name'];
+                    $item['is_bulk']=$unit['is_bulk'];
+                }else{
+                    $item['unit_name']='';
+                    $item['is_bulk']=0;
+                }
             }
         }
         return $list;

From c25aef2197de53fcdfc711e1fa2a482739a0cf4e Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 29 Aug 2024 17:49:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=20'between=5Ftime'=20=E5=92=8C?=
 =?UTF-8?q?=E5=9B=9B=E4=B8=AAID=E5=8F=82=E6=95=B0=E5=88=B0=20WarehouseOrde?=
 =?UTF-8?q?rLists=20=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/warehouse_order/WarehouseOrderLists.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/admin/lists/warehouse_order/WarehouseOrderLists.php b/app/admin/lists/warehouse_order/WarehouseOrderLists.php
index 543c26ca7..491184e7b 100644
--- a/app/admin/lists/warehouse_order/WarehouseOrderLists.php
+++ b/app/admin/lists/warehouse_order/WarehouseOrderLists.php
@@ -29,7 +29,8 @@ class WarehouseOrderLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-        '='=>['financial_pm']
+        '='=>['financial_pm','supplier_id','warehouse_id','store_id'],
+        'between_time' => 'create_time'
         ];
     }