1

app/Service/EmployeeService.php

@@ -1207,7 +1207,8 @@ class EmployeeService extends Service
         $is_all_depart = 0;
         if(! empty($depart)){
             //库存校验
-            $set_map = ProductInventorySet::where('del_time',0)->pluck('param_one','top_depart_id')->toArray();
+            $set_map = DB::table('depart_set')->where('del_time',0)->pluck('param_one','top_depart_id')->toArray();
+
             //所有部门
             $list = Depart::where('del_time',0)->get()->toArray();
             $depart_map = array_column($list,null,'id');

app/Service/ProductInventoryService.php

@@ -339,13 +339,15 @@ class ProductInventoryService extends Service
     }
 
     //系统设置列表
-    public function productInventorySetList1($data, $user){
+    public function productInventorySetList($data, $user){
         $model = new ProductInventorySet(['userData' => $user, 'search' => $data]);
+
         $model = $model->where('del_time',0)
             ->select('id','top_depart_id','param_one','param_two')
             ->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']] ?? "";
@@ -354,7 +356,7 @@ class ProductInventoryService extends Service
     }
 
     //系统设置列表
-    public function productInventorySetList($data, $user){
+    public function productInventorySetList1($data, $user){
         $model = new ProductInventorySet();
         $model = $model->where('del_time',0)
             ->select('id','top_depart_id','param_one','param_two');

app/Service/SportsBagService.php

@@ -276,24 +276,41 @@ class SportsBagService extends Service
         }
 
         $list = $this->limit($model,'',$data);
-        $list = $this->fillListData($list);
+        $list = $this->fillListData($list,$data);
 
         return [true, $list];
     }
 
-    public function fillListData($data){
+    public function fillListData($data,$ergs){
         if(empty($data['data'])) return $data;
 
         $emp_id = array_unique(array_merge_recursive(array_column($data['data'],'crt_id')));
         $emp_map = Employee::whereIn('id',$emp_id)
                     ->pluck('emp_name','id')
                     ->toArray();
+        $product = [];
+        if(! empty($ergs['product'])){
+            $sales_p_info = SportsBagProductInfo::where('del_time',0)
+                ->where('sports_bag_id',array_column($data['data'],'id'))
+                ->get()->toArray();
+            $map = (new ProductService())->getProductDetail(array_column($sales_p_info,'product_id'));
+            foreach ($sales_p_info as $value){
+                $tmp = $map[$value['product_id']] ?? [];
+                $value['title'] = $tmp['title'] ?? "";
+                $value['code'] = $tmp['code'] ?? "";
+                $value['size'] = $tmp['size'] ?? "";
+                $value['unit'] = $tmp['unit'] ?? "";
+                $value['bar_code'] = $tmp['bar_code'] ?? "";
+                $product[$value['sports_bag_id']][] = $value;
+            }
+        }
         foreach ($data['data'] as $key => $value){
             $start_time = $value['start_time'] ? date("Y-m-d H:i",$value['start_time']) : '';
             $end_time = $value['end_time'] ? date("Y-m-d H:i",$value['end_time']) : '';
             $data['data'][$key]['sports_bag_time'] = $start_time . '——' . $end_time;
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp_map[$value['crt_id']] ?? '';
+            $data['data'][$key]['product'] = $product[$value['id']] ?? [];
         }
 
         return $data;