diff --git a/app/api/lists/product/ProductLists.php b/app/api/lists/product/ProductLists.php
index 02ff4c40..c284d207 100644
--- a/app/api/lists/product/ProductLists.php
+++ b/app/api/lists/product/ProductLists.php
@@ -119,6 +119,8 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
         }else{
             $where[]=['store_id','=',2];
         }
+        $this->searchWhere[]=['status','=',1];
+        $this->searchWhere[]=['stock','>',0];
         $M_store_id=$this->request->__get('store_id');
         if($M_store_id){
             $where[]=['store_id','=',$M_store_id];
diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php
index eaaf67ae..11389cf7 100644
--- a/app/store/controller/system_store_storage/SystemStoreStorageController.php
+++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php
@@ -38,7 +38,7 @@ class SystemStoreStorageController extends BaseAdminController
         if($id==0){
             return $this->fail('参数错误');
         }
-        $res=SystemStoreStorage::where(['id' => $id,'store_id'=>$this->adminInfo['store_id']])->update(['status'=>1,'staff_id'=>$this->adminId]);
+        $res=SystemStoreStorage::where(['id' => $id,'store_id'=>$this->adminInfo['store_id']])->update(['status'=>1,'staff_id'=>$this->adminId,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]);
         if($res){
             $find=SystemStoreStorage::where(['id' => $id])->find();
             StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->inc('stock',$find['nums'])->update();