diff --git a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
index 41e0ecc6..ea170896 100644
--- a/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
+++ b/app/admin/controller/beforehand_order_cart_info/BeforehandOrderCartInfoController.php
@@ -105,6 +105,9 @@ class BeforehandOrderCartInfoController extends BaseAdminController
      * @notes 一键入库
      */
     public function one_click_storage(){
+        if (time() > 1737561600) {
+            return $this->fail('不允许一键入库');
+        }
         $params=$this->request->post();
         $params['admin_id']=$this->adminId;
         BeforehandOrderCartInfoLogic::oneClickStorage($params);
diff --git a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
index 51529640..c0498324 100644
--- a/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
+++ b/app/admin/lists/purchase_product_offer/PurchaseProductOfferLists.php
@@ -65,6 +65,18 @@ class PurchaseProductOfferLists extends BaseAdminDataLists implements ListsSearc
                 $this->searchWhere[]=['order_id','in',$ids];
             }
         }
+        if(!empty($this->params['order_sn'])){
+            $orderIds = BeforehandOrder::where('order_id','like','%'.$this->params['order_sn'].'%')->column('id');
+            $this->searchWhere[]=['order_id','in',$orderIds];
+        }
+        if(!empty($this->params['product_name'])){
+            $productIds = StoreProduct::where('store_name','like','%'.$this->params['product_name'].'%')->column('id');
+            $this->searchWhere[]=['product_id','in',$productIds];
+        }
+        if(!empty($this->params['order_sort_list'])){
+            $this->searchWhere[]=['is_storage','=',0];
+            $this->searchWhere[]=['total_price','>',0];
+        }
         return PurchaseProductOffer::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])