diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index 05f5972aa..f70e06b56 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -34,7 +34,8 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa public function setSearch(): array { return [ - '=' => ['cate_id', 'is_show', 'bar_code','product_type','id'], + '=' => ['cate_id', 'is_show', 'bar_code','id'], + 'in' => ['product_type'], '<=' => ['stock'], '%like%' => ['store_name'], ]; diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index 8852b7a0d..6869b190c 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -16,6 +16,7 @@ use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; use app\common\model\system_store_storage\SystemStoreStorage; use app\common\model\user\User; +use app\common\model\warehouse_product_storege\WarehouseProductStorege; use Illuminate\Support\Facades\Log; use support\exception\BusinessException; use think\facade\Db; @@ -314,6 +315,13 @@ class StoreProductLogic extends BaseLogic $data = StoreProductGroupPrice::resetProductPrice($data, $userShip); } } + if($data['is_show']==1){ + $data['status_msg']='上架|常用'; + }else{ + $data['status_msg']='下架|不常用|是否有替换'; + } + $data['warehouse_nums']=WarehouseProductStorege::where('product_id', $params['id'])->where('warehouse_id',1)->value('nums')??0; + return $data; }