星科源

app/Service/U8XkyServerService.php

@@ -5,6 +5,7 @@ namespace App\Service;
 use App\Model\DDEmployee;
 use App\Model\FieldData;
 use App\Model\Inventory;
+use App\Model\Record;
 use App\Model\Vendor;
 use Illuminate\Support\Facades\DB;
 
@@ -192,11 +193,19 @@ class U8XkyServerService extends Service
     public function fillInventoryData($data, $user){
         if(empty($data['data'])) return $data;
 
-        $map = DDEmployee::whereIn('userid', array_unique(array_column($data['data'],'crt_id')))
-            ->pluck('name','id')
+        $map = Record::where('del_time',0)
+            ->where('type', Record::type_four)
+            ->where('login_type', $user['login_type'])
+            ->whereIn('order_number',array_column($data['data'],'order_number'))
+            ->pluck('id','order_number')
+            ->toArray();
+
+        $e_map = DDEmployee::whereIn('crt_id', array_unique(array_column($data['data'], 'crt_id')))
+            ->where('login_type', $user['login_type'])
+            ->pluck('name_id', 'id')
             ->toArray();
         foreach ($data['data'] as $key => $value){
-            $data['data'][$key]['crt_name'] = $map[$value['crt_id']] ?? "";
+            $data['data'][$key]['crt_name'] = $e_map[$value['crt_id']] ?? "";
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['status_title'] = Inventory::$name[$value['status']] ?? '';
             $data['data'][$key]['bSale'] = $value['bSale'] ? '是' : '否';
@@ -204,6 +213,16 @@ class U8XkyServerService extends Service
             $data['data'][$key]['bPurchase'] = $value['bPurchase'] ? '是' : '否';
             $data['data'][$key]['bSelf'] = $value['bSelf'] ? '是' : '否';
             $data['data'][$key]['bComsume'] = $value['bComsume'] ? '是' : '否';
+
+            if(isset($map[$value['order_number']])) {
+                $state = $map[$value['order_number']];
+                $state_title = Record::state_name[$state];
+            }else{
+                $state = Record::state_minus_one;
+                $state_title = Record::state_name[$state];
+            }
+            $data['data'][$key]['state'] = $state;
+            $data['data'][$key]['state_title'] = $state_title;
         }
 
         return $data;
@@ -361,9 +380,30 @@ class U8XkyServerService extends Service
     public function fillVendorData($data, $user){
         if(empty($data['data'])) return $data;
 
+        $map = Record::where('del_time',0)
+            ->where('type', Record::type_five)
+            ->where('login_type', $user['login_type'])
+            ->whereIn('order_number',array_column($data['data'],'order_number'))
+            ->pluck('id','order_number')
+            ->toArray();
+
+        $e_map = DDEmployee::whereIn('crt_id', array_unique(array_column($data['data'], 'crt_id')))
+            ->where('login_type', $user['login_type'])
+            ->pluck('name_id', 'id')
+            ->toArray();
         foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['crt_name'] = $e_map[$value['crt_id']] ?? "";
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
-            $data['data'][$key]['status_title'] = Vendor::$name[$value['status']] ?? '';
+
+            if(isset($map[$value['order_number']])) {
+                $state = $map[$value['order_number']];
+                $state_title = Record::state_name[$state];
+            }else{
+                $state = Record::state_minus_one;
+                $state_title = Record::state_name[$state];
+            }
+            $data['data'][$key]['state'] = $state;
+            $data['data'][$key]['state_title'] = $state_title;
         }
 
         return $data;