1

app/Model/ProductInventorySet.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Model;
+
+use App\Scopes\TopDepartmentScope;
+use Illuminate\Database\Eloquent\Model;
+
+class ProductInventorySet extends Model
+{
+//    protected $fillable = ['userData','search'];
+    protected $guarded = [];
+    protected $table = "product_inventory_set"; //指定表
+    const CREATED_AT = 'crt_time';
+    const UPDATED_AT = 'upd_time';
+    protected $dateFormat = 'U';
+    const type_one = 1;//校验锁定
+    const type_two = 2;//不校验锁定
+
+    public static $user = [];
+    public static $search = [];
+    public static $is_search = false;
+
+    public function __construct(array $attributes = [])
+    {
+        if(! empty($attributes['userData'])) {
+            self::$user = $attributes['userData'];
+            self::$search = $attributes['search'];
+            self::$is_search = true;
+        }
+        parent::__construct($attributes);
+    }
+
+    protected static function boot(){
+        parent::boot();
+        if(self::$is_search){
+            static::addGlobalScope(new TopDepartmentScope(self::$user, self::$search));
+        }
+    }
+}

app/Service/ProductInventoryService.php

@@ -12,6 +12,7 @@ use App\Model\InvoiceOrderInfo;
 use App\Model\Product;
 use App\Model\ProductCategory;
 use App\Model\ProductInventory;
+use App\Model\ProductInventorySet;
 use App\Model\ProductInventorySettings;
 use App\Model\PurchaseOrder;
 use App\Model\ReturnExchangeOrder;
@@ -338,24 +339,24 @@ class ProductInventoryService extends Service
         return $array;
     }
 
-    //库存设置列表 todo
-    public function productInventorySetList1($data, $user){
-        $model = new ProductInventorySettings(['userData' => $user, 'search' => $data]);
-        $list = $model->where('del_time',0)
+    //库存设置列表
+    public function productInventorySetList($data, $user){
+        $model = new ProductInventorySet(['userData' => $user, 'search' => $data]);
+        $model = $model->where('del_time',0)
             ->where('param_one','>',0)
             ->select('id','top_depart_id','param_one')
-            ->get()->toArray();
-dump($list);die;
+            ->orderby('id', 'desc');
+
+        $list = $model->get()->toArray();
         $map = Depart::whereIn('id',array_column($list,'top_depart_id'))->pluck('title','id')->toArray();
         foreach ($list as $key => $value){
             $list[$key]['top_depart_title'] = $map[$value['top_depart_id']] ?? "";
         }
-
         return [true, $list];
     }
 
     //库存设置列表
-    public function productInventorySetList($data, $user){
+    public function productInventorySetList2($data, $user){return;
         $model = new ProductInventorySettings();
         $model = $model->where('del_time',0)
             ->where('param_one','>',0)